Commit graph

18447 commits

Author SHA1 Message Date
Shane Kilkelly
f849b94005 Variables in Nginx configuration (#853)
* Add envsubst binary to image

* Generate nginx.conf from template, with env-vars

* Remove nginx.conf, now generated from template

* Reload nginx config after writing file

Co-authored-by: Shane Kilkelly <shane.kilkelly@overleaf.com>
2021-04-07 15:19:06 +02:00
Jakob Ackermann
189897cb30 Merge pull request #145 from overleaf/dependabot-npm_and_yarn-y18n-4.0.1
Bump y18n from 4.0.0 to 4.0.1
2021-04-07 14:11:01 +02:00
Jakob Ackermann
9c303dd84d Merge pull request #140 from overleaf/dependabot-npm_and_yarn-ini-1.3.8
Bump ini from 1.3.5 to 1.3.8
2021-04-07 14:10:50 +02:00
Jakob Ackermann
acc57059a2 Merge pull request #144 from overleaf/jpa-metrics-module-3-5-1
[misc] bump the version of the metrics module to 3.5.1
2021-04-07 14:10:29 +02:00
Hugh O'Brien
0aba0300d1 GitHub sync modal react port (#3711)
* GH-sync React - initial left menu github sync react skeleton

* GH-sync modal main switching logic setup and free trial mode

* GH-sync react - message for link sharing users

* GH-sync react: link gh account from modal

* GH-sync React: add export to github form modal

* GH-sync react: display commits and merge buttons

* GH-sync react: merge logic

* GH-sync React: merge endpoint error handling

* GH-sync React: update error handling to new fetch behaviour

* GH-sync React: handle ignoring external updates

* GH-sync React: main switcher modal tests

* GH-sync React: tests for export and merge

* GH-sync react: error handling and error boundary

* GH-sync React: put behind alpha flag

* GH-sync React: re-adding translations lost in rebase and cleanup

* GH-sync React: use renderWithEditorContext for tests and replace missing translations

* GH-sync React review code cleanup
GH-sync React fix state ordering causing errors

GitOrigin-RevId: 37261966683112b399ef180ec6bc4036bc689fd9
2021-04-07 02:05:06 +00:00
Jakob Ackermann
ec7cd9fc3e Merge pull request #3656 from overleaf/jpa-script-back-fill-doc-name
[scripts] add new script for back filling the names of deleted docs

GitOrigin-RevId: c3a7ad8ba1306728bc1a433bec5dc847651bf94d
2021-04-07 02:05:03 +00:00
Jakob Ackermann
76b1cdff51 Merge pull request #3754 from overleaf/jpa-project-restore-handle-deleted-docs
[ProjectDeleter] restore project.deletedDocs meta data into docstore

GitOrigin-RevId: 570543d2cb9c5c790ac49328382ed88ef6ac3129
2021-04-07 02:05:00 +00:00
Jakob Ackermann
9692392bf8 Merge pull request #3655 from overleaf/jpa-change-write-path-doc-deletion
[ProjectEntityUpdateHandler] change write path for doc deletion

GitOrigin-RevId: 7d7ece8fe25c1d59b3469c136d92c4c81e9f0f81
2021-04-07 02:04:57 +00:00
Jakob Ackermann
75dabdd299 Merge pull request #3881 from overleaf/jpa-fix-unit-test
[misc] fix a unit test

GitOrigin-RevId: 22bd33a8c7c4311d8f22881a42e387190aa7c6e7
2021-04-07 02:04:55 +00:00
Jakob Ackermann
3bdf7afbbf Merge pull request #3653 from overleaf/jpa-merge-deleted-docs-sources
[EditorHttpController] fetch deletedDocs from docstore, merge w/ project

GitOrigin-RevId: 5cf46aa7ded034285051ddae21b5c80d8c806693
2021-04-07 02:04:52 +00:00
Jakob Ackermann
92194202d7 Merge pull request #3652 from overleaf/jpa-tell-docstore-doc-name-on-delete
[DocStoreManager] pass doc name as part of DELETE request

GitOrigin-RevId: cdb5fb21580a95aa8a78e0a44ca1e4db4da7f934
2021-04-07 02:04:49 +00:00
Simon Detheridge
dbfab633e0 Merge pull request #168 from overleaf/revert-166-sk-update-logger
Revert "Update logger-sharelatex to 2.2.0"
2021-04-06 15:30:02 +01:00
Simon Detheridge
8ba799035b Revert "Update logger-sharelatex to 2.2.0" 2021-04-06 15:29:09 +01:00
Shane Kilkelly
927d401111 Merge branch 'jpa-silent-download' 2021-04-06 13:34:50 +01:00
Simon Detheridge
50e414a4b1 Merge pull request #166 from overleaf/sk-update-logger
Update logger-sharelatex to 2.2.0
2021-04-06 11:53:12 +01:00
Shane Kilkelly
1e4e4b5ec0 Update logger-sharelatex to 2.2.0 2021-04-06 11:47:22 +01:00
Simon Detheridge
66c47d7bad Merge pull request #165 from overleaf/dependabot-npm_and_yarn-y18n-4.0.1
Bump y18n from 4.0.0 to 4.0.1
2021-04-06 11:45:02 +01:00
dependabot[bot]
acbbd88d8a Bump y18n from 4.0.0 to 4.0.1
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-06 10:40:56 +00:00
Simon Detheridge
2d44a54c6c Merge pull request #167 from overleaf/em-upgrade-node-12
Reintroduce Node 12 and metrics upgrades
2021-04-06 11:40:00 +01:00
CloudBuild
380dc41b17 auto update translation
GitOrigin-RevId: 1c3ebc789f557399d62f9dbd6d1ce716b835b398
2021-04-04 02:05:08 +00:00
CloudBuild
cba05342de auto update translation
GitOrigin-RevId: e920dbbd9bd4411da9f890be91461cfac172dc81
2021-04-03 02:05:02 +00:00
dependabot[bot]
9203e26d99 Bump y18n from 4.0.0 to 4.0.1
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-02 04:45:14 +01:00
Thomas
eb46f9a738 Merge pull request #3880 from overleaf/revert-3826-jpa-meta-editor
Revert "[views] migrate the editor templates to meta tags"

GitOrigin-RevId: 02caaf24ae0ee6a74a38ef870909527da19d4882
2021-04-02 02:05:02 +00:00
Jakob Ackermann
23be656aec Merge pull request #3746 from overleaf/jpa-hard-deletion-from-deleted-files
[ProjectDeleter] hard deletion of project deletes deletedFiles entries

GitOrigin-RevId: b514c34465d5fdc66b40aae5bcdb8b66975bc350
2021-04-02 02:04:58 +00:00
Shane Kilkelly
9c38d41652 Merge pull request #3872 from overleaf/jpa-batched-update-work-around-mongo-bug
[scripts] work around broken .setReadPreference() on mongo cursor

GitOrigin-RevId: 127c0593f4c20e45acb15ec26b45a45d9449d9ba
2021-04-02 02:04:56 +00:00
Shane Kilkelly
ae212feec4 Merge pull request #3701 from overleaf/jpa-script-back-fill-deleted-files-stage-2
[scripts] back_fill_deleted_files: optionally fix partial inserts

GitOrigin-RevId: 7d48d311db1af0b38222725ca86cdba8951b16b3
2021-04-02 02:04:52 +00:00
Shane Kilkelly
b9b4ca224c Merge pull request #3862 from overleaf/tm-remove-comms-introducing-archiving
Remove comms which introduced per-user archiving and trashing

GitOrigin-RevId: e8bd7bd741fe25f4530f447cf020b499256745dc
2021-04-02 02:04:49 +00:00
Eric Mc Sween
4d70bd664f Reintroduce Node 12 and metrics upgrades
These changes were previously merged, not deployed, and reverted. This
reverts the revert.

This reverts commit a6b8c6c658b33b6eee78b8b99e43308f32211ae2, reversing
changes made to 93c98921372eed4244d22fce800716cb27eca299.
2021-04-01 15:51:00 -04:00
Brian Gough
a3009d2ef2 Merge pull request #210 from overleaf/bg-real-time-status-file
add blue-green deployment support with load-balancer health-checks
2021-04-01 09:09:57 +01:00
dependabot[bot]
9c50bbffd1 Bump y18n from 4.0.0 to 4.0.1
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 03:49:36 +00:00
Miguel Serrano
f9962fefe8 React git-bridge modal (#3869)
GitOrigin-RevId: 5b2609ed9ad7909a10cb08342053e955447688f5
2021-04-01 02:06:05 +00:00
Miguel Serrano
a0393e14af Merge pull request #3870 from overleaf/ae-project-tokens
Fix applying new link sharing tokens to scoped project data in React Share modal

GitOrigin-RevId: 8234e836b5d7301896b877748461911180c81a72
2021-04-01 02:06:01 +00:00
Alexandre Bourdin
973e6f31d7 Merge pull request #3871 from overleaf/ab-referral-id-script-timeout
Increase timeout for initial query of referral ID generation script

GitOrigin-RevId: f60d67ed8a8862c771a1dc33332230d73145ae51
2021-04-01 02:05:58 +00:00
Brian Gough
1d30feecaf Merge pull request #3855 from overleaf/bg-skip-metadata-for-single-user
skip metadata broadcast for single user

GitOrigin-RevId: 4277870615aea1b07e1a8db6a26956be3661a443
2021-04-01 02:05:55 +00:00
Eric Mc Sween
9ddaa8c9f6 Merge pull request #3830 from overleaf/em-upgrade-node-12
Upgrade to Node 12

GitOrigin-RevId: 19870922884b7c98e7e5f2c94df21829672d2db5
2021-04-01 02:05:52 +00:00
Eric Mc Sween
c2f16621db Merge pull request #3803 from overleaf/ab-regenerate-duplicate-referral-ids-script
Add script to regenerate duplicate referral IDs

GitOrigin-RevId: cbcd7027f8dc342140ca5c22ed20c7814561e118
2021-04-01 02:05:49 +00:00
Eric Mc Sween
c8df1da69a Merge pull request #3856 from overleaf/em-git-folder
Helpful error when trying to merge .git folder with Github

GitOrigin-RevId: 15e976b738e91d89a6dfe64833620b75070ff998
2021-04-01 02:05:46 +00:00
Eric Mc Sween
5587de9cf5 Merge pull request #3833 from overleaf/em-meta-tags
Pass values to JS through meta tags

GitOrigin-RevId: f663a1b7fef4544b560574d21f59fdabaf617830
2021-04-01 02:05:44 +00:00
Alf Eaton
5653116cdb Reset the "select collaborators" combobox when needed (#3821)
GitOrigin-RevId: 773ea3ff01d2b6ec058728430174b77fadc481c8
2021-04-01 02:05:41 +00:00
Alf Eaton
be804b5fc1 Merge pull request #3832 from overleaf/ae-modal-beta
* Add BetaBadge component
* Add beta_badge_tooltip translation
* Add beta badge to modal headers
* Enable Share and Add Files modals for beta users

GitOrigin-RevId: df0933830a0745c0ecf57db34f2cb75104a570cd
2021-04-01 02:05:38 +00:00
Alf Eaton
a2be1f8981 Check that error.info exists (#3865)
GitOrigin-RevId: 83c575cc3b94d9d6564d4a2919f81e7b47a116cc
2021-04-01 02:05:35 +00:00
Alf Eaton
8227e68aca Improve form "for" and "autocomplete" attributes (#3822)
GitOrigin-RevId: 2ce35d57526fc36b5a974d0f940ef6ba08806864
2021-04-01 02:05:32 +00:00
Alf Eaton
d0d28524a2 Switch to useScopeValue for project data in Share modal (#3823)
GitOrigin-RevId: f82170c241c59cf7b66fea7e1471004e46ab3547
2021-04-01 02:05:30 +00:00
Miguel Serrano
445c850004 Revert "React Git Bridge Modal (#3757)" (#3867)
This reverts commit cf883b776a9ddc7975977534dc453ece4b3ec431.

GitOrigin-RevId: 462d7282d2c706ef5395c25a335239bfac4787a6
2021-04-01 02:05:27 +00:00
Miguel Serrano
835c60071d React Git Bridge Modal (#3757)
* git-bridge-modal react component and stories
* added react git-bridge-modal to angular tree

GitOrigin-RevId: cf883b776a9ddc7975977534dc453ece4b3ec431
2021-04-01 02:05:24 +00:00
Miguel Serrano
d444ba3335 Merge pull request #3864 from overleaf/msm-show-syntex-spinner-double-click
Show the synctex spinner on PDF double click

GitOrigin-RevId: 420e65b822ba2879949fc600a5b15e97f1dccf0d
2021-04-01 02:05:21 +00:00
Miguel Serrano
e5bf3f50ef Merge pull request #3806 from overleaf/msm-publish-template-wording
Update `publish_as_template` translation

GitOrigin-RevId: b0a9eaaf8cfe624f60455ba320e82c6e7ffd8a66
2021-04-01 02:05:18 +00:00
Miguel Serrano
d8b49f65da Merge pull request #3861 from overleaf/jpa-meta-launchpad
[views] migrate the launchpad module to meta tags

GitOrigin-RevId: 05295de90bf478e9b3494d854e2c57039c8f39e8
2021-04-01 02:05:15 +00:00
Miguel Serrano
13bf8dad2b Merge pull request #3860 from overleaf/jpa-cleanup-layout
[views] drop a hack that blocked 3rd party software from loading in 2015

GitOrigin-RevId: c6a26e05d12e3a02669a05d40a9f3562d780eead
2021-04-01 02:05:12 +00:00
Miguel Serrano
454d9790ca Merge pull request #3828 from overleaf/jpa-meta-project-dash
[views] migrate the project dashboard to meta tags

GitOrigin-RevId: 934a9a64ca8668e8982caa7a945b1a55c87cb1ee
2021-04-01 02:05:10 +00:00