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
8789 commits 3 branches 7 tags 199 MiB
Commit graph

5127 commits

Author SHA1 Message Date
Eric Mc Sween
f1d96a3d56 Merge pull request #2289 from overleaf/em-ownership-transfer-improvements 
Small improvements to ownership transfer

GitOrigin-RevId: 83fa9a8b4358d4f40b1be8212f1a379d81426d26
 2019-10-28 14:29:14 +00:00
Eric Mc Sween
ecab52d108 Merge pull request #2292 from overleaf/as-remove-crawler-logger 
Remove unused crawler logger and profile/heapdump routes

GitOrigin-RevId: e731f9a0cf969481b26c8074beca86431187449b
 2019-10-28 14:29:09 +00:00
Eric Mc Sween
44ba0895fe Merge pull request #2286 from overleaf/jel-institution-email-primary-tooltip 
Tooltip for "Make Primary" for SSO emails

GitOrigin-RevId: 443cd032d4275ba486a632e92104299997c71bbc
 2019-10-28 14:28:59 +00:00
Ersun Warncke
9319229657 move institutional email check to overleaf-integration 
GitOrigin-RevId: 3e08b1e86bb14d90115df5337cab5c36bb6a69fc
 2019-10-28 08:36:36 +00:00
Ersun Warncke
3be4883649 block sso registration for institutional sso domains 
GitOrigin-RevId: f1ac63cf47bb41bd3f3603e38a50ed43c9f03650
 2019-10-28 08:36:29 +00:00
Timothée Alby
4d564d5cf1 Merge pull request #2258 from overleaf/ta-recurly-custom-fields 
Recurly Custom Fields Tracking

GitOrigin-RevId: f29f56cf7d0dfa91a8f4152897ba6bd897cb6238
 2019-10-25 08:38:57 +00:00
Timothée Alby
61243338be Merge pull request #2284 from overleaf/jel-user-settings 
Add type="button" to prevent form submission

GitOrigin-RevId: 747d389ea52f5f32762f98bab3e647b14572c50d
 2019-10-25 08:38:50 +00:00
Eric Mc Sween
06de9233b8 Merge pull request #2255 from overleaf/em-audit-log 
Project audit logs

GitOrigin-RevId: 439add2959be140c4f56ce9b41b9f59d432c494d
 2019-10-23 12:59:04 +00:00
Eric Mc Sween
f6e4be616c Merge pull request #2267 from overleaf/em-audit-log-admin 
Show project audit logs in admin panel

GitOrigin-RevId: f0dae4621ed8d62c8d0424f5f8f5612dc16c3eb5
 2019-10-23 12:58:57 +00:00
Eric Mc Sween
dad0b56813 Merge pull request #2244 from overleaf/em-ownership-transfer-frontend 
Project ownership transfer for regular users

GitOrigin-RevId: 70782be0b1c59980dce0ad61ff2a7fbc1dbf0566
 2019-10-23 12:58:52 +00:00
Eric Mc Sween
03bbd4f698 Merge pull request #2256 from overleaf/ta-event-tracking-cleanup 
Event Tracking Cleanup

GitOrigin-RevId: 9c857b5d92f9f40a87c2aec2e76c99a3744fddad
 2019-10-23 12:58:44 +00:00
Ersun Warncke
9902edcfbb pr fixes 
GitOrigin-RevId: 15a0371c285256b871a9c3e393077af1371d1e5c
 2019-10-23 11:41:13 +00:00
Ersun Warncke
432f4d3a06 add/remove entitlement on v1 
GitOrigin-RevId: 3171f77c8cb5376b26a8dc77d4f63630964678e0
 2019-10-23 11:41:09 +00:00
Alasdair Smith
0def0eaa41 Merge pull request #2261 from overleaf/as-remove-unused-deps 
Remove unused vendored dependencies

GitOrigin-RevId: aa4cb3e95f9b19f69adf4eefca06bbcb5e222154
 2019-10-22 11:01:49 +00:00
Brian Gough
45ebc42bf6 Merge pull request #2276 from overleaf/bg-reject-invalid-sessions 
reject invalid sessions

GitOrigin-RevId: 5dc59609d01d7ad9bc29f9bf18faee1165d10689
 2019-10-22 09:25:33 +00:00
