github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
10319 commits 3 branches 7 tags 199 MiB
Commit graph

5912 commits

Author SHA1 Message Date
Alf Eaton
9130c37337 Merge pull request #4115 from overleaf/ae-remove-chat-url 
Remove Settings.apis.chat.url

GitOrigin-RevId: 64c6c2c48b9115054c1af446f3ce33d9390eaaf8
 2021-06-08 02:05:31 +00:00
Jessica Lawshe
7989a3c52d Merge pull request #4147 from overleaf/jel-reconfirm-ui 
Update button text on reconfirm page

GitOrigin-RevId: 9db6fe7136d6f5abf43b9f0eaabad5fb7c6b116c
 2021-06-04 02:08:44 +00:00
Alf Eaton
30efdae9c5 Merge pull request #4143 from overleaf/ae-symbol-palette-alpha 
Enable symbol palette for alpha users

GitOrigin-RevId: d2580372fc5348450456454748122a2d9f4d2fd8
 2021-06-04 02:08:28 +00:00
Jakob Ackermann
58c7b6188f Merge pull request #4123 from overleaf/jpa-pdf-caching-one-split-test 
[misc] rework roll-out of pdf caching

GitOrigin-RevId: 98ff50918050fe8e9fb5bfecb862657d48cd2726
 2021-06-02 02:05:50 +00:00
Jakob Ackermann
13b7cc8bcb Merge pull request #4117 from overleaf/ab-geoiplookup-fix 
Fix regression in GeoIpLookup + add tests

GitOrigin-RevId: 4bf0ecac7b6e5aaed0f56b0f0455d76923c094e1
 2021-06-02 02:05:36 +00:00
Brian Gough
fd6a0dcb1d Merge pull request #4120 from overleaf/jpa-captcha-other-domain 
[misc] fetch re-captcha script from another domain: www.recaptcha.net

GitOrigin-RevId: b8871af07be75e4f6ea01e7b791e877944753763
 2021-06-02 02:05:33 +00:00
Jakob Ackermann
710035899a Merge pull request #4121 from overleaf/jpa-health-check-api 
[misc] add /health_check/api

GitOrigin-RevId: bfa907821e8b5963a865a59fdbc717de34159834
 2021-06-01 02:05:52 +00:00
Jakob Ackermann
95c83866c5 Merge pull request #4112 from overleaf/tm-private-api-basic-auth 
Add requireBasicAuth middleware and refactor httpAuth to use it

GitOrigin-RevId: 7f68c0dc4a40102bfe4a97711def517e465ec7fd
 2021-06-01 02:05:46 +00:00
Jessica Lawshe
ed889a078c Merge pull request #4064 from overleaf/jel-tidy-algolia 
Tidy Algolia usage

GitOrigin-RevId: 8d33da3d9f2bb9f0df90e5f9273fba591c6b8eec
 2021-05-28 02:08:54 +00:00
Jakob Ackermann
52961250aa Merge pull request #4102 from overleaf/jpa-fix-pdf-caching-feature-flags 
[ProjectController] fix pdf caching feature flags and add tests

GitOrigin-RevId: bab312f20dd98414aab92931dd6a1ec85e4bafd2
 2021-05-28 02:08:33 +00:00
Alexandre Bourdin
a65c5dde01 Merge pull request #4068 from overleaf/ab-split-test-user-properties 
Store assigned split tests as user properties

GitOrigin-RevId: 1cc09d4d8f19badb73e87c46064bdeac131dd307
 2021-05-27 02:06:10 +00:00
Alexandre Bourdin
551e2bfb5c Merge pull request #4084 from overleaf/ab-subscription-flow-events 
Subscription flow analytics events

GitOrigin-RevId: c74121031ba8623244657c607a76a513380e96f5
 2021-05-27 02:06:07 +00:00
Alexandre Bourdin
18d62dcee9 Merge pull request #4071 from overleaf/ab-subscription-decaf-cleanup 
Subscription controller decaf cleanup

