Commit graph

613 commits

Author SHA1 Message Date
Alasdair Smith
c89beb7657 Merge pull request #3905 from overleaf/jel-analytics-licence-api
Proxy analytics request to v1

GitOrigin-RevId: 82bcca52d096b8a9bc590f0ee0a0d3a6054e294e
2021-04-15 02:05:12 +00:00
Shane Kilkelly
04fa863f9f Merge pull request #3892 from overleaf/sk-reroll-csrf
Regenerate CSRF token on login

GitOrigin-RevId: 501582b34794a822f4c9fe3af2575b5756511e06
2021-04-10 02:05:13 +00:00
Shane Kilkelly
f013f33c05 Merge pull request #3884 from overleaf/jpa-meta-editor-take-2
[misc] migrate the editor templates to meta tags -- take 2

GitOrigin-RevId: 447d4c6c2197dd2c5f5e182a5edf57313557b8b9
2021-04-10 02:05:05 +00:00
Jessica Lawshe
66105d6937 Merge pull request #3782 from overleaf/revert-3773-revert-3718-jel-emailHasLicence
Revert "Revert "Update emailHasLicence for reconfirmation and SAML""

GitOrigin-RevId: 120ee0ca2f59573578e6279477c6e62972b5fb4a
2021-04-09 02:05:17 +00:00
Miguel Serrano
42a1211ba7 Merge pull request #3888 from overleaf/jpa-hotfix-soft-failure-for-missing-deleted-docs
[EditorHttpController] joinProject: ignore err when fetching deletedDocs

GitOrigin-RevId: e2e2e5172de04cebb4a951739ac4222645fdd289
2021-04-08 02:05:07 +00:00
Brian Gough
11b4d91d9e Merge pull request #3883 from overleaf/bg-expire-tokens
expire tokens from mongo

GitOrigin-RevId: 5666fd40d04e122f2bc2a22bff24c0723e1e9a73
2021-04-08 02:05:04 +00: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
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
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
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
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
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
Miguel Serrano
d65db1acf0 Merge pull request #3824 from overleaf/jpa-password-reset-email-forwarding
[misc] fix passing around of users email as part of password reset

GitOrigin-RevId: 54e8cde9867a2ce735bc7ebe281ead19ef49e6cd
2021-04-01 02:05:04 +00:00
Miguel Serrano
65d9186e0b Merge pull request #3727 from overleaf/ab-ta-unique-referal-id
Generate User referal_id using longer and more complex token to avoid duplicates

GitOrigin-RevId: 302515b0250fec875dcb7b3a505c1c7be4189e2b
2021-04-01 02:04:57 +00:00
Miguel Serrano
80dff8d42c Merge pull request #3800 from overleaf/ab-queue-onboarding-emails
Implement queuing for onboarding emails

GitOrigin-RevId: f1eca149a6a2cab35b4cf9c3889dc384372fd453
2021-04-01 02:04:48 +00:00
Miguel Serrano
09ccceb38a Merge pull request #3786 from overleaf/sk-smtp-params
Add 'logger' and 'name' smtp params

GitOrigin-RevId: e54070c8dcc693d84ddbb350be564d5d9a63649d
2021-04-01 02:04:45 +00:00
Simon Detheridge
f02d4feea2 Merge pull request #3858 from overleaf/ab-ae-remove-token-project-invite
Remove token from project invites object returned to frontend

GitOrigin-RevId: 439fdb6fb44af1f46a9f16c4be8cc1d4fce8b562
2021-03-31 02:05:55 +00:00
Simon Detheridge
ae0805e684 Merge pull request #3850 from overleaf/jpa-set-image-name-for-synctex
[misc] include the projects imageName as part of synctex requests

GitOrigin-RevId: 99f05cf67859b1e43c2342fc0c2575ddd661a57d
2021-03-31 02:05:46 +00:00
Simon Detheridge
9e2db00d53 Merge pull request #3845 from overleaf/ho-upload-file-mark-updated
mark project as updated when uploading/replacing files

GitOrigin-RevId: 948a3351ac59d4f08411dd83bb543444de0b9b52
2021-03-31 02:05:38 +00:00
Timothée Alby
8ec7ebe645 Merge pull request #3713 from overleaf/jpa-login-event-drop-pii
[AuthenticationController] do not include PII as part of login event