Brian Gough
8ffaa5b0ca Merge pull request #2271 from overleaf/bg-reject-invalid-sessions 
reject invalid sessions with middleware

GitOrigin-RevId: 07ab8829cbed92bbcb90b2c5f2c9d049e05b77cd
 2019-10-22 07:46:41 +00:00
Jessica Lawshe
28a4be296f Merge pull request #2251 from overleaf/jel-dashboard-institution-notifications 
Institution SSO dashboard notifications

GitOrigin-RevId: c80117c2732fafdc9d09eed69db06a26ad28a663
 2019-10-21 16:23:19 +00:00
Timothée Alby
de4205d6a0 Merge pull request #2273 from overleaf/ta-recurly-get-accounts 
Add Script to Print CSV of all Paypal Customers

GitOrigin-RevId: 3aab5a29508a6848934a2858e0ce0edb9c7d6e71
 2019-10-21 14:08:03 +00:00
Simon Detheridge
68c16dcb73 Merge pull request #2263 from overleaf/spd-revert-revert 
Revert "Revert "Merge pull request #2249"

GitOrigin-RevId: 70b0da473e923a072aeca1cc146c82e460757747
 2019-10-18 16:41:37 +00:00
Simon Detheridge
123f74da72 Merge pull request #2227 from overleaf/ns-title-rename-overlap 
fix title rename overlap with online collaborators

GitOrigin-RevId: ccb5065a73e3e8e4079d14e029d57c302f9fc0cb
 2019-10-18 16:41:29 +00:00
Simon Detheridge
2c147f575c Merge pull request #2206 from overleaf/sk-restricted-users-redux 
Update the joinProject api to include isRestrictedUser flag

GitOrigin-RevId: 38988b5c886e5355edc2edcd834ae6e334fc9f10
 2019-10-18 16:41:24 +00:00
Simon Detheridge
8a46a385f7 Merge pull request #2241 from overleaf/ta-file-preview-footer 
Move File Preview Footer to Header

GitOrigin-RevId: b6c8d09f82520ceaebf0c6ee414445e4487e8894
 2019-10-18 16:41:19 +00:00
Brian Gough
e502b80116 Merge pull request #2259 from overleaf/bg-revert-session-merge 
Revert "Merge pull request #2249 from overleaf/bg-create-session-vali…

GitOrigin-RevId: d2114ecea0708dc109d5c9256e9dccb011a1b62c
 2019-10-18 16:41:12 +00:00
Brian Gough
bc8ccf26c7 Merge pull request #2249 from overleaf/bg-create-session-validation-token-for-all-sessions 
move session validation into SessionStoreManager

GitOrigin-RevId: 438ec738f0ccaf9f072629d6203a334cb8439b83
 2019-10-18 08:42:35 +00:00
Jessica Lawshe
34c04660a6 Merge pull request #2250 from overleaf/jel-saml-session-email 
Non canonical institution email in session

GitOrigin-RevId: b70971f6f42391391a42ba6ff214c14a275461d3
 2019-10-17 16:29:13 +00:00
Alasdair Smith
6a2b3a39a9 Merge pull request #2248 from overleaf/as-fix-cjk-prod 
Disable CDN for PDFjs cmaps path

GitOrigin-RevId: 52658564f22f94b7bd9893c499c5c58429a360d0
 2019-10-16 16:29:04 +00:00
Alasdair Smith
9cf73f965c Merge pull request #1440 from overleaf/as-amd-webpack 
Bundle all frontend code with webpack

GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
 2019-10-16 10:36:21 +00:00
Jessica Lawshe
e27577bd5b Merge pull request #2231 from overleaf/jel-institution-sso-link-error 
Add SSO error handling for when identifier linked

GitOrigin-RevId: e2bfa4dba896767d985476ecb78fcee86512a381
 2019-10-15 16:22:37 +00:00
Eric Mc Sween
2603597150 Merge pull request #2221 from overleaf/em-ownership-transfer-emails 
Project ownership transfer emails

GitOrigin-RevId: 3d33147c18e2d652976b3dac7453c0407c81314e
 2019-10-15 13:30:10 +00:00
Eric Mc Sween
6f966ceb3d Merge pull request #2239 from overleaf/em-collabs-frontend 
Change collaborator permissions

