Commit graph

17702 commits

Author SHA1 Message Date
Jessica Lawshe
379d9ac41c Merge pull request #4659 from overleaf/jel-em-duplicate-subscription-message
One Pro message per current commons institutions

GitOrigin-RevId: 21b74af8b9da1b6647a0384115f5d268b80e4bdf
2021-08-17 08:03:44 +00:00
Jessica Lawshe
c0b27c4524 Merge pull request #4719 from overleaf/jel-user-features-refresh
Fix featuresChanged flag

GitOrigin-RevId: 1290f9b2b43cae2f1c4912df649800453ca20344
2021-08-17 08:03:32 +00:00
Eric Mc Sween
b83c35fdbb Merge pull request #4665 from overleaf/bg-zip-manager
add streaming zip export of history (migrated from track-changes#117)

GitOrigin-RevId: 45e6a66332541f463241f148892817725c0be39c
2021-08-17 08:03:24 +00:00
Jakob Ackermann
1bf89f7dd1 Merge pull request #4766 from overleaf/dependabot-npm_and_yarn-libraries-access-token-encryptor-lodash-4.17.21
Bump lodash from 4.17.15 to 4.17.21 in /libraries/access-token-encryptor

GitOrigin-RevId: 8c97a49c660629d5ec8335c145240cc2418fc218
2021-08-17 08:03:20 +00:00
Jakob Ackermann
0ecd6f34ff Merge pull request #4742 from overleaf/jpa-modernize-access-token-encryptor
[misc] modernize access token encryptor

GitOrigin-RevId: 178fe2ee2f97f2b3816e480b6283fdb127eb72d6
2021-08-17 08:03:17 +00:00
Jakob Ackermann
2ce94153d4 Merge pull request #4734 from overleaf/jpa-server-ce-build
[misc] build the server-ce image from a local copybara synced repo

GitOrigin-RevId: 8e037668cdd2894e3fe909ec0da62f77e1f4c4d7
2021-08-17 08:03:11 +00:00
Copybot
a83be41adb Merge pull request #944 from overleaf:jpa-copybara-take-3
GitOrigin-RevId: 702c23e844e2ff41afa3505a014024f7df292d29
2021-08-17 08:03:06 +00:00
Jakob Ackermann
c05e47fa79 Merge pull request #4763 from overleaf/jpa-copybara-no-close
[copybara] do not close the public PR when merging the internal PR

GitOrigin-RevId: f2979a0c99f76a99fc3a3d86a7f6522da1999f15
2021-08-17 08:02:59 +00:00
Jakob Ackermann
b85cc59a6a
[misc] bump nvm version for server-ce/ to 12.22.3 2021-08-16 09:11:54 +01:00
Copybot
f0f9952369 Merge pull request #943 from overleaf:jpa-copybara-take-2
GitOrigin-RevId: 96ab0fab12d3b3c6edab2d1b18cf375315da5e24
2021-08-16 08:03:02 +00:00
Jakob Ackermann
a7a67c775c Merge pull request #4710 from overleaf/import-public-pr-941
[Imported] [misc] change README for testing copybara import, (#941)

GitOrigin-RevId: 34f7887c0a5ca21a7026a6734d33efee507a307a
2021-08-16 08:02:57 +00:00
Jakob Ackermann
a508252fc5
[misc] README: remove links to other repositories 2021-08-13 14:59:43 +01:00
Jakob Ackermann
a4b54cccb3 Merge pull request #4686 from overleaf/jpa-copybara
[misc] set up copybara sync for monorepo

GitOrigin-RevId: 4a0a0263fbc42833f88417f95231966dfa80341e
2021-08-13 13:00:01 +00:00
CloudBuild
7fcf8d522b auto update translation
GitOrigin-RevId: 00743400a8f0fd76ff08192624142ae6ef9ef317
2021-08-13 12:59:20 +00:00
Jakob Ackermann
7dc6456dca Merge pull request #4685 from overleaf/jpa-translations-sync
[misc] update translations sync for monorepo

GitOrigin-RevId: 794a9192212f7b63c040a08c42a1e9c6b3341609
2021-08-13 12:59:12 +00:00
Thomas
77bcd4c39e Revert "Initialise full project history for old projects when project opened (#4687)" (#4740)
This reverts commit ac263dca8cf0d80186fee916a76e5572ec5649d4.

GitOrigin-RevId: cc82e9c7d51966a7be0e8bef06ae4afe3f73170c
2021-08-13 12:59:04 +00:00
Thomas
7517a818b2 Initialise full project history for old projects when project opened (#4687)
* Initialise full project history for old projects when project opened

This begins a second attempt at initialising the full project history in
the background for projects without a full project history id.

The original web-internal#4345 was reverted in web-internal#4353. This
commit reverts the revert, and adds an additional flush of the project
before initialising full project history.

GitOrigin-RevId: ac263dca8cf0d80186fee916a76e5572ec5649d4
2021-08-13 12:58:56 +00:00
Jakob Ackermann
3ace29999b Merge pull request #4703 from overleaf/jpa-import-latex-log-parser
[misc] import latex log parser

GitOrigin-RevId: 2f02af8a58c130f97de51b952456b7a9615d4ed6
2021-08-13 12:58:28 +00:00
June Kelly
8b9d202518 Merge pull request #4655 from overleaf/jel-gallery-event
Fix onclick event propagation

GitOrigin-RevId: bfcc3840e1768ed0f91e5fefbaee1738e36f6752
2021-08-13 12:57:55 +00:00
June Kelly
0acd81dfc0 Merge pull request #4653 from overleaf/jel-remove-underscore-institutions
Remove underscore usage when processing users to refresh

GitOrigin-RevId: fd3fd90f5fd3e81a1bb6fceb83a64063ce212251
2021-08-13 12:57:47 +00:00
June Kelly
01b9be5ecd Merge pull request #4651 from overleaf/jel-remove-underscore-emails
Use lodash instead of underscore in emails

GitOrigin-RevId: b3e0f6f113b7901d57492428f4caee9ba04063ca
2021-08-13 12:57:39 +00:00
June Kelly
f181328db0 Merge pull request #4657 from overleaf/jel-check-uni-users
Remove await use since no async

GitOrigin-RevId: 43cb8be365bedd95d004ab9e129c75aeab855e53
2021-08-13 12:57:25 +00:00
June Kelly
4737982cdd Merge pull request #4675 from overleaf/msm-fix-review-button-ce
Remove Track Changes button in CE

GitOrigin-RevId: 7e682ea9cce8d23ba0fffc95cfb379588f0fd42e
2021-08-13 12:57:17 +00:00
June Kelly
1fb1c08348 Merge pull request #4673 from overleaf/msm-rename-project-onblur
Rename project on blur instead of canceling renaming

GitOrigin-RevId: fe58b48d5ab37357df33e970338e8b96c3ec1986
2021-08-13 12:57:09 +00:00
June Kelly
428ef96c56 Merge pull request #4677 from overleaf/msm-remove-linked-url
Remove `linked_url` from `ENABLED_LINKED_FILE_TYPES` env

GitOrigin-RevId: 13b8b76ceb5de1b7be4a4bb703122d41efd75ad9
2021-08-13 12:57:01 +00:00
June Kelly
61e95b7773 Merge pull request #4641 from overleaf/jk-sp-external-auth-flag
Server Pro: add EXTERNAL_AUTH variable

GitOrigin-RevId: 2a33fd71bf7ec6e4abe1e48ebd266079a7c82e10
2021-08-13 12:56:47 +00:00
Jakob Ackermann
6a0388ff9b Merge pull request #4689 from overleaf/jpa-libraries-ci
[misc] setup cloud build trigger for libraries

GitOrigin-RevId: a66dd3e96cb1c06d4803a2162278959357694048
2021-08-13 12:56:39 +00:00
Jakob Ackermann
937f9e3c51 Merge pull request #4647 from overleaf/jel-add-translation
Add missing translation

GitOrigin-RevId: 9af50d3102b20f05588398a7e1ea2b07de3fefc4
2021-08-13 12:55:52 +00:00
Eric Mc Sween
94117ea836 Merge pull request #4644 from overleaf/em-gitignore
Add node_modules to libraries/settings gitignore

GitOrigin-RevId: a6e5bc50ecb6dece03319e16c6c7c3d2318a7d74
2021-08-05 13:48:20 +00:00
Jakob Ackermann
70d4931cfa [misc] sentry_upload: no more git-commit annotations for releases
GitOrigin-RevId: 74ef0d393c2c14577951d7195886933c05d06a61
2021-08-05 13:48:08 +00:00
Jakob Ackermann
5d2549fe52 [misc] add/update CI pipelines for monorepo
GitOrigin-RevId: 8946b8be124e6977d2cafc6c3bf065412d765583
2021-08-05 13:48:05 +00:00
Jakob Ackermann
6aa9882a1c Merge remote-tracking branch 'dev-env/jpa-monorepo' into main
GitOrigin-RevId: 9128e3b9c9e05476356045697667df2ca3b3cf25
2021-08-05 08:03:43 +00:00
Jakob Ackermann
84ada570ab
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-web:services/web'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:39:05 +01:00
Jakob Ackermann
dea32cc656
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh libraries-settings:libraries/settings'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:51 +01:00
Jakob Ackermann
e7fc1ffeb8
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh libraries-redis-wrapper:libraries/redis-wrapper'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:48 +01:00
Jakob Ackermann
30b7bceb60
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh libraries-object-persistor:libraries/object-persistor'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:44 +01:00
Jakob Ackermann
e2f74274c0
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh libraries-o-error:libraries/o-error'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:41 +01:00
Jakob Ackermann
02010d9f6e
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh libraries-metrics:libraries/metrics'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:37 +01:00
Jakob Ackermann
c72c6f5747
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh libraries-logger:libraries/logger'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:31 +01:00
Jakob Ackermann
a2b7fef778
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh libraries-access-token-encryptor:libraries/access-token-encryptor'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:26 +01:00
Jakob Ackermann
b54631d502
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh server-ce:server-ce'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:23 +01:00
Jakob Ackermann
5c8cb4b90a
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-track-changes:services/track-changes'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:13 +01:00
Jakob Ackermann
68a2ecebef
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-spelling:services/spelling'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:34:01 +01:00
Jakob Ackermann
2ab66edc1f
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-real-time:services/real-time'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:33:53 +01:00
Jakob Ackermann
a5489818a8
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-notifications:services/notifications'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:33:37 +01:00
Jakob Ackermann
4fd44292d0
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-git-bridge:services/git-bridge'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:33:29 +01:00
Jakob Ackermann
e4d137eddf
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-filestore:services/filestore'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:33:13 +01:00
Jakob Ackermann
583b7d0030
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-document-updater:services/document-updater'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:33:02 +01:00
Jakob Ackermann
eef39ad009
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-docstore:services/docstore'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:32:49 +01:00
Jakob Ackermann
49470f739b
merge multiple repositories into an existing monorepo
- merged using: 'monorepo_add.sh services-contacts:services/contacts'
- see https://github.com/shopsys/monorepo-tools
2021-08-05 08:32:42 +01:00