github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
8772 commits 3 branches 7 tags 206 MiB
Commit graph

8424 commits

Author SHA1 Message Date
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
3a4981cbb8 Merge pull request #2233 from overleaf/bg-upgrade-ioredis 
upgrade to ioredis-4.14.1 via redis-sharelatex-1.0.11

GitOrigin-RevId: f6b20e95b03121682db902b80ffb3650d5517011
 2019-10-14 09:01:08 +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
Brian Gough
48b58899f7 Merge pull request #2224 from overleaf/bg-fix-use-of-parseint 
fix setting for zero values

GitOrigin-RevId: e6037c6e9940421acea730fdc088d4cf230fdb11
 2019-10-11 10:16:41 +00:00
Brian Gough
9edb95b706 Merge pull request #2223 from overleaf/spd-redis-retries 
Add maxRetriesPerRequest redis setting

GitOrigin-RevId: 69810e40eaedaf05d9e3397b59b26ea43ecbe9ce
 2019-10-10 14:00:59 +00:00
Brian Gough
d376047c20 Merge pull request #2222 from overleaf/bg-invalidate-tokens 
invalidate tokens

GitOrigin-RevId: b8a65846d2b671f7f7b8a2ab75f76bb8255bd73b
 2019-10-10 11:39:18 +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
17babc034f Merge pull request #2204 from overleaf/ta-recurly-countries 
Update Countries To Use Recurly's Countries List

GitOrigin-RevId: e6465af0bf4574f0bd45fc790f154d7a5ec1d889
 2019-10-07 08:46:47 +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
11ce07ec50 Merge pull request #1999 from overleaf/spd-migrations 
Add database migrations using 'east'

GitOrigin-RevId: da067292e9db1fad050545858bc7cc39245d3395
 2019-10-01 12:09:58 +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
a10cfcddd5 Merge pull request #2169 from overleaf/em-upgrade-texlive 
Upgrade some projects to TeX Live 2018

GitOrigin-RevId: e5e56058e43b788657e89c44834633e75bbd78e7
 2019-09-26 12:56:14 +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
7aae089e35 Merge pull request #2171 from overleaf/ta-console-fix 
Fix Invisible JS Errors

GitOrigin-RevId: 7d50fcc1517d148cc70744b1f23b3c5171d2ea62
 2019-09-25 14:48:34 +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
89abb5b609 Merge pull request #2160 from overleaf/pr-persist-contact-modal-details 
Persist contact modal form info

GitOrigin-RevId: d7bf656015694e36a717e89de0879233c43d63a3
 2019-09-25 14:48:12 +00:00
Simon Detheridge
e5e28c7fb1 Merge pull request #2158 from overleaf/pr-fix-autocomplete-opens-for-collaborators 
Ignore remote changes for autocompletion purposes.

GitOrigin-RevId: df0541f1f7cb8527263988f60ca5b80510f8971e
 2019-09-25 14:48:05 +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
Brian Gough
6c2d06c78b Merge pull request #2173 from overleaf/bg-fix-track-changes-adapter-extensions 
avoid exception for missing marker ids

GitOrigin-RevId: 47faa35450cafef3c55a9b63787df1d9df9f1eaa
 2019-09-25 13:03:29 +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