GitOrigin-RevId: 3627181d201e6d96734f89a380703953424f0fdf
 2019-10-15 13:30:00 +00:00
Eric Mc Sween
cc1de97df8 Merge pull request #2235 from overleaf/ta-recurly-subscription-callbacks 
Sync Recurly Subscriptions on New and Updated Events

GitOrigin-RevId: 597a7cb529d8c872693aae20cdb81a8edb1b7778
 2019-10-15 13:29:53 +00:00
Eric Mc Sween
2011189dc4 Merge pull request #2200 from overleaf/ho-add-noindex-option 
adds settings.robotsNoindex setting to stop robots indexing site

GitOrigin-RevId: 0c2c3aee215dd3ef1cca8cde4e0693a4bd39c6ef
 2019-10-15 13:29:47 +00:00
Eric Mc Sween
0e6b455ab0 Merge pull request #2194 from overleaf/ho-res-send-status 
use sendStatus for status codes, prevents errors in logs

GitOrigin-RevId: 98613a3c894a01eb9112fa9472403caeeae45bc2
 2019-10-15 13:29:40 +00:00
Eric Mc Sween
750a4879e7 Merge pull request #2228 from overleaf/ns-title-overflow 
allow line breaks to happen

GitOrigin-RevId: d4255739d17969dbfa514e841bf21c738dbf9020
 2019-10-14 18:01:53 +00:00
Eric Mc Sween
33d1f603df Merge pull request #2226 from overleaf/spd-clearprojectokens 
Add script to clear tokens from a specific project

GitOrigin-RevId: a810e2b7fe2e34efb937bffc0e39c409076daa23
 2019-10-14 13:38:07 +00:00
Eric Mc Sween
9a492257af Merge pull request #2220 from overleaf/jel-email-confirmation 
Email confirmation only for non-institution SSO emails

GitOrigin-RevId: 95bd0ce077031c11b9d60d2f736a1abe7431a265
 2019-10-14 13:37:57 +00:00
Eric Mc Sween
526d4982a1 Merge pull request #2219 from overleaf/jel-institution-email-already-exists 
Check for email before adding institution identifier

GitOrigin-RevId: 71f498116c8c8df2c3c1a33eafce3e56c87e7ee0
 2019-10-14 13:37:50 +00:00
Eric Mc Sween
ed7b5a9450 Merge pull request #2218 from overleaf/as-eslint-globals 
Move around eslint globals

GitOrigin-RevId: 81144a0b763159b9425aff673211c07ec65b3be5
 2019-10-14 13:37:42 +00:00
Brian Gough
7db9e73ecf Merge pull request #2234 from overleaf/bg-avoid-event-loop-metrics-during-startup 
start event loop monitoring when the process is ready

GitOrigin-RevId: 0a7759311b737e99579f61cc4cf90b775c26b76d
 2019-10-14 09:43:03 +00:00
Brian Gough
75facb159d Merge pull request #2225 from overleaf/bg-validate-sessions 
validate the session with a token derived from the sesionid

GitOrigin-RevId: d34a5bb1717a97138e11e7661f7288523199e0e2
 2019-10-11 10:16:47 +00:00
Jessica Lawshe
625b4c9339 Merge pull request #2216 from overleaf/jel-saml-beta-account-settings 
Allow SAML beta testing on Account Settings

GitOrigin-RevId: 6a2c60a3cbab3d9d0cdcc72e23f5d75f7702f89c
 2019-10-09 13:13:40 +00:00
Ersun Warncke
849f21fde3 add saml acceptance tests. get/set entitlement. 
GitOrigin-RevId: 65721aadb91678eafaf5a214a2921fe3dd276efa
 2019-10-08 13:29:32 +00:00
Jessica Lawshe
de8ac8ace7 Move add email function 
GitOrigin-RevId: f45e28a9ed357427ae606ad5f8b59acaef54e31b
 2019-10-08 13:29:23 +00:00
Jessica Lawshe
5c918bed94 Adding an institution email that must be linked 
GitOrigin-RevId: 9ba42a07fb386275cf6d81a7d4b91a7f974faf15
 2019-10-08 13:29:17 +00:00
