github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-14 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity
9125 commits 3 branches 7 tags 204 MiB
Commit graph

789 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
dc6e4b3a12 Added missing email field when registering user token (#2130) 
GitOrigin-RevId: f7aaeae1f82e0188c838d7d1d975a81664950f78
 2019-09-04 11:17:15 +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
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
9a8a182c1b Fix UserGetter email retrieval with affiliations disabled (#2085) 
GitOrigin-RevId: f868333f3c18f674b7ba9c387315c2d5ad1fd80b
 2019-08-19 15:19:57 +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
Ersun Warncke
c0cc8fdd3f add tests for error handling, clean up 
GitOrigin-RevId: 8b102d54fd3d7f703dca81da182d3ab8eae3c9c2
 2019-08-13 08:50:01 +00:00
Miguel Serrano
6006c8ca79 Fixed incompatibilities between overleaf.com and community (#2028) 
GitOrigin-RevId: fc1e4e3e179cab75144043d83197f09e4f6c7642
 2019-08-12 11:39:17 +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
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
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
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
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
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
285edfff36 Merge pull request #1994 from overleaf/ta-missing-stub 
Add missing EmailHandler stub

GitOrigin-RevId: d497807068623e1338a95d2dfa02c56726ca39d1
 2019-07-25 15:20:51 +00:00
Ersun Warncke
d9b5941642 do not use v1 for setting default email 
GitOrigin-RevId: 00d4610ae55c0a90699d4bc79e7d08d432087abe
 2019-07-23 10:59:58 +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
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
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
5835e9dc25 added stub for log.info 
GitOrigin-RevId: ed1041905b8b96869cd69518ada9fd253be51ca4
 2019-07-18 11:13:09 +00:00
mserranom
b3501a40e3 added test for a 200 status on unsupported language 
GitOrigin-RevId: 802dc736969bbc48aa3beb9eb90b17dfdb59fff2
 2019-07-18 11:12:57 +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
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
Shane Kilkelly
238e2b2565 Merge pull request #1937 from overleaf/spd-sandboxedmodule-global-console 
Add 'console' to SandboxedModule globals

GitOrigin-RevId: fad442ca128561a4fa193b929f217cf31ad0f043
 2019-07-15 10:44:47 +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
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
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
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
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
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
757ae39487 Merge pull request #1899 from overleaf/spd-implicit-return-tests 
Decaf cleanup: Remove implicit return from 'it' and 'describe' in tests

GitOrigin-RevId: f297820e6212dddc0d60697a2fe1612ef27403b6
 2019-06-21 13:58:57 +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
Ersun Warncke
8cc9bc5335 write to v1/v2 on register, password change and reset 
GitOrigin-RevId: 29045912319d1d387613ec55c6620852d8857614
 2019-06-19 11:06:21 +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
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
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
0b8a2b0157 Merge pull request #1832 from overleaf/ta-fix-test-typo 
Fix typo in UserMembershipAuthorization tests

GitOrigin-RevId: ccb6e88297367a2986ffa6c6c74cd8f26089298e
 2019-06-04 11:23:43 +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
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
a3bcc71df9 Merge pull request #1807 from overleaf/as-global-sinon-chai 
Globally load sinon-chai

GitOrigin-RevId: b0175e021b98d6338171108c6778de80ee58479a
 2019-05-28 11:25:26 +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
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
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
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
7883554d73 Revert "Revert "add oauth2-server"" 
This reverts commit 946a7c2494d39fd7581cb8a068af7df647fb3bda.

GitOrigin-RevId: 2f02e9d9e2d0348e4ea1d447e0291fae72c0008a
 2019-05-14 10:23:51 +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
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
dc06069dff add oauth2-server 
GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae
 2019-05-13 12:04:46 +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
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
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
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
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
Timothée Alby
d3f0285fd2 Ensure project name is unique when transferring to another user (#1712) 
Ensure project name is unique when transferring to another user

GitOrigin-RevId: 0742fcbd958b5801ed155214f403a74d17236859
 2019-04-23 14:35:27 +00:00
Timothée Alby
2a73d8106b Send Email on Subscription Reactivation (#1721) 
Send Email on Subscription Reactivation

GitOrigin-RevId: 388f3490eddba0507e8c66e45d9ee4d185119c1e
 2019-04-23 14:35:05 +00:00
Timothée Alby
6232854ff7 Remove User Memberships on Deletion (#1688) 
Remove User Memberships on Deletion

GitOrigin-RevId: d6e6a4cc01e31288f660c2fd36a0cee174ee5dd1
 2019-04-23 14:34:40 +00:00
Jessica Lawshe
f455a11aa8 Merge pull request #1655 from sharelatex/jel-user-must-reconfirm 
Reconfirm user accounts

GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8
 2019-04-17 14:14:19 +00:00
Hugh O'Brien
5edead4446 Merge pull request #1694 from sharelatex/hb-clear-ip-notifications 
Remove notification for university enrolment on affiliation add

GitOrigin-RevId: 67df66ad6c6e9e16b6573fa15eb34293adaa0287
 2019-04-15 16:09:16 +00:00
Simon Detheridge
385da07930 Merge pull request #1675 from sharelatex/spd-zip-file-limit-ui 
Display more descriptive errors when uploading a project fails

GitOrigin-RevId: e206ca0d595f927ab141fb901644906f000160f8
 2019-03-28 15:14:30 +00:00
Simon Detheridge
bb81a47d58 Merge pull request #1641 from sharelatex/spd-soft-delete-users 
Add initial support for soft-deletion of users

GitOrigin-RevId: 22e47536732c5aec843d120773d2565112ad80b7
 2019-03-26 13:59:49 +00:00
Simon Detheridge
d9522f563d Merge pull request #1631 from sharelatex/ho-remove-recurly-sign 
remove RecurlyWrapper.sign and recurly private api key

GitOrigin-RevId: ceec49bcb9b66a6ad3cbf2b436c87cf0008ab152
 2019-03-25 15:52:54 +00:00
Shane Kilkelly
90cb50f4ac Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3 
Upgrade bcrypt to version 3, and specify minor-version of hash function

GitOrigin-RevId: 9282664a628e4b50839a1bb6f7ee895f3f9f15ca
 2019-03-25 09:50:41 +00:00
Simon Detheridge
d184087a53 Merge pull request #1643 from sharelatex/spd-transfer-projects 
Add support for transferring project ownership

GitOrigin-RevId: 088e02bb5be67033dba8e24c11660a1e200a3258
 2019-03-22 12:28:24 +00:00
Shane Kilkelly
a5ad2e48d4 Merge pull request #1629 from sharelatex/sk-censor-token-prefix 
Censor `tokens.readAndWritePrefix` when building project model

GitOrigin-RevId: 0fe3fc2657aa191808ea282dfcd2ea5506e93fee
 2019-03-22 10:27:56 +00:00
Shane Kilkelly
a51fefae6c Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import 
Allow deleted v1 user when importing project invite inviter

GitOrigin-RevId: be8fc8f09452b72128592f9c00859aaa0b535c3d
 2019-03-22 10:27:45 +00:00
Brian Gough
0305ba0c6b Merge pull request #1639 from sharelatex/bg-add-message-ids 
include a unique id in every message published to redis

GitOrigin-RevId: f2843e5bb570247f03b260fa0f82f562c9c6014d
 2019-03-21 16:17:37 +00:00
Timothée Alby
5de25032d8 Merge pull request #1634 from sharelatex/ta-no-institution-autocreate 
Don't Auto-Create Institutions

GitOrigin-RevId: 8be3a0d9f3f3814396a58d2fd131a62c9f196861
 2019-03-19 23:51:53 +00:00
Brian Gough
c704312c85 Merge pull request #1625 from sharelatex/bg-move-entities-safely 
move project entities safely without losing data on error

GitOrigin-RevId: 864fcf14af1045154e9deb7d02a4f2d508e6021e
 2019-03-18 09:30:28 +00:00
Timothée Alby
429709dfcb Merge pull request #1621 from sharelatex/ns-update-spam-regexes 
allow hyphen in email hostname and ' in project name

GitOrigin-RevId: d108b7d42372dee4250157e2830cbc800851afc1
 2019-03-14 16:02:45 +00:00
Timothée Alby
ca2c854452 Merge pull request #1622 from sharelatex/sk-add-unit-test-for-bcrypt 
Add unit test for 'real' bcrypt

GitOrigin-RevId: 670282b5235484ac03d3451dc2685af18d84a4e3
 2019-03-14 16:02:38 +00:00
Timothée Alby
970ca2e122 Merge pull request #1604 from sharelatex/ns-fix-capitalization 
improve project invite email wording

GitOrigin-RevId: a15c2db992a000d3d1b2e49878380532d9b48e37
 2019-03-14 16:02:27 +00:00
Timothée Alby
e4c684786d Merge pull request #1580 from sharelatex/ta-entity-create-form-fix-2 
Fix Publisher Creation Form Take2

GitOrigin-RevId: a51512cc48067f50ba05fa371ed1d759d3fca985
 2019-03-14 13:43:12 +00:00
Jessica Lawshe
0b841aacef Merge pull request #1605 from sharelatex/jel-portal-team-data 
Refactor portals

GitOrigin-RevId: c75eb5fc17b2755070dfe48eb85845c690fe0230
 2019-03-13 16:51:52 +00:00
Brian Gough
32925f0c4e Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely 
allow reserved names safely

GitOrigin-RevId: d0c5f287411f5cd6d0639f57ef925409571acf8a
 2019-03-13 11:18:06 +00:00
Brian Gough
0f22a626c8 Merge pull request #1595 from sharelatex/bg-remove-old-project-version-request 
remove old project version request

GitOrigin-RevId: 1c0a36ddfde4852b4cae90f5f4c4cfcb727eff77
 2019-03-13 09:12:42 +00:00
nate stemen
f699877959 Merge pull request #1540 from sharelatex/ns-less-spam-mail 
add spam checkers on project invite emails

GitOrigin-RevId: 305825efe6a824b1c0f5b347d2ed2427165d2cef
 2019-03-11 11:07:09 +00:00
Brian Gough
01fd6e9c8a Merge pull request #626 from sharelatex/bg-use-atomic-project-structure-version 
use atomic project structure version

GitOrigin-RevId: ac61039a63af3e94fe842031e90e0aac802ff2b8
 2019-03-11 11:06:45 +00:00
Douglas Lovell
ce8695c951 Merge branch 'dcl-i1261b' 
GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6
 2019-03-11 11:05:47 +00:00
Simon Detheridge
3553fb2d9d Merge pull request #1581 from sharelatex/spd-wearing-middle 
Fix spelling of "middleware"

GitOrigin-RevId: d2b2b20ad8a6871cd6366303e75b340f0f2f2dda
 2019-03-11 11:05:12 +00:00
Simon Detheridge
939922485c Merge pull request #1555 from sharelatex/spd-email-escape-html 
HTML-escape user-supplied data in HTML emails

GitOrigin-RevId: 7535ee8d0ac2c7c772a175ea5058e8cfc7f20e91
 2019-03-11 11:05:01 +00:00
Simon Detheridge
870f183595 Merge pull request #1476 from sharelatex/spd-character-sets 
Detect encoding of non-utf8 files and convert during load

GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69
 2019-03-11 11:04:22 +00:00
Simon Detheridge
838fe00058 Merge pull request #1531 from sharelatex/spd-notify-users-on-affiliation-upgrade 
Notify users when affiliations are upgraded

GitOrigin-RevId: 0f9e92b6a49f2ddef559e9e23fc73436910fb9f6
 2019-03-11 11:00:01 +00:00
Brian Gough
43899589dc Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses 
use explicit json content-type to avoid security issues with text/html

GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56
 2019-03-11 10:58:32 +00:00
Brian Gough
2ab346e762 Merge pull request #1511 from sharelatex/as-inc-linked-file-rev 
Increment rev of linked file to fix bug where dropbox not syncing

GitOrigin-RevId: 6779d10f9ed64eeca901590cc888f35382a2b284
 2019-03-11 10:58:21 +00:00
Brian Gough
cc613f4370 Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors 
Return error status to the publish modal on export creation error

GitOrigin-RevId: e46e9c1244ee540a4687240e8ecbb14ff36bd2e8
 2019-02-14 15:03:42 +00:00
Shane Kilkelly
349d731745 Merge pull request #1493 from sharelatex/sk-read-write-token-match-on-prefix 
Constant-time comparison for read-write tokens

GitOrigin-RevId: ddd83de551c540544fde426d7d5aca9f4c83fcc7
 2019-02-14 11:09:40 +00:00
Timothée Alby
b39626751a Merge pull request #1499 from sharelatex/ta-open-redirect-fix 
Prevent Open Redirects

GitOrigin-RevId: 8cd2ead74de60f47b728ac227c21440281b111a5
 2019-02-12 15:47:41 +00:00
Simon Detheridge
7dcc807caf Merge pull request #1479 from sharelatex/sk-check-read-token-against-v1 
Check generated read-tokens against v1

GitOrigin-RevId: 15749a41a295c0401b0a39968f2c3657f8abebb8
 2019-02-11 11:42:29 +00:00
Simon Detheridge
ea807d053e Merge pull request #1489 from sharelatex/spd-mendeley-csrf 
Enforce use of csrf token in Mendeley / tpr OAuth

GitOrigin-RevId: b615ee195442123e0cd8ff19a864909ac2e6496d
 2019-02-11 11:42:15 +00:00
nate stemen
4840d9e9bd Merge pull request #1469 from sharelatex/ns-ta-refresh-features-on-donmain-confirm 
refresh features on donmain confirm

GitOrigin-RevId: e1c29f1c590aafefef188ddfbc50654194b0747f
 2019-02-05 15:58:58 +00:00
Chrystal Maria Griffiths
ef1bbba618 Merge pull request #1478 from sharelatex/cmg-fix-subscription-tests 
Fix subscription page failing tests

GitOrigin-RevId: dc8bef0aa4996b457d3c770e3ad446315b8bed6f
 2019-02-04 16:25:12 +00:00
Chrystal Maria Griffiths
e73a7dbe9c Merge pull request #1431 from sharelatex/mm-pubmodal-show-errors 
Show export creation errors to the user

GitOrigin-RevId: fc116cfcfc2ca49d19188f01ef7b3460e4619503
 2019-02-04 16:24:30 +00:00
Timothée Alby
01a8cc9aea Merge pull request #1460 from sharelatex/ns-remove-only 
remove only call

GitOrigin-RevId: cfe130bec782079cce9aa8bf7e5c7541def6159d
 2019-01-30 20:11:45 +00:00
Timothée Alby
9a0dd31d8c Merge pull request #1061 from sharelatex/ja-remove-domain-license-code 
Remove deprecated domain license code

GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714
 2019-01-29 12:08:29 +00:00
Timothée Alby
b311f997aa Merge pull request #1444 from sharelatex/ta-ns-check-institution-users 
add script to check all if users on institution are upgraded

GitOrigin-RevId: 903f3a65fc038862178a82f43d97a5a4630cf470
 2019-01-28 14:38:29 +00:00
Douglas Lovell
d2bccbec25 Merge remote-tracking branch 'origin/sk-admin-panel-projects' 
GitOrigin-RevId: 56f17fe3bec6252bd3d933899e540813550a36ff
 2019-01-24 12:13:16 +00:00
Douglas Lovell
bd9adbae52 Merge remote-tracking branch 'origin/bg-case-sensitive-import' 
GitOrigin-RevId: d8d4fff4b4803f3cae6195ce1b60628cca326296
 2019-01-24 12:13:11 +00:00
Alasdair Smith
3af1ef48c2 Merge pull request #1423 from sharelatex/as-fix-non-existent-v1-token 
Fix import page showing for non-existent v1 token

GitOrigin-RevId: cdce007b64d153505a15ec7b16fb4b9311ebf11b
 2019-01-22 11:38:55 +00:00
Simon Detheridge
64f69529e0 Merge pull request #1406 from sharelatex/spd-more-rate-limits 
Add additional rate limits to prevent resource-exhaustion attacks

GitOrigin-RevId: 428cf8a16e062267dd92e7fba73ef5c192a8e668
 2019-01-18 10:37:18 +00:00
Brian Gough
205da19173 Merge pull request #1408 from sharelatex/bg-increase-timeout-on-clone-project 
increase timeout for cloning project to 5 minutes

GitOrigin-RevId: 949c7553f331573b391ff37f180e80b60c260cf5
 2019-01-16 13:17:46 +00:00
Brian Gough
f1179f0fa7 Merge pull request #1384 from sharelatex/bg-use-queued-lock 
use queued locks

GitOrigin-RevId: b5a3bfb55af201392a50ffb3fe30e740e56da30d
 2019-01-15 10:55:32 +00:00
Brian Gough
724e2e8fcd Merge pull request #1344 from sharelatex/bg-handle-filestore-errors 
handle non-sucess responses from filestore copy

GitOrigin-RevId: f00766066a5a2cf20116aa9c8d876f78fae8953f
 2019-01-15 10:55:27 +00:00
Simon Detheridge
da6711dc99 Merge pull request #1275 from sharelatex/hb-authorization-flags 
Authorization flags for metrics

GitOrigin-RevId: 651587c11317bfc8bb7b1e8143e8c2c820683cb5
 2019-01-11 14:44:17 +00:00
Simon Detheridge
4c191953d3 Merge pull request #1356 from sharelatex/spd-password-complexity 
Make password validation more consistent between backend and frontend

GitOrigin-RevId: 6ba729da842bf474cf7e9b5e0b2435db0544737c
 2019-01-11 14:43:49 +00:00
Simon Detheridge
a107b0cc33 Merge pull request #1380 from sharelatex/ew-fix-project-getter-error 
fix callback is not a function error

GitOrigin-RevId: 1bbe80f4086a17576f21ca9fc7b96f59d1b0614c
 2019-01-11 14:43:34 +00:00
Simon Detheridge
4360a55fdc Merge pull request #1383 from sharelatex/spd-rate-limits 
Add rate limits to email-related endpoints

GitOrigin-RevId: 05a8b40eb65a55aba35788e2401e6988b672b389
 2019-01-11 14:43:29 +00:00
Brian Gough
eb5738886a Merge pull request #1382 from sharelatex/bg-fix-locking-for-copy 
fix locking for copy file method in ProjectEntityUpdateHandler

GitOrigin-RevId: a0c2a69f31bd17d8ae5cbfbc1047db22207f9bbe
 2019-01-11 10:27:20 +00:00
James Allen
b969526c19 Merge pull request #1371 from sharelatex/as-fix-dash-user-stubs 
Handle UserStubs when linking projects with owners

GitOrigin-RevId: eb54df048ccf7fffd3feac14fbb5c8991efd47c3
 2019-01-09 13:41:06 +00:00
Henry Oswald
68a0ff08ea Merge pull request #1366 from sharelatex/ho-bump-compile-size 
Bump compile size

GitOrigin-RevId: 087e8556a7e2e39bed486cdd8829bf427aaed68b
 2019-01-08 16:37:00 +00:00
James Allen
8653a3d9cd Merge pull request #1364 from sharelatex/ja-fix-user-stub-owner-imports 
Handle UserStubs for project owner

GitOrigin-RevId: ab3d9edf6e44a7867285430c14c73b3e64fd4c04
 2019-01-08 13:02:14 +00:00
James Allen
e624f697d2 Merge pull request #1352 from sharelatex/spd-zip-files-with-backslashes 
Handle import of zip files that include filenames with backslashes

GitOrigin-RevId: 9f84cf6e0a648ee04bac89fe385931d603709a41
 2019-01-07 11:33:35 +00:00
James Allen
12a2d71ac9 Merge pull request #1346 from sharelatex/ew-use-new-api-for-project-importing 
use different api to check if project is exporting

GitOrigin-RevId: 720012669c833f7482be087ac9d588c354c45147
 2019-01-07 11:33:14 +00:00
Ersun Warncke
985f0a97bc Merge pull request #1332 from sharelatex/ew-block-while-project-importing 
block loading project while importing

GitOrigin-RevId: b96589e5cae9faf269abefd4ea732992a350e68c
 2019-01-03 18:14:19 +00:00
Simon Detheridge
ec1867198f Merge pull request #1313 from sharelatex/as-import-copy 
Improved copy for import status page

GitOrigin-RevId: fa3e6792e7c703ea3a5127186385dcf661fef5e8
 2019-01-03 12:19:35 +00:00
Alasdair Smith
7112e65dc5 Merge pull request #1303 from sharelatex/project-import-refactor 
Project import refactor

GitOrigin-RevId: b4edc35cd4a14db0f4e6746d3da28cd94c351117
 2018-12-20 12:06:15 +00:00
Shane Kilkelly
97e357f772 Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status 
Remove deprecated display of v1 team data in v2

GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d
 2018-12-20 10:55:52 +00:00
Chrystal Maria Griffiths
2b556df43c Merge pull request #1294 from sharelatex/mm-exportstatus-fields 
F1000 export fixes

GitOrigin-RevId: 8f9a149cded8f204949750fc2788bc02223b84af
 2018-12-19 10:38:29 +00:00
Ersun Warncke
bfeefe8406 Merge pull request #1282 from sharelatex/ew-collabratec-support-imported-projects 
Support importing projects with collabratec users to v2

GitOrigin-RevId: 2dd3781dde158cdab6bf95138311224a032ab8a4
 2018-12-18 15:14:37 +00:00
Douglas Lovell
740dce07a9 Merge remote-tracking branch 'origin/hb-publisher-management' 
GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad
 2018-12-18 13:42:56 +00:00
Paulo Jorge Reis
e139abb110 Merge pull request #1273 from sharelatex/ja-password-reset-v1 
Handle v1-only users in v2 password reset flow

GitOrigin-RevId: 38ce8e9aebd3330b980e73640a23661d8015d4f3
 2018-12-18 11:48:53 +00:00
Alasdair Smith
1160620afc Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page 
Revert "Import status page"

GitOrigin-RevId: aa667a7b158b38aeccc8251931cc20589dcb2bdd
 2018-12-17 15:45:36 +00:00
Alasdair Smith
56784c4089 Merge pull request #1240 from sharelatex/as-import-status-page 
Import status page

GitOrigin-RevId: 8855b910e8cdebb81d7b424e2e07b83e6bf2762a
 2018-12-17 14:01:24 +00:00
Jessica Lawshe
7666c8a481 Merge pull request #1236 from sharelatex/jel-password-reset 
Reset password via API request to v1

GitOrigin-RevId: 00b0306ca77df650595a762382a8a63b05a945f6
 2018-12-14 16:02:14 +00:00
Shane Kilkelly
c423e483ba Merge pull request #1256 from sharelatex/sk-file-upload-retry 
Add a retry around `FileStoreHandler.uploadFileFromDisk`

GitOrigin-RevId: 2fc54036acdeda15c00a3d0222fd1a83683a5798
 2018-12-13 15:09:48 +00:00
Ersun Warncke
362c1f64db Merge pull request #1252 from sharelatex/ew-collabratec-upload-fix-v1-proxy 
upgrade to latest (forked) version of multer, proxy collabratec uploads

GitOrigin-RevId: 682caf12a81ee828e544a5e3903ea49bbd173fe0
 2018-12-13 13:09:26 +00:00
James Allen
3bc9ce995a Merge pull request #1264 from sharelatex/hb-set-reversedHostname-on-user-create 
Set reversedHostname on user creation

GitOrigin-RevId: 35ba4a5ae6aa792ee1c46e8b2b99d2e6ed00af17
 2018-12-13 09:25:58 +00:00
Simon Detheridge
22cd3f9273 Merge pull request #1237 from sharelatex/spd-open-in-overleaf-zip_uri 
Add zip_uri and publisher_slug to Open In Overleaf API

GitOrigin-RevId: 2be4b7a0fe521fc4a4415100ac20190bf6e0df6a
 2018-12-10 13:28:06 +00:00
Brian Gough
e42a3d1dc5 Merge pull request #1227 from sharelatex/spd-better-project-name-parsing 
Handle embedded commands when parsing project name from title

GitOrigin-RevId: 09c1720897056a40d38b4f2f80f9d48caad4258b
 2018-12-10 09:51:42 +00:00
Brian Gough
bed59cf8f6 Merge pull request #1223 from sharelatex/bg-fast-import 
parallelise file uploads for v1 project import

GitOrigin-RevId: d4ae617b26e6d341bccd6202a1697a6ba3fc01ad
 2018-12-10 09:51:38 +00:00
Shane Kilkelly
231d89477b Merge pull request #1234 from sharelatex/ta-teamplate-without-brand-metrics 
Handle Access for Template Without Brands

GitOrigin-RevId: f1127298fcede8075b31f6b1bc7161f474817a7e
 2018-12-06 14:09:15 +00:00
Simon Detheridge
f3a10ac221 Merge pull request #1192 from sharelatex/ta-publisher-create 
Add Interface to Create Publishers

GitOrigin-RevId: 50af2d1c05821d20b1ec33e8f68a05d824e55c46
 2018-12-06 11:10:20 +00:00
Simon Detheridge
0097564754 Merge pull request #1220 from sharelatex/spd-open-in-overleaf-file-arrays 
Open in Overleaf: Add support for arrays of files

GitOrigin-RevId: 5ef6d1ace6b7c6c041f2846f2f433b39fb137372
 2018-12-06 11:10:08 +00:00
Timothée Alby
fde672542e Merge pull request #1193 from sharelatex/ta-template-metrics 
Template Metrics

GitOrigin-RevId: 0a8648aec3a9446426c70cd8220bb1f776313303
 2018-12-05 15:12:14 +00:00
Timothée Alby
e0148bf69b Merge pull request #1213 from sharelatex/ta-fix-mocks 
Fix Missing Mocks

GitOrigin-RevId: 1ef7359eb65dd7dc0a4b48547b0a8b47e5dc318e
 2018-12-05 15:12:05 +00:00
Simon Detheridge
2973302e73 Merge pull request #1230 from sharelatex/spd-fix-projectrootdocmanager-tests 
Fix tests in ProjectRootDocManager

GitOrigin-RevId: b68c4b597f24a009c35a0f83f4573fdf84959cd7
 2018-12-05 13:40:16 +00:00
James Allen
79a7a596b0 Merge pull request #1228 from sharelatex/ja-fix-subscription-tests 
Remove redundant sandboxed module require in tests

GitOrigin-RevId: 957af70aacefed34f853549ef2357f59c01a4b3e
 2018-12-05 12:32:41 +00:00
James Allen
16e1980b41 Merge pull request #1225 from sharelatex/spd-ensure-zip-file-project-name-valid 
Ensure project names are valid when importing from zip

GitOrigin-RevId: db36dde6d756e6577d7e89f9f50f76c40575a5f0
 2018-12-05 12:32:36 +00:00
Ersun Warncke
28c934e8ff Merge pull request #1194 from sharelatex/ew-collabratec-link-project-apis 
collabratec link/unlink apis, auth refactor

GitOrigin-RevId: dc901494197334e87d3e6702c789654ccef5e56a
 2018-12-04 11:38:57 +00:00
Jessica Lawshe
f02e3e604b Merge pull request #1172 from sharelatex/jel-portal-templates-link 
Link to portal templates from project dash

GitOrigin-RevId: 303f65b9c5b85a23535479a7d06e70e75069db6c
 2018-12-03 19:13:45 +00:00
Simon Detheridge
3138919cb7 Merge pull request #1184 from sharelatex/spd-zip-project-name-from-tex-content 
zip upload: Read project name from title in zip contents

GitOrigin-RevId: 27122674a0374f86a10c04485d787f4caaf21f5b
 2018-12-03 11:20:44 +00:00
Douglas Lovell
aae0484458 Merge branch 'master' into dcl-i1207 
GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc
 2018-11-30 13:24:27 +00:00
Douglas Lovell
ed3147a58f Allow open from template button when lacking source 
GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a
 2018-11-30 13:24:23 +00:00