GitOrigin-RevId: 79b8adfabe30e4557a95b1aad71a5162e6f42cce
 2021-05-27 02:06:03 +00:00
Jakob Ackermann
687cd091f6 Merge pull request #4090 from overleaf/ae-dropbox-beta 
Enable React Dropbox modal for beta users

GitOrigin-RevId: dc7a0b43ad1ab9a35fdb7fd70bf3b2c5d60efb94
 2021-05-27 02:05:55 +00:00
Hugh O'Brien
f16c60e009 Merge pull request #4057 from overleaf/msm-prevent-onboarding-email-server-pro 
Prevented Onboarding email from being sent in CE/SP

GitOrigin-RevId: 68d117b477bd90c6410aabdcc6af8142626f7b4e
 2021-05-26 02:05:38 +00:00
Hugh O'Brien
13db97cbfa Merge pull request #4070 from overleaf/jel-email-button-tooltip 
Fix check for disabled "Make Primary" button when email needs reconfirmation

GitOrigin-RevId: efbe56e77402cbbc673a41ce24390fb77ede2481
 2021-05-26 02:05:35 +00:00
Hugh O'Brien
08f5e73d8f Merge pull request #3990 from overleaf/hb-gh-react-beta 
Roll out GitHub Sync React Port to Beta

GitOrigin-RevId: f383c920b5e4ab6c1949013bf588d3afd83b643d
 2021-05-26 02:05:32 +00:00
Alf Eaton
cc8a96d508 Merge pull request #4089 from overleaf/jlm-ga-anonymize-ip 
Anonymize IP address for Google Analytics

GitOrigin-RevId: e010e74a01dc6df2bd816d08989f51ae08c05dd7
 2021-05-26 02:05:29 +00:00
Jakob Ackermann
f0b3d8a26a Merge pull request #4076 from overleaf/jpa-events-split-test 
[misc] submit events and prepare roll-out for pdf caching w/ split test

GitOrigin-RevId: a7b7af65e1adf5bf003b65d96f1641a343b4b09c
 2021-05-22 02:05:44 +00:00
Jakob Ackermann
dfabc3a93b Merge pull request #4072 from overleaf/jpa-pdfjs-metrics 
[frontend] PdfController: observe PDF.js fetch/render performance

GitOrigin-RevId: bdd81ba06dabaa944b64266d0c36700d16790a30
 2021-05-22 02:05:38 +00:00
Timothée Alby
4797f7e357 Merge pull request #4047 from overleaf/ta-clear-sso-data 
Clear SSO Data via Admin Panel

GitOrigin-RevId: bd4e79ccc7f98337bc1f8b78947cc647352f6fbe
 2021-05-21 02:08:38 +00:00
Timothée Alby
88d00424cc Merge pull request #4002 from overleaf/cmg-subscriptions-new-validation 
Add missing validation messages on subscriptions new

GitOrigin-RevId: 451b75d4adb0d92911579f0ea728625c561b767f
 2021-05-20 02:05:11 +00:00
Timothée Alby
7957c2eae7 Merge pull request #4050 from overleaf/ta-set-user-property 
Send 'created-at' User Property

GitOrigin-RevId: 2a6c8356f0a64ffbc55eac485bb80c38b326f683
 2021-05-20 02:05:08 +00:00
Timothée Alby
03b2d184b5 Merge pull request #4052 from overleaf/ab-subscription-page-split-test-2 
Subscription page split test

GitOrigin-RevId: 022a91d97f20d584e47e1f6b5575e689983df129
 2021-05-20 02:05:00 +00:00
Jessica Lawshe
3af7b2da30 Merge pull request #4049 from overleaf/jel-featuresUpdatedAt 
Set featuresUpdatedAt

GitOrigin-RevId: 87d53e5ff27a8ebce2ba8c7223d498b291d05a23
 2021-05-19 02:06:10 +00:00
Jessica Lawshe
9b29fa7cbc Merge pull request #4035 from overleaf/jel-reconfirmation-dropbox-notification 
Notification for Dropbox unlinked due to reconfirmation lapse