Jessica Lawshe
ae423b5800 SAML feature by special link 
Allows for testing SAML linking before release

GitOrigin-RevId: 8a8c01aa15f04ba1749e93f4feadb7bf1643c783
 2019-10-08 10:52:30 +00:00
Jessica Lawshe
bf42f6c5b5 Update feature check 
GitOrigin-RevId: 82ad7be9f619b03f4d02f39c37940b2040c11030
 2019-10-08 10:52:24 +00:00
Ersun Warncke
3a7384c83f new UserHelper class for acceptance tests 
GitOrigin-RevId: 194593b8b70c74d2771f8e6f695faa47c84beeca
 2019-10-08 08:58:12 +00:00
Jessica Lawshe
61d895c8fc Merge pull request #2210 from overleaf/jel-provider-id-institution-registration 
Include provider ID with email data for institution registrations

GitOrigin-RevId: a752005c03494bab717be0cbb915cbcb7a0aa729
 2019-10-07 15:41:56 +00:00
Jessica Lawshe
e20c93b581 Merge pull request #2203 from overleaf/jel-registration-institution-sso 
Registration request with an institution email

GitOrigin-RevId: c544d8af4f6ca91addb638e02e9fe26acad7fbdb
 2019-10-07 15:41:47 +00:00
Eric Mc Sween
45e5808a35 Merge pull request #2202 from overleaf/em-collab-set-permissions 
Endpoint for setting a collaborator's permissions

GitOrigin-RevId: eb4d4dcc476908f5a42fefd7b81ef6fcc000be5b
 2019-10-07 12:29:00 +00:00
Timothée Alby
4c055637a4 Merge pull request #2205 from overleaf/ta-replace-loadash-map 
Replace Lodash's Map with Native Array's Map

GitOrigin-RevId: 17dac98c39e55b68a60fb0a61708a650e088853a
 2019-10-07 08:46:41 +00:00
Timothée Alby
5f107374a6 Merge pull request #2195 from overleaf/em-collab-permissions 
Move collaborators code to async/await

GitOrigin-RevId: 55b5dd8154d024e2cee738208c45a8139870b92b
 2019-10-07 08:46:36 +00:00
Timothée Alby
b050de1645 Merge pull request #2208 from overleaf/ta-handle-express-uri-error 
Handle Express URIError

GitOrigin-RevId: 6f22110971c8bdb1a7a2e5ba7043c37348b9092e
 2019-10-07 08:46:30 +00:00
Simon Detheridge
6c005da303 Merge pull request #2201 from overleaf/hb-relative-path-fix 
Handle double slash case of safe redirect paths

GitOrigin-RevId: fb6e8ea9d736a65df61f07d563235262b8aaf0f3
 2019-10-04 14:21:52 +00:00
Jessica Lawshe
4cce43b8d2 Merge pull request #2198 from overleaf/ta-user-membership-template-graph-fix 
New Approach to Template Graph Access Fix

GitOrigin-RevId: 5865d8cfaf6f825f8cb76724a04091f3659f9f0f
 2019-10-03 14:35:13 +00:00
Jessica Lawshe
d8e6535691 Merge pull request #2184 from overleaf/jel-unlink-institution-and-email-notifications 
Unlink institution login and send email link/unlink notifications

GitOrigin-RevId: d0fe96804d69e3c332c2b866fad5af026b5e2f8f
 2019-10-03 14:34:58 +00:00
Jessica Lawshe
ea0270dbdd Merge pull request #2168 from overleaf/pr-restrict-main-file-options 
Restrict main file options based on extension.

GitOrigin-RevId: f7d7a61c0454621dd8bc6ab5edce8a89721018ea
 2019-10-03 14:34:41 +00:00
Jessica Lawshe
6737637b39 Merge pull request #2190 from overleaf/as-invalid-password-errors 
Throw Error instead of plain object if email/password is invalid

GitOrigin-RevId: 2a1b040b07834064d547cef7890676ca014ec0ae
 2019-10-02 14:22:34 +00:00
Jessica Lawshe
b5f4e26840 Merge pull request #2118 from overleaf/cmg-convert-array-archiving 
New archiving endpoint to convert to array

GitOrigin-RevId: a6f5d3e2363afcbcd5719731261b85a0ae7a1e25
 2019-10-02 14:22:28 +00:00
