github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity
8809 commits 3 branches 7 tags 221 MiB
Commit graph

5142 commits

Author SHA1 Message Date
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
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
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
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
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
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
Miguel Serrano
9a8a182c1b Fix UserGetter email retrieval with affiliations disabled (#2085) 
GitOrigin-RevId: f868333f3c18f674b7ba9c387315c2d5ad1fd80b
 2019-08-19 15:19:57 +00:00
Miguel Serrano
e8790a638c affiliations flag checks Settings.overleaf (#2080) 
GitOrigin-RevId: c0dc5a8c1e6ad6c5ddb055ccfc21c901d66a9827
 2019-08-15 14:00:24 +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
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
7d253651ca Remove 'this' usage from UserUpdater 
GitOrigin-RevId: f49126b69b22f8f6860d77ba07d9ae8fd68b5aaf
 2019-08-13 08:50:13 +00:00
Ersun Warncke
cd57ff4e7f return errors and clean up ProjectOptionsHandler 
GitOrigin-RevId: 5be79a317419998216e9f207313c114888beb415
 2019-08-13 08:49:55 +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
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
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
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
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
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
Simon Detheridge
d9d9ee9541 Merge pull request #2023 from overleaf/spd-fix-deleted-project-expiry 
Fix not-found error when cleaning up deleted projects

GitOrigin-RevId: db3d0f8756319dbeb7ff753a8603cf61b9fb8a0c
 2019-07-30 08:40:37 +00:00
Brian Gough
e197d58103 Merge pull request #2003 from overleaf/bg-use-individual-channels 
support individual pubsub channels

GitOrigin-RevId: e750eeb1945ddcf2c92d0d1878363f14da208984
 2019-07-30 07:33:36 +00:00
nate stemen
49ac91efe6 Merge pull request #2006 from overleaf/ns-project-import-dash-improvements 
project import dash improvements

GitOrigin-RevId: 4e8ce6bdef7d22acff1746981a513ae1ef7a4539
 2019-07-29 14:56:14 +00:00
Hugh O'Brien
a638f9e567 Merge pull request #1976 from overleaf/hb-v1-history-metadata-from-mongo 
Fetch history metadata for v1 users

GitOrigin-RevId: a65971dbef2be02c17ff07b1bf22c0f7b15c1780
 2019-07-29 09:58:35 +00:00
Simon Detheridge
cf22393dff Merge pull request #2018 from overleaf/spd-handle-undefined-in-deletedproject 
Handle 'undefined' values when creating DeletedProject objects

GitOrigin-RevId: 1d34d3b44feb50fd5501b1c35f06f62c0170b861
 2019-07-26 15:41:37 +00:00
Simon Detheridge
2243f42f9b Merge pull request #1996 from overleaf/spd-soft-deletion-admin-panel-improvements 
Improve display of soft-deleted things in admin panel

GitOrigin-RevId: 8413103fb750749bb27c69ccb6ff34c4ef62d402
 2019-07-26 14:39:24 +00:00
Simon Detheridge
d7bee9a7d8 Merge pull request #2014 from overleaf/spd-deleted-project-collab-ids 
Store and backfill collaborator and overleaf history IDs in deleted projects

GitOrigin-RevId: 34950e29d6910c22f1f6f153f8035a96a1ea8360
 2019-07-26 14:39:18 +00:00
Simon Detheridge
3b3e9e79fa Merge pull request #2007 from overleaf/bg-enable-doc-hash-checking-for-all-users 
enable doc hash checking for all users

GitOrigin-RevId: 9f26580bf21791669361cc84ca2fa561b1bb3f50
 2019-07-25 11:14:09 +00:00
Ersun Warncke
d9b5941642 do not use v1 for setting default email 
GitOrigin-RevId: 00d4610ae55c0a90699d4bc79e7d08d432087abe
 2019-07-23 10:59:58 +00:00
Jessica Lawshe
0a2a32120f Use v2 data for OAuth providers 
GitOrigin-RevId: 09df3253c283b3196bc48a0440e9ea5f1eb20c9c
 2019-07-23 10:59:53 +00:00
Simon Detheridge
e4c3ebdbdc Merge pull request #2000 from overleaf/spd-dont-log-project-list 
Don't log the project list when rendering the project dashboard

GitOrigin-RevId: 472a3d519d4ad75b524776ab6369122c2099fbe7
 2019-07-22 15:31:30 +00:00
Simon Detheridge
4cf480a448 Merge pull request #1965 from overleaf/jel-remove-v1-login 
Remove login to v1 via v2

GitOrigin-RevId: e5ba86786d14c5a2be87aff6b38cfd807b5cd053
 2019-07-22 15:31:24 +00:00
Simon Detheridge
0b938927af Fix response when learning custom words 
GitOrigin-RevId: fe7c8a2862532b83e650d3ecfae2ae5245394620
 2019-07-20 12:54:34 +00:00
Timothée Alby
e38a86d9f4 Merge pull request #1934 from overleaf/ta-error-type-handler 
Implement ErrorType Handler

GitOrigin-RevId: 7cd735bb248c74815182e10fd54d687dd35914b8
 2019-07-19 09:51:05 +00:00
Timothée Alby
8af619ac28 Merge pull request #1931 from overleaf/ta-error-type 
Implement ErrorType Errors

GitOrigin-RevId: fef4d6016ad413b0de635a882e53fed6ee5f1f85
 2019-07-19 09:50:57 +00:00
Timothée Alby
367f94e27f Merge pull request #1988 from overleaf/ta-conversion-metrics 
Add Conversion Metrics for Publishers

GitOrigin-RevId: 517da4d8acf02b84c40f1a9ff95591838bcc3afb
 2019-07-19 09:50:50 +00:00
Alasdair Smith
827814175f Remove sixpack (#1974) 
* Remove unused sixpack AB test

* Remove unused sixpack AB test

* Remove unused sixpackDomain global

* Remove unused Sixpack file

* Remove sixpack from frontend

* Remove unused sixpack-client package

GitOrigin-RevId: cdd4acf91cb045db93485f09dcb5ec63e43d01dc
 2019-07-18 14:35:29 +00:00
Simon Detheridge
941662ecca Merge pull request #1977 from overleaf/jel-remove-schema-attr 
Remove structured data HTML attributes

GitOrigin-RevId: abd45205af37452abb90bbbfdf460955ff75c218
 2019-07-18 14:35:15 +00:00
Simon Detheridge
959dfee6bf Merge pull request #1986 from overleaf/ns-project-timeout-wording 
update wording on timeout modal

GitOrigin-RevId: 51b0dd1ba8625d2b49178248e7e0725fd4188e36
 2019-07-18 14:34:53 +00:00
Simon Detheridge
748a21d74c Merge pull request #1975 from overleaf/em-one-time-login-landing-page 
Landing page for one-time login

GitOrigin-RevId: d7453e7f3dbf12062cc45108e4cb2ebb7b042a76
 2019-07-18 14:34:37 +00:00
Simon Detheridge
bf740f1e25 Merge pull request #1959 from overleaf/spd-integration-soft-deletion 
Integration: Merge soft-deletion features into master
GitOrigin-RevId: 83baf730be2f256ad0d02271600392fda144b761
 2019-07-18 14:34:22 +00:00
mserranom
88e0cbd293 removed unnecessary check 
GitOrigin-RevId: 5b14d59c43cb1b85a63dc00f9d1293e08b284a59
 2019-07-18 11:13:24 +00:00
mserranom
d1011b74c0 server returns 422 on no language indicated 
GitOrigin-RevId: e2b0d1bee77b5d7aef5673e9d80f90265b3841e3
 2019-07-18 11:13:19 +00:00
mserranom
111453c075 server returns 422 on incorrect language 
GitOrigin-RevId: cce8d0274476aed2b48a6908df3a44a7ea9ff186
 2019-07-18 11:13:14 +00:00
mserranom
0d00aa5500 set log level to info for unsupported languages 
GitOrigin-RevId: 4355c66c57dfb8afd942e550c6700d87a88f0f2b
 2019-07-18 11:13:03 +00:00
mserranom
762fde5ae7 disabled call to spelling service for unsupported languages 
GitOrigin-RevId: 329bf8cd95d5800a6850ece2887477348a104b27
 2019-07-18 11:12:52 +00:00
Ersun Warncke
23ff7c23e8 add custom error page for v1 project if no overleaf id 
GitOrigin-RevId: 538c68c568c9138f26353d5492f4aa9d66fbae19
 2019-07-18 11:12:47 +00:00
Ersun Warncke
b3f590683d decaf/lint clean-up 
GitOrigin-RevId: 1073b0d4c070e28448ee19126e928b53da3d6f42
 2019-07-18 11:12:42 +00:00
Ersun Warncke
d624c29b6f remove v1 deps for password change/reset 
GitOrigin-RevId: be25f19ae589c50bfde0b170860127fa8d6f63b7
 2019-07-17 15:09:24 +00:00
Ersun Warncke
a61a59be20 remove user.overleaf.id dependencies 
GitOrigin-RevId: ca495010a4f0ee462bde696dd0c442b2bd57bf30
 2019-07-17 15:09:18 +00:00
Eric Mc Sween
d7549544d6 Merge pull request #1950 from overleaf/em-password-reset 
Fetch user by email when validating password reset

GitOrigin-RevId: 9f113f1393e322611b1e7af5aec1ac25a38a122d
 2019-07-16 09:22:15 +00:00
Timothée Alby
109585d20c Merge pull request #1947 from overleaf/ta-cleanup-guard-1 
Remove __guard__ Function Used to Access Settings

GitOrigin-RevId: 15e3749990a9fc68f8d344390b1bf0d09d839106
 2019-07-15 13:23:38 +00:00
Jessica Lawshe
e33ad09802 Merge pull request #1972 from overleaf/jel-remove-oauth-email-settings-check 
Remove oauthFallback check for OAuth emails

GitOrigin-RevId: 85b7e007df0c48212cca98f5253c588e9f39802a
 2019-07-11 17:07:57 +00:00
Jessica Lawshe
6e09af6fbe Merge pull request #1971 from overleaf/jel-settings-add-aria-label 
Update label to match input ID

GitOrigin-RevId: 849c9d49d861cf3b5645496b5e4eed1dc6d7392a
 2019-07-11 17:07:51 +00:00
Jessica Lawshe
ed6891e66d Merge pull request #1961 from overleaf/jel-remove-force-import-feature-check 
Remove checks for `force-import-to-v2`

GitOrigin-RevId: f94e8b0fb2f7f4416759583d5ca02babec345120
 2019-07-11 15:35:36 +00:00
Jessica Lawshe
d4a8f38736 Merge pull request #1942 from overleaf/jel-user-settings-form-msg 
Move user settings form message next to submit button and add ID attributes

GitOrigin-RevId: 3d87242e5a7211f9fa58b07f38a278fb94019046
 2019-07-11 15:35:31 +00:00
Jessica Lawshe
c8b6b83848 Merge pull request #1903 from overleaf/jel-oauth-email-notification 
OAuth link/unlink email notification via v2

GitOrigin-RevId: 36b0c6153d3eb8174adc4fd684837d81be95b644
 2019-07-11 15:35:25 +00:00
Jessica Lawshe
d07a46c51b Merge pull request #1943 from overleaf/jel-send-pw-changed-email 
Send password changed email

GitOrigin-RevId: f80fb21bcb5ec16fc51cc3bd8b40307406526ed1
 2019-07-11 15:35:20 +00:00
Henry Oswald
97356e3e23 Merge pull request #1941 from overleaf/ho-pubsub-redis-connection 
use pubsub redis connection

GitOrigin-RevId: 9c0686098c63f9d573abe5c3d0a450db3f609ef1
 2019-07-08 15:41:33 +00:00
Shane Kilkelly
26af3e091f Merge pull request #1940 from overleaf/sk-catch-gitbridge-content-errors 
GitBridge: catch 404 errors when fetching content from git-bridge api
GitOrigin-RevId: 411759ebae1fb81ebfa942e117d1ef3c47215d0e
 2019-07-08 09:06:35 +00:00
Eric Mc Sween
545b57d6be Merge pull request #1939 from overleaf/jel-no-search-results 
Show message when there are no learn wiki search results

GitOrigin-RevId: cb1600baeb4a9860575385be78a825cb3942903a
 2019-07-04 12:51:22 +00:00
Eric Mc Sween
a31090daab Merge pull request #1944 from overleaf/em-password-reset 
Store the email address in the password reset token data

GitOrigin-RevId: 9aa2eaff49de9ac88258cb996202934dab71cc0a
 2019-07-04 12:51:16 +00:00
Simon Detheridge
02a4289422 Merge pull request #1928 from overleaf/jel-email-after-registration 
Send welcome email after registration

GitOrigin-RevId: 1f2b34299e6f4a1e4e44c100711e8f3b8db54595
 2019-07-03 11:11:00 +00:00
Jessica Lawshe
f8d895100a Return custom error if provider linked to another account 
GitOrigin-RevId: c34a615b210a22e220736c9ba44d17be5add491b
 2019-07-03 08:50:51 +00:00
Miguel Serrano
27985458ea Uploading an empty zipfile throws specific error (#1909) 
Added a counter for the total files extracted from a zip. If no files are extracted a specific error is thrown.

GitOrigin-RevId: 391bb669500c86e2e7fecebd90e2201248a8afd3
 2019-07-02 10:58:58 +00:00
Simon Detheridge
b86f46a4f8 Merge pull request #1885 from overleaf/sk-dep-upgrades-2019-06 
Update logger, metrics, and redis client

GitOrigin-RevId: fa425f37c9065dc644da44f62e89a9955ce09f66
 2019-07-02 09:16:23 +00:00
Hugh O'Brien
f84c43a7b7 Merge pull request #1913 from overleaf/jel-v1-logout 
Remove the v1-logout endpoint

GitOrigin-RevId: 4a31f277c2cf1fa0f8c76c546728dae3eb7665c7
 2019-07-01 15:31:08 +00:00
Timothée Alby
b1e8cb9cf0 Merge pull request #1924 from overleaf/ta-full-error 
Don't Callback with String

GitOrigin-RevId: 82e3efb055ef197d95ff9c8a876bee0d6a0327a3
 2019-07-01 14:06:54 +00:00
Timothée Alby
e029616ed4 Merge pull request #1914 from overleaf/jel-no-pw-message 
Check for password on delete modal

GitOrigin-RevId: a2ec40b9c73e92490a9dfd0377b10f9d1831f56f
 2019-07-01 14:06:42 +00:00
Timothée Alby
e73a5d9103 Merge pull request #1923 from overleaf/ta-error-log-level 
Reduce Log Level

GitOrigin-RevId: 63a8859e6b78cb0774a28069089f4bce73eb91ec
 2019-07-01 14:06:36 +00:00
Brian Gough
cf940cc835 Merge pull request #1916 from overleaf/ta-join-project-404 
Return 404 on JoinProject When Project Is Not Found

GitOrigin-RevId: cd87ce6e2564fd4a80faa66e8b22edec7b0c783c
 2019-07-01 09:25:41 +00:00
Miguel Serrano
0e52453931 Merge pull request #1908 from overleaf/as-remove-tags-on-leave 
Remove tags when leaving project

GitOrigin-RevId: 833412264d09348b02f57fb60cd0f07d81cfc037
 2019-06-27 10:32:12 +00:00
Miguel Serrano
dc54a261e3 Merge pull request #1907 from overleaf/as-fix-tag-project-count 
Fix tag project count

GitOrigin-RevId: 60236571403f8cc02f70bbe49e652ef18bbeab4d
 2019-06-27 10:32:01 +00:00
Miguel Serrano
f8ad17c01b Merge pull request #1910 from overleaf/msm-project-cleanedup-after-failed-upload 
Project is cleaned up after zip upload fails

GitOrigin-RevId: a09bb51161d0565a5c7eb55a5e29530f8ec65eb6
 2019-06-27 10:31:48 +00:00
Miguel Serrano
8a825bb065 Merge pull request #1902 from overleaf/msm-return-429-tdps-update-too-many-connections 
Project on cooldown returns 429 on TDPS update

GitOrigin-RevId: b8da35a61be7508bc56d7798d233c186f694c364
 2019-06-27 10:31:38 +00:00
Simon Detheridge
bd3f59c22a Merge pull request #1895 from overleaf/jel-oauth-db-flip 
Add setting var for OAuth data source

GitOrigin-RevId: e8a2ce588c7b5c8a9cf2c782d0434b421df7b356
 2019-06-25 11:22:17 +00:00
Simon Detheridge
14c176a832 Merge pull request #1896 from overleaf/as-remove-v1-return-message-flag 
Remove unused v1-return-message feature flag

GitOrigin-RevId: c8ffe88fc3294ec207ad8888254ee8d4b95cde05
 2019-06-25 11:21:58 +00:00
Miguel Serrano
ab07761eef Merge pull request #1863 from overleaf/msm-refactor-project-upload-manager-promises 
Refactored ProjectUploadManager to support Promises

GitOrigin-RevId: 1d747f5ca07164299060bb27c6f14fa9e2968fdf
 2019-06-24 13:31:35 +00:00
Simon Detheridge
6fc507aea3 Merge pull request #1883 from overleaf/as-remove-rttc-beta-program 
Move rich text track changes out of the beta program

GitOrigin-RevId: 4b23a42f3b2ef53012b5c6cca310fe82de5d9a0c
 2019-06-21 13:58:52 +00:00
Simon Detheridge
d1e587a51e Merge pull request #1864 from overleaf/ta-analytics-backoff-strategy 
Update Analytics Backoff Strategy

GitOrigin-RevId: 9a3dc11ee19ff03432730a36617208ac7f58c5be
 2019-06-21 10:10:52 +00:00
Simon Detheridge
c30e83a4ed Merge pull request #1877 from overleaf/em-filestore-range-request 
Get file size before truncating files for preview

GitOrigin-RevId: 0822691d75bd8bfe3d6cfd23f9ca4b1c3be20585
 2019-06-20 11:30:50 +00:00
Alasdair Smith
350e2ac38f Merge pull request #1886 from overleaf/as-upgrade-ace-1.4.5 
Upgrade to Ace v1.4.5

GitOrigin-RevId: 7ab7ba24c0bfc927567fbd4196e05a1c3f26d283
 2019-06-20 09:21:27 +00:00
Ersun Warncke
fb55063c2f remove collabratec v1 deps, and user stubs for oauth 
GitOrigin-RevId: c4bc497a07658eb580b0bfdb011fea32ea1657e1
 2019-06-19 11:42:21 +00:00
Ersun Warncke
8cc9bc5335 write to v1/v2 on register, password change and reset 
GitOrigin-RevId: 29045912319d1d387613ec55c6620852d8857614
 2019-06-19 11:06:21 +00:00
Alasdair Smith
f83ab4ec3b Merge pull request #1767 from overleaf/as-color-contrast 
Improve colour contrast

GitOrigin-RevId: 56796839e5c2e741e85bc849399cb28d3db36976
 2019-06-19 09:01:43 +00:00
Simon Detheridge
ab5b1b6dc4 Merge pull request #1870 from overleaf/spd-invalid-intent-sso 
Fix invalid intent errors when logging in with OAuth

GitOrigin-RevId: 20f88a24080b41256bd31b9fb55b68a872ded56b
 2019-06-18 15:48:29 +00:00
Simon Detheridge
93386bcb8c Merge pull request #1859 from overleaf/spd-sl-user-password-copy 
Copy old SL hashed passwords to a new field

GitOrigin-RevId: 28e7ff57e8753a1e887c54e9ed63cb17984e2fd4
 2019-06-18 08:46:14 +00:00
Simon Detheridge
08861187d5 Merge pull request #1834 from overleaf/ns-sd-synctex-fail-gooder 
display warning if synctex fails to return filename

GitOrigin-RevId: 1de5f9f06a03d6debc35cd4bace6cc921a634d6d
 2019-06-17 15:14:31 +00:00
Simon Detheridge
82672269c4 Merge pull request #1862 from overleaf/em-json-stringify 
Globally apply StringHelper.stringifyJsonForScript()

GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2
 2019-06-17 15:14:25 +00:00
Simon Detheridge
d189dad162 Merge pull request #1865 from overleaf/ta-group-invite-self-view 
Return User Data when Inviting Self in Group

GitOrigin-RevId: 5aeb9f0b21b84184a612ed730ac08dcb1c434f6e
 2019-06-17 15:14:11 +00:00
Brian Gough
4134c32f8d Merge pull request #1861 from overleaf/bg-check-existing-import 
check if project already imported

GitOrigin-RevId: 6dbca42fd524c34bb79a86b7449fe6ed3d542b43
 2019-06-13 08:47:58 +00:00
Brian Gough
c242a8d4c1 Merge pull request #1853 from overleaf/bg-check-doc-hashes-staged-rollout 
enable sharejs hash checking

GitOrigin-RevId: 2c71d239b2f5ee2bee6baf03dd54aaa8afc6fae7
 2019-06-13 08:47:52 +00:00
Timothée Alby
4583c25b1b Merge pull request #1843 from overleaf/ta-limit-affiliation-rate 
Limit the Number of Affiliations Created Simultaneously

GitOrigin-RevId: 242d3f3a2859eb2114f43091e7ca52534b282396
 2019-06-11 13:34:18 +00:00
Timothée Alby
e659703745 Merge pull request #1842 from overleaf/ta-remove-v1-sync 
Remove v1 Sync on Features Refresh

GitOrigin-RevId: a99e0a74c4fc503bf81d0b847b3f331b3228e24f
 2019-06-11 13:34:11 +00:00
Timothée Alby
8caea13193 Merge pull request #1845 from overleaf/ta-invite-self 
Don't Send Invite when Group Manager Invite Self

GitOrigin-RevId: 35d7aecc82cf1124fbdac7fe986081b9556c23f9
 2019-06-11 13:34:00 +00:00
Timothée Alby
f6c2cfe727 Merge pull request #1848 from overleaf/sk-increase-compile-timeout-hard-limit-10 
Increase compile socket timeout to 10 minutes

GitOrigin-RevId: 93712c493c67bf54022df43175d331557b7cf49a
 2019-06-11 13:33:53 +00:00
Ersun Warncke
48b5c7e209 do not log warning in dev/tests (#1830) 
do not log warning in dev/tests

GitOrigin-RevId: c46664779fe939ad0f39466f43eb24381a245b55
 2019-06-06 13:01:45 +00:00
Ersun Warncke
35138e6763 remove v1 oauth (#1846) 
remove oauth token v1 fallback

GitOrigin-RevId: 621e75024d8ae877c821b9bfed9b2a19fdbbf9f7
 2019-06-06 13:01:38 +00:00
Eric Mc Sween
15db8d3711 Merge pull request #1828 from overleaf/msm-fix-zip-upload-ignored-extensions-js 
Fixes files with full name equals to an ignored extension being ignored (JS version)

GitOrigin-RevId: 94d84c2b3e6c7e7219397b0a982117f9c88bcf5d
 2019-06-05 16:19:31 +00:00
Eric Mc Sween
5d2d7b894a Merge pull request #1833 from overleaf/em-edit-subscription-admin 
Change admin button in subscription admin page

GitOrigin-RevId: d446f54299578c3806ef7146d2163ec24e831b6d
 2019-06-05 16:19:26 +00:00
Timothée Alby
a8edafe104 Merge pull request #1825 from overleaf/ta-institutions-staff-hub 
Create Institutions Staff Hub

GitOrigin-RevId: 6926406951796d2e7dd0903c3d3c4dae87545390
 2019-06-04 11:24:02 +00:00
Timothée Alby
14cbeef31d Merge pull request #1806 from overleaf/ta-use-billing-name 
Use Billing Name when Creating Subscription

GitOrigin-RevId: 66744faa7edde241340016bbb6c1bbc5fb53ede2
 2019-06-04 11:23:55 +00:00
Timothée Alby
2deac5f3a1 Merge pull request #1805 from overleaf/csh-issue-1457-recurly-xml-builder 
Don't Build Recurly XML Requests Manually

GitOrigin-RevId: bebe7f747715a33e681dc58fb89b529411a13860
 2019-06-04 11:23:49 +00:00
Timothée Alby
8330c6ae61 Merge pull request #1835 from overleaf/hb-analytics-template-ids 
Set template ids on cloned projects on creation

GitOrigin-RevId: 6b7ef72d148774c3d5ea7b65cde0e6a8fdfa2ceb
 2019-06-04 11:23:37 +00:00
nate stemen
642081dd17 Merge pull request #1802 from overleaf/jel-oauth-hide-when-not-linked 
OAuth provider check and capitalize button text

GitOrigin-RevId: afa2e8301d5141da178d88304932c5736d8632c4
 2019-06-03 18:32:13 +00:00
Alasdair Smith
0ca81de78c Merge pull request #1717 from overleaf/as-decaffeinate-backend 
Decaffeinate backend

GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
 2019-05-29 09:32:21 +00:00
Hugh O'Brien
d4eb71b525 Merge pull request #1788 from overleaf/ta-ensure-can-delete-account 
Prevent Subscription Owner from Deleting their Account

GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0
 2019-05-28 15:51:27 +00:00
Hugh O'Brien
29408b301c Merge pull request #1750 from overleaf/cmg-project-metadata 
Preserve project metadata when deleting

GitOrigin-RevId: 38efb139406d6111f5b6186d82c3fbfb5ab9b2b9
 2019-05-28 15:51:21 +00:00
Alasdair Smith
b84c24520c Merge pull request #1804 from overleaf/msm-removed-collaborator-as-first-step-transfer-ownership 
Removing user as collaborator as a pre-step for project ownership transfer

GitOrigin-RevId: dbfe1553ae7277863908341fdd2af709dc019692
 2019-05-28 11:25:43 +00:00
Alasdair Smith
4e8facf3cc Merge pull request #1776 from overleaf/pr-history-ui-filenames-overflow 
History filenames overflow + full history for admins

GitOrigin-RevId: b52d79e0aa1cb600eacb475d21b603f42c8cf18c
 2019-05-28 11:25:17 +00:00
Simon Detheridge
ff4e0013cd Merge pull request #1809 from overleaf/ns-escape-archive-translation 
treat translate call as var, not string

GitOrigin-RevId: db1b40182bbfabef4ea31b2e1923bb28921900b0
 2019-05-28 09:33:31 +00:00
Simon Detheridge
d5556c55a9 Merge pull request #1813 from overleaf/spd-verbose-merge-logging 
Add very verbose logging to SL user merging

GitOrigin-RevId: 802a9295240c23f48c133fabb5895501f1c9a49f
 2019-05-28 09:33:15 +00:00
Simon Detheridge
6488fd1284 Merge pull request #1814 from overleaf/spd-missing-callback-returns 
Add missing return statements to callbacks in SubscriptionGroupHandler

GitOrigin-RevId: 05ff67bd8e4997fde01c6cf9f4558d3caa261590
 2019-05-28 09:33:06 +00:00
Simon Detheridge
561f54c1a3 Merge pull request #1816 from overleaf/spd-user-delete-newsletter 
Don't fail to delete a user if unsubscribing from newsletter fails

GitOrigin-RevId: 8764717220d906a20a7dd0a90879a45d9dd8a7ce
 2019-05-28 09:32:57 +00:00
Simon Detheridge
40316b0735 Merge pull request #1815 from overleaf/spd-mongoose-debugging 
Allow very verbose debugging of mongo queries via env var

GitOrigin-RevId: ad132ef0cc6df892b4c879948094f67497cc9a48
 2019-05-28 09:32:50 +00:00
Simon Detheridge
a0adde3573 Merge pull request #1803 from overleaf/spd-email-login-url 
Fix path to login URL in account migration emails

GitOrigin-RevId: 609445ad5f214deb7da3966806ff512c4a7a3d55
 2019-05-23 13:25:29 +00:00
Alasdair Smith
a3894ac9b4 Merge pull request #1794 from overleaf/as-upgrade-ace-1.4.4 
Upgrade Ace to v1.4.4

GitOrigin-RevId: 26681bcf255537f8eb09fa0ac1c98009cf964496
 2019-05-23 08:49:13 +00:00
Timothée Alby
d86abf49e6 Merge pull request #1729 from overleaf/ta-show-last-modified 
Show LastUpdatedBy on Dashboard

GitOrigin-RevId: 11760e575a46f061d4aa9059a0c1e813b9adb1f9
 2019-05-21 13:39:29 +00:00
Timothée Alby
2895a6878c Merge pull request #1796 from overleaf/ta-institution-subscriptions-fix 
Ignore Trials when Listing Subscriptions on Institution Hub

GitOrigin-RevId: 9121b08fc16fd3d18fff4a0403354fecec2d4666
 2019-05-21 13:39:16 +00:00
Jessica Lawshe
e03b5ae691 Merge pull request #1741 from overleaf/jel-manage-linked-accounts 
Manage linked accounts via v2

GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06
 2019-05-20 16:10:46 +00:00
Simon Detheridge
004272619e Merge pull request #1781 from overleaf/ta-institution-subscriptions 
List Institution Subscriptions

GitOrigin-RevId: b259b4729f031bb6a50b27f6740df3df21017818
 2019-05-20 12:18:57 +00:00
Simon Detheridge
efd7cf5b01 Merge pull request #1793 from overleaf/fix-name-removed-transfer-ownership 
Fix name removed transfer ownership

GitOrigin-RevId: ccbc681746033017686c4e36040a71ab7f98ad16
 2019-05-20 12:18:49 +00:00
Simon Detheridge
c07c44f366 Merge pull request #1644 from overleaf/spd-reconcile-accounts 
Add account-reconciliation script

GitOrigin-RevId: e20a8b9531126d91baaa9da5c77ab6e971b43e67
 2019-05-16 10:59:53 +00:00
Timothée Alby
0e38ca1fd7 Merge pull request #1775 from overleaf/ta-fetch-user-before-confirm 
Check User Exists Before Confirming Email

GitOrigin-RevId: 3622044f31f78e8499ccd084ca99297ca297ca97
 2019-05-16 07:34:23 +00:00
Timothée Alby
276310bd23 Merge pull request #1778 from overleaf/hb-password-reset-sl 
Handle users who haven't migrated better on password reset

GitOrigin-RevId: f123a6fe4a5a958f558e3cf34c3180e8fc96d159
 2019-05-16 07:34:18 +00:00
Brian Gough
c6c948e9f9 Merge pull request #1769 from overleaf/bg-record-date-for-doc-deletion 
record timestamp for doc deletion

GitOrigin-RevId: 3ae38c94918d3400ad9aa821e1e1ef1bcde6373b
 2019-05-15 12:41:42 +00:00
Brian Gough
e252c64996 Merge pull request #1763 from overleaf/bg-preserve-file-hash-on-copy-and-delete 
preserve file hash on copy and delete

GitOrigin-RevId: 2dc000255dcfe875a30a7e7f878aaa09fea367dc
 2019-05-15 12:41:37 +00:00
Brian Gough
833caf4acd Merge pull request #1765 from overleaf/bg-avoid-exception-in-token-access 
handle exception in crypto.timingSafeEqual when checking token

GitOrigin-RevId: ba23aa4d4fe1e212c776965c0a58a90ecd846052
 2019-05-15 12:41:31 +00:00
Timothée Alby
7e32ed5158 Merge pull request #1766 from overleaf/ta-dropbox-duplicates-script 
Add Script to Unlink all Duplicate Dropbox uids

GitOrigin-RevId: 6db73dee9f04e9006d0aec558cf370b5079df671
 2019-05-15 07:29:00 +00:00
Timothée Alby
bd722dda8e Merge pull request #1759 from overleaf/sk-disable-bcrypt-rounds-upgrade 
Temporarily de-activate automatic upgrade of bcrypt rounds

GitOrigin-RevId: 66dbe344c00253e4b6a8f883735e61d9133da62e
 2019-05-15 07:28:54 +00:00
Ersun Warncke
6513cc7b7a Revert "Revert "complete v2 collabratec api"" 
This reverts commit 378825fae46cef6f19c8f908a1d6cf9c837cd1d6.

GitOrigin-RevId: cf38aa3b4ec53ec6741389885ebe882476cb9297
 2019-05-14 10:24:11 +00:00
Ersun Warncke
8377005187 Revert "Revert "oauth and collabratec migration"" 
This reverts commit c8814e7fd85776feb37bf8fad95038349b36cd9a.

GitOrigin-RevId: 9deeb445917c856acee54ef793575c8ab9c81304
 2019-05-14 10:24:04 +00:00
Ersun Warncke
8e916a830d Revert "Revert "fix auth error response and use 401 for malformed header"" 
This reverts commit 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee.

GitOrigin-RevId: d5cc2fd2e7a676cad637717d77d1a69a7fe6453c
 2019-05-14 10:23:57 +00:00
Ersun Warncke
7883554d73 Revert "Revert "add oauth2-server"" 
This reverts commit 946a7c2494d39fd7581cb8a068af7df647fb3bda.

GitOrigin-RevId: 2f02e9d9e2d0348e4ea1d447e0291fae72c0008a
 2019-05-14 10:23:51 +00:00
Ersun Warncke
9b24ed6daa Revert "Revert "add thirdPartyIdentifiers to User model and add manager class"" 
This reverts commit df1b9355b1b28e3311bb9e5748df9db673d32ce5.

GitOrigin-RevId: bba2cc5217ce1d2b50a596be07a086b4d716786e
 2019-05-14 10:23:46 +00:00
Ersun Warncke
934b70e96a Revert "add thirdPartyIdentifiers to User model and add manager class" 
This reverts commit 5839f1f43237c19efed7f4ce1dfb500da9327f70.

GitOrigin-RevId: df1b9355b1b28e3311bb9e5748df9db673d32ce5
 2019-05-13 15:52:47 +00:00
Ersun Warncke
a00f4b219e Revert "add oauth2-server" 
This reverts commit d10f565973f8b762c5aa51aa11e73105b016d3ae.

GitOrigin-RevId: 946a7c2494d39fd7581cb8a068af7df647fb3bda
 2019-05-13 15:52:41 +00:00
Ersun Warncke
6d4b67d1ee Revert "fix auth error response and use 401 for malformed header" 
This reverts commit 6dc4d10c25db7710b3e4e8e876d425a1e84574c8.

GitOrigin-RevId: 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee
 2019-05-13 15:52:36 +00:00
Ersun Warncke
89ee728514 Revert "oauth and collabratec migration" 
This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248.

GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a
 2019-05-13 15:52:30 +00:00
Ersun Warncke
4189f2e6ec Revert "complete v2 collabratec api" 
This reverts commit 9c75b657c11f98e3f927dd01a422157f53a5672d.

GitOrigin-RevId: 378825fae46cef6f19c8f908a1d6cf9c837cd1d6
 2019-05-13 15:52:25 +00:00
Ersun Warncke
65cbfbaeae complete v2 collabratec api 
* remove proxies to v1
* allow oauth tokens with user stubs
* add profile/unlink end points
* fix Makefile issue

GitOrigin-RevId: 9c75b657c11f98e3f927dd01a422157f53a5672d
 2019-05-13 12:05:04 +00:00
Ersun Warncke
935877222a oauth and collabratec migration 
* make v2 system of record for collabratec id
* migrate oauth apps, tokens to v2
* set collabratec id on reg/link from ctec
* copy collabratec id from user stub to user on merge

GitOrigin-RevId: 4ac63921b030a01ed79bc0da1666d3c9f9545248
 2019-05-13 12:04:56 +00:00
Ersun Warncke
c0ab195eed fix auth error response and use 401 for malformed header 
GitOrigin-RevId: 6dc4d10c25db7710b3e4e8e876d425a1e84574c8
 2019-05-13 12:04:51 +00:00
Ersun Warncke
dc06069dff add oauth2-server 
GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae
 2019-05-13 12:04:46 +00:00
Ersun Warncke
8f339603f4 add thirdPartyIdentifiers to User model and add manager class 
GitOrigin-RevId: 5839f1f43237c19efed7f4ce1dfb500da9327f70
 2019-05-13 12:04:40 +00:00
Brian Gough
07b7566466 Merge pull request #1089 from overleaf/bg-compute-filestore-hash 
compute filestore hash

GitOrigin-RevId: 23a909d2c2ea7aba3abfdb8f0c060e414a17e52e
 2019-05-13 08:49:42 +00:00
Brian Gough
c989179517 Merge pull request #1758 from overleaf/as-remove-unused-middleware-file 
Remove unused TemplatesMiddlewear file

GitOrigin-RevId: 00cf49c970171f1f99d133ee4876f2a35c89c023
 2019-05-13 08:49:36 +00:00
Brian Gough
d1cc605855 Merge pull request #1755 from overleaf/bg-admin-resync-project-history 
add button to resync history for project in admin page

GitOrigin-RevId: e52e85ee6d1f7dea7930bf3dee0ec70b28b8a6c2
 2019-05-13 08:49:29 +00:00
Henry Oswald
69ccac8f49 log out job in tpdsupdate sender 
GitOrigin-RevId: 8ff4665f62a1f36580c5864f2185ddf1a792f6cf
 2019-05-11 01:54:39 +00:00
Alasdair Smith
dc09095ae7 Merge pull request #1756 from overleaf/pr-resize-ace-when-toggling-pdf 
Resize Ace when toggling PDF view

GitOrigin-RevId: 77e6fe662eb67f2ec39a00f42a35026f6a696eb9
 2019-05-10 08:56:21 +00:00
Alasdair Smith
36035e8ccd Merge pull request #1746 from overleaf/sk-fix-stale-pdf-download-3 
Pass build-id when downloading pdf

GitOrigin-RevId: bc4b1558170661172304df1b71f9b859a59abc5b
 2019-05-08 09:09:11 +00:00
Christopher Hoskin
8aa8840db0 Merge pull request #1745 from overleaf/csh-issue-1118-node-10.15.3 
Csh issue 1118 node 10.15.3

GitOrigin-RevId: 5b75d030d9d07bdb41dbca46f90fd950293e17b3
 2019-05-07 10:58:52 +00:00
Paulo Jorge Reis
d613d7e1a2 Merge pull request #1647 from sharelatex/as-upgrade-ace-1.4.3 
Upgrade Ace to v1.4.3

GitOrigin-RevId: 810350080a6b89fd9817ebcacde7e9817097d99a
 2019-05-06 09:02:03 +00:00
Timothée Alby
5b7b9fc97b Store lastUpdatedBy Value on Projects (#1727) 
Store lastUpdatedBy Value on Projects

GitOrigin-RevId: bdb12c55732bc726151135b28a03e722bf3fdb39
 2019-05-02 14:17:41 +00:00
Timothée Alby
5b7974065d Prevent registration of new accounts with existing secondary emails (#1696) 
Prevent registration of new accounts with existing secondary emails

GitOrigin-RevId: 004cf9d31064fc5b7deb621c95c38f103397ff15
 2019-05-02 14:17:34 +00:00
Alasdair Smith
5049dc083e Merge pull request #1739 from sharelatex/bg-upgrade-history-in-project-admin-page 
add button to upgrade history in project admin page

GitOrigin-RevId: a5f2a64028ccb002cbb96da0f910b7b494f75eb8
 2019-05-01 09:38:35 +00:00
Alasdair Smith
028c3bc94c Merge pull request #1742 from sharelatex/bg-avoid-unnecessary-callback-for-emit-to-room 
remove unnecessary callback on emitToRoom

GitOrigin-RevId: a34006d6f72862b1f2e0b88d20ad8003ea5b8883
 2019-05-01 09:38:30 +00:00
Alasdair Smith
2c30ae0f8a Merge pull request #1738 from sharelatex/spd-dumpfolder 
Ensure dump folder exists before opening templates

GitOrigin-RevId: 3c7269fbcdff45a06e505154a35ce6d2bd4b7ae1
 2019-05-01 09:38:24 +00:00
Brian Gough
77a711f7a3 Merge pull request #1732 from sharelatex/bg-avoid-null-in-remove-element 
make removeElementFromMongoArray atomic

GitOrigin-RevId: 3c4cf50caed9b3197ee0ec7fe4c89738d368a966
 2019-04-29 09:31:09 +00:00
Simon Detheridge
5517adcbd1 Merge pull request #1726 from sharelatex/hb-sso-password-setting 
Check for password from v1 before showing password change form

GitOrigin-RevId: 58ef0f9d3c8ce3ab7ca51d3538f1be13f05d4658
 2019-04-25 14:37:38 +00:00
Simon Detheridge
16f905358a Merge pull request #1690 from sharelatex/cmg-color-tags 
Color-code tags/folders

GitOrigin-RevId: d8dcb90b861dd61c1bc502e0b67556dcd772b42e
 2019-04-25 14:37:32 +00:00
Simon Detheridge
9808eb7f55 Merge pull request #1722 from sharelatex/jel-password-descriptive-message 
Use descriptive error message for password reset

GitOrigin-RevId: f1f0bacd6397f2068ed2abc71ee6ec54b3a51aff
 2019-04-25 14:37:21 +00:00
Simon Detheridge
3990a5d736 Merge pull request #1724 from sharelatex/ta-subscription-canceled-page 
Add Subscription Canceled Page

GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745
 2019-04-25 14:37:15 +00:00
Simon Detheridge
cc96ecfd74 Merge pull request #1734 from sharelatex/spd-delete-user-crash 
Don't fail in refreshFeatures if the v1 user doesn't exist

GitOrigin-RevId: 7849f5f942ef39762b40c31a616b51b4b1fe0706
 2019-04-25 14:36:58 +00:00
Brian Gough
e1ec01eb0f Merge pull request #1719 from sharelatex/ja-restore-doc-snapshots 
Show and restore doc snapshots from admin panel

GitOrigin-RevId: 22339644d48a8698df97f7d5fc1eecfaf27c6fab
 2019-04-24 13:24:46 +00:00