GitOrigin-RevId: 274378b3a21945637dc33d2cfb39a53e9aaad9b7
2021-03-30 02:05:09 +00:00
Timothée Alby
b2b9a05e3c Merge pull request #3706 from overleaf/msm-jlm-configurable-text-extensions
New ADDITIONAL_TEXT_EXTENSIONS env to support extra editable files

GitOrigin-RevId: 03bec0a1a9dbd303754f0b90377d1b7d1ec3f528
2021-03-30 02:05:04 +00:00
Timothée Alby
d346172819 Merge pull request #3776 from overleaf/ho-post-clsi-cookie
convert _populateServerIdViaRequest to a post request

GitOrigin-RevId: cbbf926708804527ba3717a66e9f0192ecf70fbd
2021-03-30 02:04:59 +00:00
Jakob Ackermann
f66fa58a7c Merge pull request #3745 from overleaf/jpa-project-restore-handle-deleted-files
[ProjectDeleter] restore project.deletedFiles into own collection

GitOrigin-RevId: cb34e0e22609a49c676ebfe0753e650699b96f5d
2021-03-27 03:05:01 +00:00
Paulo Jorge Reis
3f0e897e32 Logs UI variant without popup (#3794)
* Add logs UI without pop-up variant

* Implement frontend for logs UI without pop-up

* Add logs UI variants to admin panel and front user info

* Fix existing UI subvariant window global

GitOrigin-RevId: 075db56032354d782e489b5235925f55b1a67e0b
2021-03-24 03:04:41 +00:00
Alf Eaton
ba4300d9e1 Merge pull request #3518 from overleaf/ae-react-create-file-modal
Migrate "Add Files" modal to React

GitOrigin-RevId: fc5235108ee65294e3176da9c327791c34aa5b3c
2021-03-19 03:04:46 +00:00
Brian Gough
be95516185 Merge pull request #3761 from overleaf/bg-redis-and-request-cleanups
redis and request cleanups

GitOrigin-RevId: d2bf133ef823c96b06eb09b4ef2c83ba7c54cd12
2021-03-19 03:04:40 +00:00
Jakob Ackermann
83a38a9980 Merge pull request #3764 from overleaf/jpa-drop-alternative-plans-page-logic
[SubscriptionController] drop unused handling of alternative plans page

GitOrigin-RevId: 1a4ec8276ac0ea87567cfbad9f8d82544267320c
2021-03-18 03:05:04 +00:00
Jakob Ackermann
f353728bda Merge pull request #3755 from overleaf/jpa-xss-2
[views] mitigate Angular XSS via email/new_email

GitOrigin-RevId: 3d127c283ba9f97c5b0e6c53a9d77f7f597058bb
2021-03-18 03:04:50 +00:00
Thomas
001f7f0cc2 Merge pull request #3773 from overleaf/revert-3718-jel-emailHasLicence
Revert "Update emailHasLicence for reconfirmation and SAML"

GitOrigin-RevId: 637b85d10fc0c79e8d55e51b43952e956d73baa6
2021-03-16 03:04:44 +00:00
Thomas
fee245b570 Merge pull request #3732 from overleaf/tm-recurly-create-admin-link
Create link to Recurly in admin panel

GitOrigin-RevId: 214802e9fbe16954d455ac04eb176ff27890769c
2021-03-16 03:04:40 +00:00
Thomas
1c54a15e42 Merge pull request #3718 from overleaf/jel-emailHasLicence
Update emailHasLicence for reconfirmation and SAML

GitOrigin-RevId: 58daf538d9f0a7db46bb3c1e21f8ca04df095446
2021-03-16 03:04:36 +00:00
Jakob Ackermann
18eea6d024 Merge pull request #3763 from overleaf/jpa-xss-7
[views] mitigate XSS on new subscription page

GitOrigin-RevId: 74baa58527aa9b2f9e434c280885b627f73898b6
2021-03-13 03:05:14 +00:00
Alf Eaton
d9576189a3 Merge pull request #3636 from overleaf/ae-share-modal-split
Migrate Share modal to React

GitOrigin-RevId: 96a52df6ffd751cfcca2bbb68eb9e7a6dc31ff28
2021-03-13 03:05:10 +00:00
Alexandre Bourdin
b8fc4b58ca Merge pull request #3741 from overleaf/ta-refresh-institution-users
Refresh Institution Users Script Changes

GitOrigin-RevId: 917287450ba30a9f8b605a2d38933a0f6e1979e6
2021-03-11 03:05:21 +00:00
Alexandre Bourdin
9415a1dd8d Merge pull request #3726 from overleaf/ta-ab-analytics-events
Add new analytics events

GitOrigin-RevId: f71a6dc5ccd44bdabb48c601f9f0e005cc765077
2021-03-11 03:05:15 +00:00
Brian Gough
bc4f5a687a Merge pull request #3682 from overleaf/bg-check-maintenance-file
check maintenance file periodically to close site

GitOrigin-RevId: 8e29f40a23df96198c6e4603ede2bab852b98740
2021-02-26 03:04:07 +00:00
Eric Mc Sween
e5c49ea19a Merge pull request #3681 from overleaf/em-group-plans
Configure group plans for additional licenses

GitOrigin-RevId: 57822de9f490505c4b083afa80220e4d5b4c7d23
2021-02-23 03:04:43 +00:00
Jessica Lawshe
195785194d Merge pull request #3684 from overleaf/pr-increase-log-level-payment-form-422s
Increase Recurly 422 log level to error

GitOrigin-RevId: 6ce0bca338d81660b62b74584a851a825114c4f2
2021-02-23 03:04:35 +00:00
Jessica Lawshe
0f7b268cdf Merge pull request #3683 from overleaf/bg-admin-open-editor
Allow admin to reopen editor after closing

GitOrigin-RevId: 9bf0c4234a9d510785aa4bddbb9f239d678ba503
2021-02-23 03:04:31 +00:00
Jessica Lawshe
54c471bc1c Merge pull request #3629 from overleaf/jel-ui-reconfirm-dash
Show reconfirm notification on the dash

GitOrigin-RevId: 4640513a299853a63c5f36b3e11b41ee66af61de
2021-02-23 03:04:20 +00:00
Jessica Lawshe
ddb6163b65 Merge pull request #3623 from overleaf/jel-ui-reconfirm-settings
Add reconfirm UI to settings

GitOrigin-RevId: cf9c4648cab07784782e24d752154089dc32196a
2021-02-23 03:04:17 +00:00
Timothée Alby
450d744f9a Merge pull request #3665 from overleaf/cmg-jpa-members-limit-addon
Support membersLimit add on for recurly subscriptions

GitOrigin-RevId: d4256665d703e3c348cdac11af669c70f3c2feb2
2021-02-19 03:04:33 +00:00
Timothée Alby
6e8a4e70dd Merge pull request #3641 from overleaf/ta-saml-integration
SAML Misc Changes

GitOrigin-RevId: 89fe8704d8effb6299d841be00efc653f6800fab
2021-02-19 03:04:18 +00:00
Paulo Jorge Reis
2051caf28e New compile UI admin panel (#3666)
* Extract new logs UI feature check to a helper function

* Add new logs UI per-user availability to the admin panel

* Stub NewLogsUIHelper in the unit tests

GitOrigin-RevId: b5344448d507c7cd7422b342286ada2b839b1785
2021-02-18 03:05:20 +00:00
Eric Mc Sween
1c0b897835 Merge pull request #3638 from overleaf/em-dropbox-duplicate-projects
Unlink Dropbox when two projects have the same name

GitOrigin-RevId: b16dbeb6841eaebd8553884eebc87e681d17a9c8
2021-02-18 03:05:12 +00:00
Jakob Ackermann
a034b46db4 Merge pull request #3673 from overleaf/jpa-handle-old-projects
[ProjectEditorHandler] process old projects gracefully

GitOrigin-RevId: eb7d3d776c2950bc13d02a9b9a4b2612f346e1c1
2021-02-18 03:05:04 +00:00
Jakob Ackermann
ab87ed51b9 Merge pull request #3658 from overleaf/jpa-change-write-path-file-deletion
[ProjectEntityMongoUpdateHandler] track deleted files in own collection

GitOrigin-RevId: 7dff10a4737626a2d02b93b346e7e02a9d9a8608
2021-02-18 03:04:55 +00:00