Jessica Lawshe
86d844baf2 Merge pull request #2193 from overleaf/jel-account-settings-processing 
Add processing message to affiliation UI

GitOrigin-RevId: 2ceb9c7815da778f832715cac5c00bac3a32c127
 2019-10-02 14:22:20 +00:00
Jessica Lawshe
398d355ffd Merge pull request #2196 from overleaf/jel-template-metrics 
Set templateId for template graph requests

GitOrigin-RevId: 65167a30ab427146582389ea44d3d1eb9ccecacf
 2019-10-02 14:22:14 +00:00
Simon Detheridge
c1f43ad60e Merge pull request #2183 from overleaf/em-plans-faq 
Allow linking inside plans FAQ invoice answer

GitOrigin-RevId: 20fb07f0f8fafee65efaa1f4467013cccc7a154d
 2019-10-01 12:10:06 +00:00
Simon Detheridge
2eb1f510c1 Merge pull request #2182 from overleaf/ta-remove-user-stubs 
Remove Usages of UserStub

GitOrigin-RevId: 6896d0d3594d12ffa06211838ae2274661c77f4f
 2019-10-01 12:09:49 +00:00
Jessica Lawshe
962c5cc273 Merge pull request #2192 from overleaf/jel-account-settings-ui 
Remove processing message in account settings UI

GitOrigin-RevId: 6938e386819ca0d2923f56c8a1ea50e2faa20121
 2019-09-30 16:48:39 +00:00
Eric Mc Sween
3ec74ac6f2 Merge pull request #2164 from overleaf/em-ownership-transfer 
Project ownership transfer backend endpoint

GitOrigin-RevId: b7d267f2c105e8f51d5013289ac4afeb077c1e21
 2019-09-30 15:01:03 +00:00
Eric Mc Sween
acd926e2e0 Merge pull request #2178 from overleaf/sk-hide-ui-anon-read-only-token 
Handle anonymous users when deciding to restrict view of the editor

GitOrigin-RevId: 617f7ef2c8cc34142a6b8187c467fadb90745863
 2019-09-30 13:36:54 +00:00
Eric Mc Sween
a87a731d25 Merge pull request #2176 from overleaf/em-ta-json-auth 
Make ensureUserCanAdminProject always raise a 403

GitOrigin-RevId: 4dd1eca1cfb171d92392bc3c8208b61cbf7c6815
 2019-09-30 13:36:48 +00:00
Eric Mc Sween
039b5eaba0 Merge pull request #2167 from overleaf/jel-saml-account-settings-layout 
Account settings layout for institution SSO

GitOrigin-RevId: d9c9e5eeb3b4a215456b0f5294139c1b8d4968c3
 2019-09-30 13:36:41 +00:00
Eric Mc Sween
16ac5126cb Merge pull request #2181 from overleaf/sk-exclude-smoketest-user-from-rate-limits 
Exclude smokeTest user from rate limits

GitOrigin-RevId: 01197ce9971477550e73989067adc631189382b1
 2019-09-26 14:38:13 +00:00
Eric Mc Sween
7951ee229a Merge pull request #2179 from overleaf/sk-re-add-project-dashboard-rate-limit 
Re-add rate limit on /project

GitOrigin-RevId: 1099361db517c8bfce08b4bbc6b64d05205cccb1
 2019-09-26 12:56:08 +00:00
Eric Mc Sween
9cd5af840a Merge pull request #2152 from overleaf/as-per-user-trash-backend 
Add per-user trash endpoint

GitOrigin-RevId: 94a6e3416b047e1f8721159ac0d049e98785e5ce
 2019-09-26 12:56:02 +00:00
Eric Mc Sween
9a31361795 Merge pull request #2175 from overleaf/ta-user-membership-refactor-fix 
UserMembershipAuthorization Refactor Fix

GitOrigin-RevId: ac404324728f4a3fe18e122c9e52ad4956ae47d7
 2019-09-26 12:55:56 +00:00
Simon Detheridge
6e7007ef3e Merge pull request #2170 from overleaf/ta-confirmation-email-missing-fix 
Prevent Email Confirmation If Email Is Missing for User