Miguel Serrano
bc233e6eba Restored Sharelatex Template publishing UI (#2137) 
GitOrigin-RevId: b322130a64baa93602ef5a8e79f1cefdff32feb1
 2019-09-09 08:45:46 +00:00
Miguel Serrano
08f8bbce9b Update 'affiliations' feature flag to support Server Pro (#2127) 
GitOrigin-RevId: 93633994e052badf73b48e5b10971ea6257503ac
 2019-09-09 08:45:39 +00:00
Timothée Alby
294ce1a13c remove dead code around syncUserToSubscription (#2122) 
GitOrigin-RevId: d489365a4bceb9d675e6a75b25be61baa3aa010e
 2019-09-04 11:45:24 +00:00
Miguel Serrano
dc6e4b3a12 Added missing email field when registering user token (#2130) 
GitOrigin-RevId: f7aaeae1f82e0188c838d7d1d975a81664950f78
 2019-09-04 11:17:15 +00:00
Miguel Serrano
7c68947100 Added public/src/ide/index.js to launchpad module (#2112) 
GitOrigin-RevId: b5d77547546e6e5c2997b162fc78ac75c891382f
 2019-09-03 15:25:44 +00:00
Brian Gough
7d9fe92f28 Merge pull request #2120 from overleaf/bg-fix-rate-limit 
Revert "Add a rate limit to the `/project` page"

GitOrigin-RevId: 1bcd88e03a4cea2defbd4779bc81d0d972f1cd4e
 2019-09-03 15:25:38 +00:00
Simon Detheridge
b57adcf02a Merge pull request #2107 from overleaf/spd-max-recon-interval 
Shrink MAX_RECONNECT_GRACEFULLY_INTERVAL to 45 seconds

GitOrigin-RevId: f84983b772d0dde5fc76d9439a3424cefb66ec06
 2019-09-03 15:25:32 +00:00
Simon Detheridge
e69b66fac3 Merge pull request #2117 from overleaf/spd-joinproject-ratelimit 
Increase editor join-project rate limit

GitOrigin-RevId: 4d0d210e9d69804184765cad89cc3f67e0c482b7
 2019-09-03 15:25:27 +00:00
Shane Kilkelly
6c6d8ba373 Merge pull request #2110 from overleaf/ta-affiliations-feature 
make affiliations feature depend on the existence of v1 API

GitOrigin-RevId: 0050c2f338eaab254583f4547630694725d90463
 2019-09-03 15:25:21 +00:00
Shane Kilkelly
84de1af960 Merge pull request #2108 from overleaf/sk-add-rate-limit-to-project-page 
Add a rate limit to the `/project` page

GitOrigin-RevId: ef77f092c94c6a88fc73354cee6b8572b84d3d3a
 2019-09-03 15:25:13 +00:00
Eric Mc Sween
869fcf7952 Merge pull request #2089 from overleaf/em-mailchimp-unsubscribe 
Handle error on Mailchimp unsubscribe when deleting users

GitOrigin-RevId: 8923480e6d50de45003fd7741610f995753a412b
 2019-09-03 15:25:01 +00:00
Eric Mc Sween
3791b8d288 Merge pull request #2104 from overleaf/ta-user-membership-acceptance-tests 
Acceptance Tests for UserMembership Authorization

GitOrigin-RevId: caad99727fd2fedc91f2b2063ed83a1e02d9ea1d
 2019-09-03 15:24:53 +00:00
Chrystal Maria Griffiths
6f2b4d3da3 Merge pull request #2081 from overleaf/cmg-per-user-trash 
Add per-user trashed state to project model

GitOrigin-RevId: 16a753702d3503eee011dd2adca5dc8df3da87f4
 2019-08-27 10:50:05 +00:00
Chrystal Maria Griffiths
c1f8ac8de1 Merge pull request #2090 from overleaf/hb-fix-daterangepicker 
Cleanup Metrics Daterange Picker

GitOrigin-RevId: ae5ef24c5b7f007f5bdd38ecebea2d0830611b71
 2019-08-27 10:49:57 +00:00
Chrystal Maria Griffiths
1335d21136 Merge pull request #2097 from overleaf/em-chai-spies 
Remove chai-spies

GitOrigin-RevId: 7fa41fe32c1be985d761b7327950995d6afe7c4e
 2019-08-27 10:49:50 +00:00
Timothée Alby
03460ba229 Merge pull request #2020 from overleaf/ta-recurly-sca 
SCA Integration

GitOrigin-RevId: d7935584f87ec7c7339d050430efc87420a39de1
 2019-08-22 12:10:46 +00:00
Miguel Serrano
b90d07fc6f Replace sharelatex logo with Overleaf in launchpad (#2088) 
GitOrigin-RevId: 3649630ea69d2e4b2e21ca1da94895fd3e75b2da
 2019-08-22 11:07:55 +00:00
Eric Mc Sween
95f9a08768 Merge pull request #2033 from overleaf/ns-em-add-english-dialects 
add languages config to default settings

GitOrigin-RevId: 12f89c21e3bcca3e2fb72f032b1264060531950b
 2019-08-20 13:00:07 +00:00
Eric Mc Sween
358cd22f54 Merge pull request #2087 from overleaf/subscription-invoices-link 
Add Link to Invoices for Recurly Subscriptions

GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7
 2019-08-20 12:59:58 +00:00
Eric Mc Sween
25970e94da Merge pull request #2078 from overleaf/update-closed-message 
Reference status page from maintenance page

GitOrigin-RevId: 6ddda6e479d78d38be3c23ff7e82cd23e07059cb
 2019-08-20 12:59:52 +00:00
Eric Mc Sween
1fc64fc4e2 Merge pull request #2084 from overleaf/ta-new-subscription-country 
Fix Country Auto-Selection on New Subscription Form

GitOrigin-RevId: fdf7b197017ee9ce527dd7737240756ff16d206a
 2019-08-20 12:59:47 +00:00
Eric Mc Sween
ced31d6131 Merge pull request #2055 from overleaf/jel-sso-layouts 
Layouts for login, register, institutional log in, & linking pages

GitOrigin-RevId: af0ea36e3bd6e39b0a6305bf0882c296eb931d5b
 2019-08-20 12:59:41 +00:00
Eric Mc Sween
0e8866f651 Merge pull request #2079 from overleaf/ta-institution-new-licences 
Add Routing for New Licences Metrics Graph

GitOrigin-RevId: 9e7def383d257db1eef03b1224b4b5fef376427c
 2019-08-20 12:59:36 +00:00
Eric Mc Sween
4d69b63993 Merge pull request #2070 from overleaf/pr-fix-light-drag-and-drop 
Change hover highlights and draggable helper when moving files

GitOrigin-RevId: b7a6e9cd1484115fa5fbf1ed40127a6aba525cbd
 2019-08-20 12:59:30 +00:00
Alasdair Smith
c5da705fa0 Use babel-eslint for parsing (#2073) 
Eslint's default parser cannot handle some newer es6+ syntax (e.g.
dynamic import() function). Babel-eslint uses babel for parsing instead
which can handle the newer syntax

GitOrigin-RevId: 0a5666ac3bdc3c0885842dcdbc6f6d3b4dbf2d4b
 2019-08-19 15:20:06 +00:00
Miguel Serrano
9a8a182c1b Fix UserGetter email retrieval with affiliations disabled (#2085) 
GitOrigin-RevId: f868333f3c18f674b7ba9c387315c2d5ad1fd80b
 2019-08-19 15:19:57 +00:00
Miguel Serrano
8c55989166 Create User.emails field for newly created users in launchpad (#2083) 
GitOrigin-RevId: b6cfad25eeba21294f70769e11c3e3fa825f93aa
 2019-08-19 15:19:51 +00:00
Miguel Serrano
9386bdeaff Delete copybara sync server pro (#2082) 
This actually reverts https://github.com/overleaf/web-internal/pull/2052

GitOrigin-RevId: c282655cf29533e8cb523f854247bd37396b1346
 2019-08-16 14:27:30 +00:00
Miguel Serrano
e8790a638c affiliations flag checks Settings.overleaf (#2080) 
GitOrigin-RevId: c0dc5a8c1e6ad6c5ddb055ccfc21c901d66a9827
 2019-08-15 14:00:24 +00:00
Brian Gough
9833f1ec93 Merge pull request #2060 from overleaf/spd-linkedfiletests-nondependent 
Refactor and clean up LinkedFileTests to not be dependent on previous run

GitOrigin-RevId: 199a4ab6b463b2248244a067c765078816da182b
 2019-08-14 15:19:40 +00:00
Brian Gough
b591c950e0 Merge pull request #2077 from overleaf/bg-fast-reconnect-for-websocket 
handle 'retry' messages from realtime

GitOrigin-RevId: a896b491f978e37a4afef67e434795b0f7cd301c
 2019-08-14 15:19:35 +00:00
Henry Oswald
87605d835e Merge pull request #2075 from overleaf/ho-setting-doc-log-level 
downgrade log of no root doc to log to reduce noise

GitOrigin-RevId: f729f44b46704a26a8bcd808e64a239a0da38107
 2019-08-14 15:19:29 +00:00
Eric Mc Sween
df2d46b332 Merge pull request #2074 from overleaf/em-o-error 
Introduce OError in CLSI manager

GitOrigin-RevId: 4299de10a21242be4a127e761720de48f587412b
 2019-08-13 12:50:25 +00:00
Eric Mc Sween
29dec409d6 Merge pull request #2072 from overleaf/as-fix-local-lint 
Fix linting locally

GitOrigin-RevId: eeb6dab09f3e3f7208ea104e7ceecd3d0e29564b
 2019-08-13 12:50:05 +00:00
Eric Mc Sween
1bb9d2f944 Merge pull request #2049 from overleaf/jel-cms-decaf-cleanup 
CMS eslint and post decaf cleanup

GitOrigin-RevId: 67d98668f0b9c1d8f973116dc689486ef418a3fd
 2019-08-13 12:49:46 +00:00
Eric Mc Sween
72ea7eb5f0 Merge pull request #1992 from overleaf/pr-history-file-selection-improvements 
History file selection and scrolling improvements

GitOrigin-RevId: e5f31eca07a72b25245f8883aec1664c320c0788
 2019-08-13 12:49:32 +00:00
Simon Detheridge
6defe1a693 Make tests in RegistrationTests not depend on previous run state 
GitOrigin-RevId: 68bcf9530ec6f5831c67449f35d0f010e5104f78
 2019-08-13 08:50:19 +00:00
Simon Detheridge
7d253651ca Remove 'this' usage from UserUpdater 
GitOrigin-RevId: f49126b69b22f8f6860d77ba07d9ae8fd68b5aaf
 2019-08-13 08:50:13 +00:00
Ersun Warncke
c0cc8fdd3f add tests for error handling, clean up 
GitOrigin-RevId: 8b102d54fd3d7f703dca81da182d3ab8eae3c9c2
 2019-08-13 08:50:01 +00:00
Ersun Warncke
cd57ff4e7f return errors and clean up ProjectOptionsHandler 
GitOrigin-RevId: 5be79a317419998216e9f207313c114888beb415
 2019-08-13 08:49:55 +00:00
Ersun Warncke
39cb437bb6 more package.json changes 
GitOrigin-RevId: 00ae56b88127d858250d56c876c5a65afc338cd8
 2019-08-13 08:49:50 +00:00
Ersun Warncke
6ff5ef92ce add version for timekeeper 
GitOrigin-RevId: ec3664df27823ae2ee63982070dcd0615de19e5b
 2019-08-13 08:49:44 +00:00
Eric Mc Sween
b9bf16d22a Decaf cleanup (#2069) 
GitOrigin-RevId: 2412480d495bfa0b4ad35edbbbeaaaf8644906ca
 2019-08-12 11:39:23 +00:00
Miguel Serrano
6006c8ca79 Fixed incompatibilities between overleaf.com and community (#2028) 
GitOrigin-RevId: fc1e4e3e179cab75144043d83197f09e4f6c7642
 2019-08-12 11:39:17 +00:00
Timothée Alby
7d1bab4e88 Merge pull request #2025 from overleaf/ta-metrics-admin 
Admin Metrics

GitOrigin-RevId: 1179893b9b2148110b86caca12b057fccb04f3af
 2019-08-12 07:55:44 +00:00
Simon Detheridge
67b68b0171 Change token-access acceptance tests to not depend on previous test runs (#2063) 
GitOrigin-RevId: 3727af6743cc530fe4a9dc7ec787dad25f1eadef
 2019-08-10 01:58:33 +00:00
Alasdair Smith
48481e431e Merge pull request #2034 from overleaf/as-upgrade-babel 
Upgrade babel to v7

GitOrigin-RevId: 1626f0d3343a5cb32a71dba5a8f32657b2d7237c
 2019-08-09 09:54:37 +00:00
Alasdair Smith
3422c17dc4 Merge pull request #1948 from overleaf/cmg-allow-array-archiving 
Make checking for project.archived array-friendly

GitOrigin-RevId: 2902a12fb4611a5786d4b10feba534b1cd29668b
 2019-08-09 09:54:27 +00:00
Alasdair Smith
c8140f9641 Merge pull request #2059 from overleaf/spd-no-console 
Don't allow 'console.log' in backend code

GitOrigin-RevId: f52413b574487eef54e8bd27cc61d15a011beb6f
 2019-08-09 09:54:16 +00:00
Alasdair Smith
5b458e32ac Merge pull request #2057 from overleaf/spd-promisify-userhelper 
Add promisified version of User helper in acceptance tests

GitOrigin-RevId: ce2c28dd0d8ec66edaef54a260a3944f4cdd55d6
 2019-08-09 09:53:58 +00:00
Simon Detheridge
1d13f41163 Merge pull request #2045 from overleaf/hb-fix-ipmatcher-dash-call 
checking ip matcher on dash load correctly

GitOrigin-RevId: dae581808d0bdc57b7bbc3601729e54e773b6c7f
 2019-08-07 15:29:36 +00:00
Simon Detheridge
a815c6a3e8 Merge pull request #2016 from overleaf/sk-fix-session-data 
Fix mismatched user session data

GitOrigin-RevId: d464d05431ac86e279109aa3f7bc26dcf76662f4
 2019-08-07 15:29:31 +00:00
Simon Detheridge
7588393580 Merge pull request #2047 from overleaf/spd-eslint-mocha-arrows 
Enforce consistent callback style in mocha tests

GitOrigin-RevId: a64c293dae6926ef5831abe97eaf2044942a5c85
 2019-08-07 15:29:25 +00:00
Brian Gough
5c32523b53 Merge pull request #2050 from overleaf/bg-fix-session-logging-error 
fix error in session logging

GitOrigin-RevId: e31ac3585f4c502a04602e9a49445319502c5d52
 2019-08-07 08:58:24 +00:00
Eric Mc Sween
523b5b2114 Merge pull request #2046 from overleaf/hb-detect-changes-pre-export 
Do one compile on toggle to autocompile

GitOrigin-RevId: 21776835c691bec9a1f80a7c0d4e651cc8c59dac
 2019-08-06 15:33:07 +00:00
Eric Mc Sween
83495f4559 Merge pull request #2037 from overleaf/hb-detect-changes-pre-export 
Detect for uncompiled changes before export

GitOrigin-RevId: a8b044c79ea4a6678388130d5ce77a05693c2d60
 2019-08-06 12:34:37 +00:00
Eric Mc Sween
2269e4c4f1 Merge pull request #2031 from overleaf/bg-avoid-binary-text-mismatch-on-dropbox-updates 
avoid writing binary data into existing docs via dropbox

GitOrigin-RevId: c6bc0ee3854c737ad80ea10a91bc27c88db2f838
 2019-08-06 12:34:32 +00:00
Eric Mc Sween
e0c3a971bb Merge pull request #2044 from overleaf/em-forwarded-for 
Get client IP behind proxies

GitOrigin-RevId: aed5e0bdcefb22b45db1b8745c5cd7522a32c21f
 2019-08-06 12:34:26 +00:00
Eric Mc Sween
7fcfbe8930 Merge pull request #2038 from overleaf/spd-refactor-project-structure-tests 
Refactor ProjectStructureTests to not depend on previous run state

GitOrigin-RevId: c004e980406db0f0c547b9407a6f5a76cccabe03
 2019-08-06 12:34:21 +00:00
Eric Mc Sween
1c43219315 Merge pull request #2039 from overleaf/spd-more-nondependent-tests 
Replace before with beforeEach in (most) acceptance tests

GitOrigin-RevId: 888c320d5616d541c112c007c488c38448c4c88d
 2019-08-06 12:34:15 +00:00
Eric Mc Sween
5d0c6cddf6 Merge pull request #2040 from overleaf/spd-projectinvite-tests 
Ensure tests ProjectInviteTests are not dependent on previous test state

GitOrigin-RevId: 0db825789f86d2a22a8ad981d4d1875a93c83017
 2019-08-06 12:34:10 +00:00
Eric Mc Sween
2df7a8eaad Merge pull request #2032 from overleaf/as-upgrade-webpack 
Upgrade webpack to v4

GitOrigin-RevId: a92c487fee79c29c5314273bf05439c9dbb0ce4d
 2019-08-06 12:34:03 +00:00
Brian Gough
2e20975f53 Merge pull request #2042 from overleaf/bg-fix-applyCMToShareJS-offsets 
fix startPos calculation for applyCMtoShareJs

GitOrigin-RevId: 642dc1fd2d7b2a1b34031900c137ffc10f94ddeb
 2019-08-06 07:51:57 +00:00
Brian Gough
8237319683 Merge pull request #2041 from overleaf/bg-enforce-consistency-check 
enforce consistency check for editors

GitOrigin-RevId: 2b8abed4519476be52563cbfecb799858f6dad0c
 2019-08-06 07:51:52 +00:00
Alasdair Smith
de60c3d25f Merge pull request #2036 from overleaf/jel-footer-link 
Support full URLs in link to tabs within the same page

GitOrigin-RevId: 50f66c57b2b3e4771b9b9620af9417822956be0a
 2019-08-05 14:48:08 +00:00
Alasdair Smith
1b3f4033e7 Merge pull request #2009 from overleaf/as-remove-coffee-script 
Remove coffee-script & other unused dependencies

GitOrigin-RevId: 22736dbed80b2654ad8498862d424c2de7ef0393
 2019-08-05 14:47:58 +00:00
Alasdair Smith
efbcfd10be Merge pull request #2030 from overleaf/jel-card-z-index 
Remove card position styling

GitOrigin-RevId: 298998f5f3032064b7bce8016cab96a54597c2b3
 2019-08-02 08:59:17 +00:00
Alasdair Smith
07e68cbc00 Merge pull request #2008 from overleaf/as-package-lock 
Switch shrinkwrap to package-lock

GitOrigin-RevId: 672a71f86be700ba995f25a383efe2bdaf8f02b9
 2019-08-02 08:59:10 +00:00
Timothée Alby
7785c7b59e Merge pull request #2029 from overleaf/ta-build-main-recurly-3 
Load Recurly JS Separately

GitOrigin-RevId: 8baa2be76fa9d8a47676bc0bd0a80f4c05cc1600
 2019-07-31 15:44:44 +00:00
Timothée Alby
befa4e932e Merge pull request #2027 from overleaf/ta-build-main-recurly-2 
add main-recurly.js to Gruntfile

GitOrigin-RevId: 5527f97394efe6ca3d8c206276c46993547c8edc
 2019-07-31 10:48:57 +00:00
Timothée Alby
8fb6835f8a Merge pull request #2026 from overleaf/ta-build-main-recurly 
Add build steps for main-recurly.js

GitOrigin-RevId: 25231c62854b75904b1b5288b3a5157e10220f9d
 2019-07-31 09:49:07 +00:00
Timothée Alby
ef9b487a60 Merge pull request #2019 from overleaf/jel-remove-oauth-migration 
Remove unused OAuth link/unlink migration

GitOrigin-RevId: 20fce5a714f5897a1b5a93a65156f5368f2d1c65
 2019-07-31 08:33:37 +00:00
Timothée Alby
b9ab0edf69 Merge pull request #2015 from overleaf/ta-recurly-upgrade 
Upgrade Recurly

GitOrigin-RevId: 9a7c4804d2fafa31ea634498359dbfd95416b2ae
 2019-07-31 08:33:31 +00:00
Timothée Alby
018b2cc474 Merge pull request #2010 from overleaf/ta-http-errors 
Add More Http Errors

GitOrigin-RevId: d7aab42e1c7cec8757d6f2c6fc839a6c3f204351
 2019-07-31 08:33:25 +00:00