GitOrigin-RevId: 03d2bed922e1d3dd993f9227b8e7675af42eda4b
 2021-05-19 02:06:06 +00:00
Alf Eaton
1b5d5bfb5b Add React Dropbox modal (#4055) 
GitOrigin-RevId: a5fd367154fd5c4753345d44e9d1e1cc35181ced
 2021-05-19 02:06:02 +00:00
Thomas
f7fd2dec65 Merge pull request #3503 from overleaf/cmg-downgrade-group-subscription 
Downgrade group subscription properly

GitOrigin-RevId: 6d028b79f8d5cc1ae9257e72b12d06190fed4121
 2021-05-18 02:08:24 +00:00
Thomas
682abe9ca5 Merge pull request #3980 from overleaf/tm-show-error-if-plan-change-fails 
Show error in plan change modal if plan change fails

GitOrigin-RevId: 698aab43feacdb5ced41f239167c5d132f7ca8de
 2021-05-18 02:08:20 +00:00
Thomas
f7b96e86a7 Merge pull request #4034 from overleaf/tm-pending-subscription-addons 
Display correct information when pending subscription has addons

GitOrigin-RevId: 7634ccf24788951507963b6d421fdb86e0dc38d5
 2021-05-18 02:08:16 +00:00
Miguel Serrano
73c47fa0e0 Layout divider for Symbol Palette (#4036) 
Co-authored-by: Alf Eaton <alf.eaton@overleaf.com>
GitOrigin-RevId: e22635978c16646060c80ceb8376a560bfbf6527
 2021-05-18 02:08:12 +00:00
Jakob Ackermann
715fad4883 Merge pull request #4046 from overleaf/jpa-fix-404s 
[misc] use ng-href for dynamic link targets

GitOrigin-RevId: 22cccf7a3784cde046d73d88c5929036e3572279
 2021-05-18 02:08:01 +00:00
Jakob Ackermann
7db7cd4a49 [misc] merge pdf caching into main (#4033) 
* [frontend] WIP: pdf caching using service worker -- squashed

Ref: 920fbaa00b31530f7c457a2d93bad5e553798057
Co-Authored-By: Brian Gough <brian.gough@overleaf.com>
Co-Authored-By: Eric Mc Sween <eric.mcsween@overleaf.com>

* [misc] add contentId into the URL for protecting PDF stream contents

* [misc] gracefully handle missing ranges in serviceWorker

* [misc] support PDF stream caching for anonymous users

* [misc] polish header names and add URL to error message when fetch fails

* [misc] polish event handler registration

* [misc] limit serviceWorker scope to /project/ -- trailing slash

This will block the service worker from intercepting requests on the
 project dashboard.

* [misc] add per-request feature flag for enabling PDF stream caching

* [misc] expose compile stats and timings to the frontend

* [misc] serviceWorker: support clsiServerId and compileGroup url params

* [misc] serviceWorker: polish header maps

* [misc] serviceWorker: drop TODO for p-limit -- the browser has a queue

* [misc] serviceWorker: drop verbose log message on every fetch

* [misc] cut down size of diff in backend code

* [misc] add test case for forwarding of pdf caching and metrics details

* [misc] serviceWorker: drop all the log lines

* [misc] serviceWorker: add boundary guards to the compile request regex

Co-authored-by: Brian Gough <brian.gough@overleaf.com>
Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: 4b291b4a4f2866cf07bccf8ec9068f33bbfdc916
 2021-05-18 02:07:57 +00:00
Jakob Ackermann
55f2a6e000 Merge pull request #4017 from overleaf/jpa-fix-notification-ack 
[NotificationsBuilder] fix too broad acknowledge API calls

GitOrigin-RevId: 4ddaeb33ccf4d4a4f5c36671c720ec3cd32ef761
 2021-05-18 02:07:47 +00:00
Alf Eaton
79f58598eb Merge pull request #4045 from overleaf/ae-register-spaces 
Restore spaces on SP register page

GitOrigin-RevId: 5a8bdb25e4715861957a071bb4bc8f628ee36a41
 2021-05-15 02:10:06 +00:00
Miguel Serrano
bb88af80cf Merge pull request #3947 from overleaf/msm-reenable-eslint-rules 
Reenable `eslint` rules

GitOrigin-RevId: a0aa5f941ba1bc49ff758b5256f91d696f442c6d
 2021-05-14 02:09:45 +00:00
Alf Eaton
0e7c27d91a Merge pull request #4013 from overleaf/ae-share-modal-header 
Restore the React share modal

GitOrigin-RevId: 697524bceaf0f711889028ad313914edf29e246a
 2021-05-13 02:09:00 +00:00
Alf Eaton
5ea11cdf83 Merge pull request #4029 from overleaf/msm-symbol-palette-toggle 
Added `symbol_palette` feature toggle

GitOrigin-RevId: 0de00543d15f3f02a2130ac5abf30f35ac814684
 2021-05-13 02:08:53 +00:00
Jessica Lawshe
5d7faa7977 Merge pull request #4006 from overleaf/jel-refresh-features-reason 
Pass reason to refreshFeatures

GitOrigin-RevId: 400e3081333239248e3408f93b0517b9bbdbc90c
 2021-05-12 02:09:55 +00:00
Jessica Lawshe
2bf126af68 Merge pull request #3993 from overleaf/jel-reconfirmation-script 
Add script to refresh features for users not reconfirmed

GitOrigin-RevId: d49f496dc6f1997763d54c6d8f41f7c3634b8b2d
 2021-05-12 02:09:51 +00:00
Brian Gough
1d94ef5b54 Merge pull request #4003 from overleaf/bg-project-archiver-deletion 
project archiver deletion of expired projects

GitOrigin-RevId: 7e010f4883e0bfeb593da6b728c8e4ac329824cd
 2021-05-12 02:09:48 +00:00
Thomas
d2dad0d802 Merge pull request #4011 from overleaf/tm-fix-group-plan-educational-discount-text 
Lowercase 'educational' for consistency in group plan modal text

GitOrigin-RevId: 139549dc96e71295f1eb5949fad66af1b4df4e16
 2021-05-08 02:10:15 +00:00
Hugh O'Brien
1f3b01486e Merge pull request #3991 from overleaf/em-oversized-logs 
Avoid logging project contents

GitOrigin-RevId: 6255ffebca83728bc69e64286ea40fd5aed244a1
 2021-05-08 02:10:01 +00:00
Jakob Ackermann
e6acfda6e3 Merge pull request #3967 from overleaf/jpa-upgrade-ratelimiter 
[misc] upgrade rolling-rate-limiter to latest upstream version

GitOrigin-RevId: cf2fdf9ea7dab1fb4953de3a4f03e4dc913bcb23
 2021-05-08 02:09:45 +00:00
Jakob Ackermann
057c8528c9 Merge pull request #4007 from overleaf/jpa-upgrade-underscore 
[misc] upgrade underscore to the latest version

GitOrigin-RevId: 2261fa4a431d30449d55b5e6b6dc11a4b731465d
 2021-05-08 02:09:41 +00:00
Alexandre Bourdin
87b3654bff Merge pull request #4001 from overleaf/ab-hash-split-test 
Add hashing to compute the user's percentile in a split test

GitOrigin-RevId: 94302cd1c0ab9e9075a506096b4f36ba50b9b7fa
 2021-05-07 02:13:17 +00:00
Jakob Ackermann
8faae673b4 Merge pull request #4000 from overleaf/jpa-skip-pug-compile 
[Server] optionally skip pre-compiling pug templates in production

GitOrigin-RevId: c50e6007dae3b0ab83a7edbce07a695a17e71404
 2021-05-07 02:13:13 +00:00
Miguel Serrano
46ecb39bdb Merge pull request #3986 from overleaf/tm-decaf-limitations-manager 
Decaf cleanup of LimitationsManager and tests

GitOrigin-RevId: 9bbfc4c3ad002a424863a43c3c19dc66fa5e9854
 2021-05-06 02:09:39 +00:00
Miguel Serrano
6583d6de21 Merge pull request #3971 from overleaf/tm-migrate-recurly-cancellations 
Migrate cancel/reactivatation of recurly subscription to node client

GitOrigin-RevId: 68a8a3eba7b653ec923d020a74a09e49efa8ba21
 2021-05-06 02:09:35 +00:00
Miguel Serrano
a5e905f730 Merge pull request #3975 from overleaf/tm-change-default-group-subscription 
Make Enterprise the default group pricing and clarify related text

GitOrigin-RevId: c723c87fa97ca0f8e9a03039f05cb397e1213de3
 2021-05-06 02:09:32 +00:00
Miguel Serrano
4bcab34580 Merge pull request #3978 from overleaf/jel-notifications-decaf 
Notifications decaf cleanup and remove eslint disable

GitOrigin-RevId: 557a7c63aecda346501d56d1eb18935b12130e8a
 2021-05-06 02:09:25 +00:00
Miguel Serrano
f9871103bf Merge pull request #3949 from overleaf/msm-reenable-eslint-const-rule 
Reenable eslint `prefer-const` rule

GitOrigin-RevId: 4f3825be8b8dff381095209085a36eaab76260d5
 2021-05-06 02:09:14 +00:00
Miguel Serrano
0874fcb8ca Release new navigation toolbar to alpha + feature flag refactoring (#3931) 
* release new navigation toolbar to alpha and refactor flags

GitOrigin-RevId: d6ff9a3740423510457247882169b7d5aae2b843
 2021-05-06 02:09:11 +00:00
Alf Eaton
dbc909ae54 Merge pull request #3970 from overleaf/ae-remove-filetreereactbridge 
Remove showReactAddFilesModal, showReactFileTree, useFileTreeAngularListener and FileTreeReactBridge

GitOrigin-RevId: 61fc54efe761922137b032b9b532975fc101264d
 2021-05-01 02:13:18 +00:00
Shane Kilkelly
6893cce6c9 Merge pull request #3964 from overleaf/jpa-unique-project-name-with-year 
[ProjectHelper] _addNumericSuffixToProjectName: add heuristic for year

GitOrigin-RevId: 24c57d68706bdabba620137674946e3c8e675939
 2021-05-01 02:13:10 +00:00
Chrystal Maria Griffiths
3dfcb95802 Merge pull request #3960 from overleaf/cmg-binary-file 
[BinaryFile] Reopening of Binary file React migration

GitOrigin-RevId: 050e66e3321bd6579d44932b669fc0a31df06d18
 2021-04-29 02:09:38 +00:00
Jakob Ackermann
23c73b9bf1 Merge pull request #3959 from overleaf/jpa-take-note-of-past-url 
[UnsupportedBrowserMiddleware] take note of the past URL in redirect

GitOrigin-RevId: d80ed876f87e54c181f00669a11795a2ce44e5a5
 2021-04-29 02:09:33 +00:00
Jakob Ackermann
48edcb0127 Merge pull request #3924 from overleaf/as-remove-ie-banner 
Remove unused IE banner after support has been dropped

GitOrigin-RevId: 115e4e371d34ed4b209c683a5b16260ca3beb4c3
 2021-04-29 02:09:25 +00:00
Jakob Ackermann
adfde7d26b Merge pull request #3950 from overleaf/msm-reenable-lint-prefer-regex-literals 
Reenable `prefer-regex-literals` eslint rule

GitOrigin-RevId: 3c576d92a08dfcb745d447b1bf8c7b828753010d
 2021-04-29 02:09:10 +00:00
Thomas
72af966c9c Schedule subscription downgrades to occur at the current term end (#3801) 
* Schedule subscription downgrades to occur at the current term end.

If the plan is a downgrade, schedule the subscription change for term
end. Use Recurly v3 API subscription change event instead of v2 update
subscription.

* Add ability for user to revert a pending subscription change

In the case where a user has downgraded, but has since decided they'd
rather stay on their current plan, we need a way to let them revert. It
isn't enough to re-use a subscription change, because Recurly sees it as
an attempt to make a change from the current plan to itself.

Instead, we use a new dialog and call a new endpoint that has the
specific intent of reverting the pending plan change, by calling the
removeSubscriptionChange recurly client method.

* Add message prompting users to contact support for immediate changes

We're showing this in the confirmation modal for a plan change that
would occur in the future, and and on the subscription page if a pending
change is due.

Most users shouldn't need this, but it should help them out if they find
an edge case like moving from eg. Student (Annual) to Professional
(Monthly) and were expecting to be "upgraded" immediately.

GitOrigin-RevId: c5be0efbeb8568ed9caa941aadcef6f6db65c420
 2021-04-28 02:10:31 +00:00
Alexandre Bourdin
affaae14b7 Merge pull request #3917 from overleaf/ab-example-project-ab-test 
Example Project Split Test

GitOrigin-RevId: a9d68811c878e32b92e0547311c9e477e4096135
 2021-04-28 02:10:08 +00:00
Alf Eaton
1be43911b4 Merge pull request #3942 from overleaf/prettier-trailing-comma 
Set Prettier's "trailingComma" setting to "es5"

GitOrigin-RevId: 9f14150511929a855b27467ad17be6ab262fe5d5
 2021-04-28 02:10:01 +00:00
Jessica Lawshe
c5a1368d30 Merge pull request #3953 from overleaf/jel-reconfirm-thank-you 
Reconfirm UI translation

GitOrigin-RevId: 3dea8abb20763813ea5f1d372269b2b97a9c9747
 2021-04-27 02:09:32 +00:00
Jessica Lawshe
517485d7ea Merge pull request #3914 from overleaf/jel-graphs-cached-licenses 
Use cached affiliation data

GitOrigin-RevId: b8ae2b871cc1f3a11e61dd449b4d1ddc7835860d
 2021-04-27 02:09:28 +00:00
Chrystal Maria Griffiths
4e9d7c36ff Merge pull request #3952 from overleaf/revert-cmg-binary-file 
Revert "Merge pull request #3526 from overleaf/cmg-binary-file"

GitOrigin-RevId: 5f539f26992fefd01b07922b1f43a3a3bc753141
 2021-04-24 02:10:12 +00:00
Eric Mc Sween
1186c3e9a4 Merge pull request #3526 from overleaf/cmg-binary-file 
[BinaryFile] Binary file React migration

GitOrigin-RevId: e229ad8ec3781607b5ca28387927b84d4af95060
 2021-04-24 02:10:07 +00:00
Alf Eaton
ff62a7e63c Enable React add files modal for all users (#3941) 
GitOrigin-RevId: 923bf41a8c5e9f0932a1711530446dfd5c8d0d7f
 2021-04-23 02:10:09 +00:00
Alf Eaton
5cec4420dc Merge pull request #3940 from overleaf/ae-share-modal-for-everyone 
Enable React share modal for all users

GitOrigin-RevId: 2cb288e15770d3169034e4511df6537d010e924d
 2021-04-23 02:10:05 +00:00
Alf Eaton
2621a1d5bb Merge pull request #3933 from overleaf/ae-csp-report-percentage 
Add CSP_REPORT_PERCENTAGE

GitOrigin-RevId: 4afde0da6e3660c83df8c5c9cd31a3f246e9e572
 2021-04-22 02:09:40 +00:00
Shane Kilkelly
07ec567b07 Merge pull request #3902 from overleaf/sk-ref-providers-hide 
Editor: don't leak encrypted tokens to frontend
GitOrigin-RevId: 245c1e9d479f7eec2979b46a5959bd3eb9f08363
 2021-04-22 02:09:31 +00:00
Timothée Alby
0ecebefb0c Merge pull request #3804 from overleaf/msm-react-publish-button 
[ReactNavigationToolbar] Submit button

GitOrigin-RevId: 9b40e09f001b44bd2f5035469f0d0c852fea7199
 2021-04-20 02:10:19 +00:00
Timothée Alby
f7166c5c1b Merge pull request #3922 from overleaf/jpa-fix-project-restore-deleted-files 
[ProjectDeleter] undeleteProject: deletedFiles.projectId is an ObjectId

GitOrigin-RevId: 53bdc7c2a20269ef22ec7ca55a6ccf9339209cdd
 2021-04-20 02:10:14 +00:00
Timothée Alby
7d0f117918 Merge pull request #3919 from overleaf/jpa-refactor-inline-script 
[views] referal/bonus: refactor inline script in event handler

GitOrigin-RevId: 825f15c1badf964e0e0e2c9bc42951a5f318b357
 2021-04-20 02:10:10 +00:00
Timothée Alby
97f89f132c Merge pull request #3920 from overleaf/as-fix-unsupported-middleware 
Fix unsupported browser middleware

GitOrigin-RevId: 27dc8cef4747abba85a985c28865340bc5116ab7
 2021-04-20 02:10:05 +00:00
Alf Eaton
dcd6bd347f Use the full (relative) view path for CSP exclusion (#3916) 
GitOrigin-RevId: f6828a447abcc550f0c7dfd0fc6fc72f4b5b1f7e
 2021-04-17 02:09:56 +00:00
Alasdair Smith
f7cf7626ec Merge pull request #3820 from overleaf/as-block-ie 
Add middleware to block unsupported browsers

GitOrigin-RevId: b1f1e4ae1572c3c323dc72442c8d5169b4879d5d
 2021-04-17 02:09:52 +00:00
Jakob Ackermann
4f8a905e9b Merge pull request #3909 from overleaf/jel-reconfirm-email-template 
Add reconfirm email template

GitOrigin-RevId: 2488c79c25a7148f601e3e3e2021cdbee4be7b4c
 2021-04-16 02:05:33 +00:00
Jakob Ackermann
78326fb352 Merge pull request #3903 from overleaf/as-clean-up-error-pages 
Clean up error pages

GitOrigin-RevId: 764375124ef5349c97416339119471a166d727b5
 2021-04-16 02:05:30 +00:00
Jakob Ackermann
d2e6449e79 Merge pull request #3897 from overleaf/tm-meta-tags-billing 
[views] migrate subscription templates to meta tags, re-issue

GitOrigin-RevId: c18bb7c96186cc8c34344ecf7cee35f9da19698e
 2021-04-16 02:05:27 +00:00
Alf Eaton
1ebc8a79cb Merge pull request #3495 from overleaf/ae-prettier-2 
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
 2021-04-15 02:05:22 +00:00
Alasdair Smith
676b70b2be Merge pull request #3899 from overleaf/ae-csp-report-sample 
Add 'report-sample' to script-src CSP directive

GitOrigin-RevId: 1a2c26339e7ef353a89fc264b0f186a1d313e1bc
 2021-04-15 02:05:16 +00:00
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
Alasdair Smith
93492bb25a Merge pull request #3908 from overleaf/jel-reconfirm-ui-meta-tags 
Meta tag migration for reconfirm UI

GitOrigin-RevId: b0bda07acc5389b1d5ef4e9ea3d10688ac26f0a0
 2021-04-15 02:05:09 +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
16d02c9d8b Merge pull request #3882 from overleaf/ab-wfh-ga-events 
Add new GA events to WFH2021 links

GitOrigin-RevId: 939f589c359a97b794eceb8e493cccd95ec1913a
 2021-04-10 02:05:09 +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
2fca78eaf0 Merge pull request #3896 from overleaf/revert-3834-tm-meta-tags-billing 
Revert "[views] migrate subscription templates to meta tags"

GitOrigin-RevId: 8ab3dae6e3aa359b6d7aa69df70a1b1eb2405dfd
 2021-04-09 02:05:33 +00:00
Jessica Lawshe
e697064f16 Merge pull request #3834 from overleaf/tm-meta-tags-billing 
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
 2021-04-09 02:05:29 +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
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
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
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