GitOrigin-RevId: cab9667103b0a5596cf067f85f747b1481ca4e66
 2019-09-25 14:48:25 +00:00
Simon Detheridge
8ec2f1a896 Merge pull request #2157 from overleaf/jel-saml-logout-redirect 
Redirect handling after logging out

GitOrigin-RevId: 01562dbe71ff4f3571fb0d433b96ccca34aad24e
 2019-09-25 14:48:19 +00:00
Simon Detheridge
111d22d260 Don't leave dangling users in mailchimp when change-address fails (#2165) 
* Don't leave dangling users in mailchimp when change-address fails

Also prevents upserting of users when unsubscribing

bug: overleaf/issues#2220
bug: overleaf/issues#2301
bug: overleaf/issues#2302

* Tidy up NewsletterManager. Enable deletion of contacts on account delete.

GitOrigin-RevId: ab7cde7a7b7018b37dea54ffa154e02c5aea0244
 2019-09-25 14:47:57 +00:00
Brian Gough
13a53b8fbc Merge pull request #2177 from overleaf/bg-add-docstore-request-timeouts 
add 30 second timeout on requests to docstore

GitOrigin-RevId: b5e7a8926113fb50ad9931c89061d665a8d1b1e0
 2019-09-25 13:03:35 +00:00
Ersun Warncke
3c1f64782f convert UserCreator to async/promises 
GitOrigin-RevId: a040b9dd65aa834d1dd9e552ffc1434a17c43eae
 2019-09-25 12:33:43 +00:00
Timothée Alby
b43d26b543 Merge pull request #2140 from overleaf/as-decorate-archive-manager-errors 
Decorate archive manager errors with OError

GitOrigin-RevId: 2795e5aaf172fd3b2b3a396b90b486b4ce5cfa4f
 2019-09-24 08:58:11 +00:00
Timothée Alby
a23ecc9bf8 Merge pull request #2105 from overleaf/ta-user-membership-refactor 
UserMembershipAuthorization Refactor

GitOrigin-RevId: 7711cda4a134823cbacee42731319fbb8aa648d0
 2019-09-24 08:58:05 +00:00
Timothée Alby
44d3b8b92e Merge pull request #2161 from overleaf/ta-decaf-cleanup-authentication 
Decafeinate AuthenticationManager

GitOrigin-RevId: 491c7fbeb7f83e81783beadfdd0d4cb510f7d429
 2019-09-24 08:57:59 +00:00
Timothée Alby
af7eea35a1 Merge pull request #2162 from overleaf/ta-decaf-cleanup-authorization 
Decafeinate Authorization Feature

GitOrigin-RevId: 5f139c24eac38ef0818a0eec9d308aacca0fde56
 2019-09-24 08:57:53 +00:00
Timothée Alby
c1c1b85a40 Merge pull request #2163 from overleaf/ta-decaf-cleanup-user 
Complete Decafeinate of User Feature

GitOrigin-RevId: b8d7ebc59c4f6673392b4a0f33fb11e002d5a3a0
 2019-09-24 08:57:47 +00:00
Simon Detheridge
2031115f48 Merge pull request #2156 from overleaf/hb-secure-headers 
Use helmet to set nosniff and sameorigin

GitOrigin-RevId: e5d684d772523ca740be75ebe9d248db74209f25
 2019-09-18 10:41:51 +00:00
Simon Detheridge
696527df8d Merge pull request #2153 from overleaf/spd-subscription-indexes 
Make default for Subscription.manager_ids 'required'

GitOrigin-RevId: 18aa899736270bbb7eacbda53824a2ed52ca936f
 2019-09-18 10:14:45 +00:00
Simon Detheridge
deaf76be39 Merge pull request #2135 from overleaf/sk-hide-info-readonly-token-access 
Restrict information and features for token-read-only users of a project

GitOrigin-RevId: 98512fb9a916f430fd635fd5634c37799476010d
 2019-09-18 10:14:39 +00:00
Jessica Lawshe
7c533fa5fb Error handling when missing SAML data 
When logging in and linking, if session data is missing show a more specific error message.

GitOrigin-RevId: 32d733f7478180bcce18e1f466ae10255c763997
 2019-09-17 12:33:22 +00:00
Miguel Serrano
f6d70de1aa Disable check v1 token server pro (#2149) 
GitOrigin-RevId: 3aba52f97dc99212a8516e3c071c341b68763199
 2019-09-13 07:35:35 +00:00
Miguel Serrano
96533165eb Remove leftover flag: publish-templates (#2136) 
GitOrigin-RevId: 67a849af309ea89f619d3addd29d5cba79268b04
 2019-09-13 07:35:28 +00:00
Jessica Lawshe
4b894c152f Merge pull request #2114 from overleaf/jel-saml-account-linking 
Login and link SAML account

GitOrigin-RevId: 97daf9b6028ece3b3a19715873439f5fea7ecebb
 2019-09-12 14:17:08 +00:00
Brian Gough
837599d89c Merge pull request #2146 from overleaf/bg-fix-redis-user-session-expiry 
fix expiry of user sessions in redis

GitOrigin-RevId: e53aa93bba99fe0cd632ac8bce36c0228e20d04a
 2019-09-12 08:18:43 +00:00
Simon Detheridge
adbe19fa12 Merge pull request #2144 from overleaf/spd-unhandled-missing-project 
Handle errors when projects are deleted while git-bridge requests are ongoing

GitOrigin-RevId: 488c3d480f2bb58aebaac5bdcbb412009c14322a
 2019-09-11 11:19:36 +00:00
Timothée Alby
561d14bbb6 Merge pull request #2125 from overleaf/spd-editor-reconnect-improvements 
Track connection state in ConnectionManager and improve retry logic

GitOrigin-RevId: b81b8376f7210e89e0dc102e68bdf2092c1ae8ad
 2019-09-10 14:44:24 +00:00
Timothée Alby
0c9bf05a0a Merge pull request #2139 from overleaf/ta-subscription-restore-misc 
Restore Deleted Subscriptions Extra

GitOrigin-RevId: 6fceb1142af8ba510dc266ef31acc86ddca69f0e
 2019-09-10 14:44:18 +00:00
Timothée Alby
71060e8d57 Merge pull request #2123 from overleaf/ta-subscription-restore 
Restore Deleted Subscriptions

GitOrigin-RevId: 4df1d2116e5502235e06f47d7317d97ad458b75b
 2019-09-10 14:28:55 +00:00
Hugh O'Brien
911a2ded4d Merge pull request #2133 from overleaf/hb-fix-lost-connection-typo 
Adding space in reconnection error

GitOrigin-RevId: 76ec0e999fafcddc47301e1f39a2d63db1a12eae
 2019-09-10 10:09:06 +00:00
Hugh O'Brien
a319073a08 Merge pull request #2132 from overleaf/spd-collabratec-tests 
Make collabratec tests not depend on previous run state

GitOrigin-RevId: 264f946e05b848fa253b6fbdd8e97a4998e4158e
 2019-09-10 10:08:59 +00:00
Jessica Lawshe
4defd2b6b5 Render account linking page 
Simplify account linking data. Change `institution.name` to `institutionName`

Update emailAlreadyLinked value. The layout checks for 'primary' and 'secondary', not a boolean, so update data passed

Add error messages to Account Linking pages

Rename account linking file name to reflect route change. Changed `institution` to `institutional` on the login route.

GitOrigin-RevId: 4e12b9ec7c1577efbaa8c0628e3c41c70114844e
 2019-09-09 14:48:22 +00:00
Eric Mc Sween
abae7ef2a3 Merge pull request #2113 from overleaf/em-project-details-handler-async 
Move ProjectDetailsHandler to async/await

GitOrigin-RevId: 5ec9343d6203850641174cc728db9a2e56f44775
 2019-09-09 12:05:38 +00:00
Eric Mc Sween
797595bb1a Merge pull request #2128 from overleaf/em-clsi-error-logs 
Avoid logging document content in failed compile

GitOrigin-RevId: 7ca296ccb28d814b9fa5610c0ee065e4614875a6
 2019-09-09 12:05:32 +00:00
Eric Mc Sween
d0fc8d90e5 Merge pull request #2119 from overleaf/ta-subscription-deletion 
Store Deleted Subscriptions

GitOrigin-RevId: c7004f1807dee6b6ec82eeb2a8fe939801ce3e8b
 2019-09-09 12:05:23 +00:00