Commit graph

575 commits

Author SHA1 Message Date
Alasdair Smith
394f160679 Merge pull request #2963 from overleaf/cmg-archive-state-script
Script to convert old archived state into new array state

GitOrigin-RevId: 64cd3a236dc627f922488e1fa9d8aa2e7df1eb15
2020-09-27 02:05:32 +00:00
Jakob Ackermann
018a44eeb5 Merge pull request #3185 from overleaf/jpa-normalize-mongo-imports
[misc] normalize mongo imports

GitOrigin-RevId: ac653d9982e0d36736b90f4c03d4c00be88ea76a
2020-09-25 02:04:20 +00:00
Chrystal Maria Griffiths
e6307237e4 Merge pull request #3207 from overleaf/jpa-drop-console-log
[misc] drop console.log calls in tests

GitOrigin-RevId: 156c94761e55648a92cf98d4c3cce20abb5de623
2020-09-19 02:04:38 +00:00
Jessica Lawshe
aee83bc0cf Merge pull request #3173 from overleaf/jel-institution-sso-audit-log
Update audit log when institution SSO is linked/unlinked

GitOrigin-RevId: 264ffbed025dccb4dd202f86afe545c3bf0c1f76
2020-09-15 02:04:24 +00:00
Timothée Alby
d9c435a77a Merge pull request #2957 from overleaf/ew-validate-saml-email
Validate saml email before register

GitOrigin-RevId: 6dcf3bccd280abd7bd3ced2d4fd2f69c590f74c1
2020-09-02 02:05:07 +00:00
Timothée Alby
1ff2c6ce00 Merge pull request #3117 from overleaf/sk-block-tpds-update-on-archived-project
Block TPDS update on archived/trashed project

GitOrigin-RevId: 7db41a313b03721b93cbb601add6f91ae31f3f2a
2020-08-25 02:04:17 +00:00
Jakob Ackermann
674954f96f Merge pull request #3094 from overleaf/sk-restrict-admin-flag
Check domain of emails on admin users

GitOrigin-RevId: 75de9cff30e3c628249fcd0ea3446a33d51d39b4
2020-08-20 02:06:19 +00:00
Jessica Lawshe
552fb56b74 Merge pull request #3078 from overleaf/jel-log-password-reset-by-token
Update audit log when password reset by token

GitOrigin-RevId: 2ae7f59c5cdf2723e541a99c58c36564cc82adbf
2020-08-13 15:46:10 +00:00
Timothée Alby
3babf23444 Merge pull request #3091 from overleaf/jel-log-default-email-change
Update audit log for default email changes

GitOrigin-RevId: c7b4e4e888aa5ffd976062d72f660ded303f0885
2020-08-13 02:06:40 +00:00
Timothée Alby
8cd6e7ccfc Merge pull request #3064 from overleaf/ta-manage-multiple-groups
Allow Users to Manage Multiple Groups

GitOrigin-RevId: c918da0114cdd1d679223f69d81159b4c2608874
2020-08-13 02:06:20 +00:00
Simon Detheridge
29f09c50c2 Merge pull request #3071 from overleaf/spd-unhandled-promises-in-tests
Treat unhandled promise rejections as errors in tests

GitOrigin-RevId: ba9d8fa02e0687c6b2d1d95e495fe0b54bb0cff5
2020-08-12 02:07:09 +00:00
Jessica Lawshe
7eee20f914 Merge pull request #3079 from overleaf/jel-log-password-update
Update audit log when password updated

GitOrigin-RevId: 3228e39e8a3682d6e77264cd6ee580f3fc40642a
2020-08-10 15:56:11 +00:00
Jakob Ackermann
a437eb3d59 Merge pull request #2995 from overleaf/jpa-project-download-fix-leaking-upstream-response
[misc] project download: fix leaking upstream stream from error in pipe

GitOrigin-RevId: cb7db90890853352dc69ea2e46cec7e7ea66e6e9
2020-08-10 15:55:00 +00:00
Jessica Lawshe
c3450e4414 Merge pull request #3051 from overleaf/jel-log-when-email-added
Add entry to auditLog when user adds an email

GitOrigin-RevId: 797c85e18cb2b201e09fd2631b1e5ea066adfc37
2020-08-10 15:54:42 +00:00
Jessica Lawshe
cbe21d1f77 Merge pull request #3024 from overleaf/jel-log-cleared-sessions
Log cleared user sessions in user.auditLog

GitOrigin-RevId: 829c4ea037d897689c02c1dfe12d38542a7216c0
2020-07-28 02:06:43 +00:00
Jakob Ackermann
1f6499b5ea Merge pull request #3053 from overleaf/jpa-spd-accepts
[misc] reland 3004: unify detection of json requests and skip issuing of redirects

GitOrigin-RevId: fa43b3b4d23deb581496ed70ae8f28b805555d64
2020-07-28 02:06:27 +00:00
Jakob Ackermann
7847209eaa Merge pull request #3049 from overleaf/jlm-fix-referral-projection
Fix referral projection

GitOrigin-RevId: 37c68bf6bfa81a694e2f919b262634a9a1b63f8b
2020-07-28 02:06:20 +00:00
Paulo Jorge Reis
ffc5c4be8f Merge pull request #3009 from overleaf/jpa-fix-flaky-locking-in-tests
[misc] ProjectStructureMongoLockTest: eventually restore locking timeout

GitOrigin-RevId: 6c139edb0f6e37775c459a50a71dd90802e366fc
2020-07-17 02:06:54 +00:00
Hugh O'Brien
eaa7491c2b Merge pull request #2948 from overleaf/hb-onboarding-email
User onboarding email

GitOrigin-RevId: 367fd8b6292024bfcad2139728c16cf00f2fb1cb
2020-07-14 02:06:47 +00:00
Miguel Serrano
8023e48efd Merge pull request #2974 from overleaf/jel-ns-user-projections-beta
Remove user projections in BetaProgramHandler

GitOrigin-RevId: 88b7bc3b6f11ae9f8314543ee538c84d25cde7cd
2020-07-11 02:04:30 +00:00
Jakob Ackermann
153a9c5790 Merge pull request #2953 from overleaf/jpa-nocache
[misc] Server: invoke the nocache middleware explicitly and add test

GitOrigin-RevId: 3238b07ebf5963ae95ef3f353e4745d283795fba
2020-06-27 02:10:30 +00:00
Jessica Lawshe
366a925903 Merge pull request #2919 from overleaf/ta-admin-update-empty
Allow  Empty Strings in Admin Form Updates

GitOrigin-RevId: 79c1315dcb56ebdd82094653c67dcd83b1b53b87
2020-06-19 02:10:32 +00:00
Shane Kilkelly
f4950c21bf Merge pull request #2870 from overleaf/sk-restrict-chat
Block restricted users from Chat endpoints

GitOrigin-RevId: caec8fe2bc93d567dd57f32dc765bd74ba53e933
2020-06-05 02:09:58 +00:00
Eric Mc Sween
8ba63b0f8e Merge pull request #2849 from overleaf/em-convert-file-to-doc
Fix update order when converting a file to a doc

GitOrigin-RevId: a0c9488e3870cc972c21b40ff0e2577fcec40ee0
2020-05-21 03:22:07 +00:00
nate stemen
f5b2640c82 Merge pull request #2817 from overleaf/ns-project-import-deletion-v1-handler
remove checks if project is in importing state

GitOrigin-RevId: f087cf04436b38b351b6985cecc9182256401cba
2020-05-21 03:22:02 +00:00
nate stemen
2479cb485a Merge pull request #2826 from overleaf/ns-project-import-flow-deletion
Project import flow deletion

GitOrigin-RevId: 08ffc156eb158235d4ccacba2b3ed504cd9978f0
2020-05-21 03:21:56 +00:00
Eric Mc Sween
ae82366122 Merge pull request #2827 from overleaf/em-faster-clones
Make a single Mongo update when cloning projects

GitOrigin-RevId: abd4069bd8854d84c413bc8f890583e647b7c18e
2020-05-14 03:26:15 +00:00
Miguel Serrano
0583f7a667 Merge pull request #2746 from overleaf/ew-jpa-fix-deprecated-express-methods
[misc] fix express deprecations

GitOrigin-RevId: 78c730578c6a671f142837c98f98d5fd260332a5
2020-05-07 03:27:56 +00:00
Simon Detheridge
dd59d8c242 Merge pull request #2770 from overleaf/spd-filestore-deletes
Delete project files in filestore when project is hard-deleted

GitOrigin-RevId: c836f94b2dc1967d84424ff1b65b1025b3499309
2020-04-25 03:18:55 +00:00
Eric Mc Sween
27941dc8af Merge pull request #2760 from overleaf/em-faster-uploads
Make a single Mongo update when uploading projects

GitOrigin-RevId: de102d3e112c9014ca5885f963e35971e4db6cee
2020-04-24 03:30:55 +00:00
Timothée Alby
be7a1abb13 Merge pull request #2693 from overleaf/ta-acceptance-user-helper
Improve UserHelper in Acceptance Tests

GitOrigin-RevId: 3dffc789a07197d6cc14715dee89da0feb40b506
2020-04-02 03:19:44 +00:00
Timothée Alby
1d7b454c96 Merge pull request #2691 from overleaf/ta-4xx-error-page
Enhance 4xx HTML Response Page

GitOrigin-RevId: 620f84cd6cdc0571bd68bbd2c3164b08f7fe5598
2020-04-02 03:19:35 +00:00
Shane Kilkelly
b51e3c01e4 Merge pull request #2614 from overleaf/sk-monolithify-tags
Move 'tags' into web

GitOrigin-RevId: a248d1b2471f0bfa05589df9b7357b4d85793a79
2020-03-25 04:16:44 +00:00
nate stemen
c301d8bc25 Merge pull request #2666 from overleaf/em-max-json-request-size
Separate max_doc_length from max JSON request size

GitOrigin-RevId: 4c725028111966bf04109080d80d4672273dd697
2020-03-19 04:17:05 +00:00
Timothée Alby
fbbb39b0c0 Merge pull request #2620 from overleaf/ta-body-parser-errors
Convert Errors with Status Code To HTTP Errors

GitOrigin-RevId: 4c7abf4f9164c1a907fbf38c6e440409a616e047
2020-03-10 04:14:38 +00:00
Eric Mc Sween
fbc1136be7 Merge pull request #2649 from overleaf/em-delete-project-history
Delete project in project history when expiring

GitOrigin-RevId: a6bf44a88de35e777b135d8f84d68e3b0ba8908f
2020-03-05 04:17:00 +00:00
Hugh O'Brien
693100358c Merge pull request #2646 from overleaf/as-fix-trashing-old-archived-project
Fix error thrown when trashing project with legacy boolean archived state

GitOrigin-RevId: 0131a2294767e00d69c4dd80ed86dfd5d77339b8
2020-03-04 04:21:54 +00:00
Eric Mc Sween
1da929fcdb Merge pull request #2618 from overleaf/ew-clear-root-doc-on-delete
Clear root doc on delete

GitOrigin-RevId: 4121d198f5253417bca2284c5f750c088debcb8c
2020-02-28 04:18:17 +00:00
Eric Mc Sween
17969c50ce Merge pull request #2611 from overleaf/ta-cmg-recurly-email-update-test-plus
Improve Recurly API Acceptance Test

GitOrigin-RevId: 89f4707c9baaa20e59f64821daa36551ad700118
2020-02-28 04:18:13 +00:00
Shane Kilkelly
2686f5e72a Merge pull request #2630 from overleaf/sk-fix-token-login-redirect
Remember token page when redirect to login

GitOrigin-RevId: 1c4d7b8ae034ef2d63cc680405c099405024f4d1
2020-02-26 04:24:06 +00:00
Shane Kilkelly
7cbb00f207 Merge branch 'sk-token-csrf-protection'
GitOrigin-RevId: e71f7264be45b665502150e9ffbb85b3fc94665e
2020-02-26 04:24:01 +00:00
Timothée Alby
995dbc514d Merge pull request #2594 from overleaf/jel-flag-affiliation-when-registering
Flag unchecked affiliation when registering

GitOrigin-RevId: c9da12ceb5a1712c8c477222f967fb54eceef252
2020-02-21 04:21:16 +00:00
Timothée Alby
f5e2983a6b Merge pull request #2609 from overleaf/ta-cmg-recurly-email-update
Add UI to Update Recurly Email

GitOrigin-RevId: 920a741fd9b4312f031bdd40e3d6bec48f1bd579
2020-02-21 04:21:12 +00:00
Timothée Alby
98f031e9aa Merge pull request #2619 from overleaf/ta-licence-attribute-fix
Read Licence Attribute from Affiliation Instead of Institution

GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
2020-02-21 04:20:59 +00:00
Simon Detheridge
b812109cb7 Merge pull request #2593 from overleaf/ta-affiliation-licence-check
Check Licence on Affiliations Rather Than Institutions

GitOrigin-RevId: 7effe7f564ff953e60ed77bcdf92f3cb177d4aee
2020-02-19 04:20:39 +00:00
Chrystal Maria Griffiths
4131e5ce7b Merge pull request #2585 from overleaf/cmg-remove-legacy-archive
Remove legacy project archiving

GitOrigin-RevId: a402cde154cdc2ef5e93661318c5ca86201471b5
2020-02-13 04:20:26 +00:00
Jessica Lawshe
528b2b5728 Merge pull request #2563 from overleaf/jel-add-affiliation-when-registering
Add affiliation when registering

GitOrigin-RevId: e1915bbdc0a4fef399ef9b4a2154ede31e282cc3
2020-02-12 04:21:10 +00:00
Ersun Warncke
ba253bee12 Revert "Revert "Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid"""
This reverts commit 034ae6fa4d8515944683395ef14d99801829cb6a.

GitOrigin-RevId: 16801e6f35e1ee879d36ca46e262f8bb6e506a54
2020-02-12 04:20:56 +00:00
Ersun Warncke
b4cdfc43cf Revert "Revert "Revert "format fix"""
This reverts commit abb3f94c50b94cd87012d9e55c40afd9cbfe97e0.

GitOrigin-RevId: 090e01b96222024341e3c988ec3ba4c9fa1eef11
2020-02-12 04:20:52 +00:00
Ersun Warncke
b57ee58883 Revert "fix acceptance tests"
This reverts commit 7e61102f91654431761f5f72b4355c6e5954b0d7.

GitOrigin-RevId: e93c5e079c8b83a77e7a74065c23afb17c9369b3
2020-02-12 04:20:25 +00:00
Ersun Warncke
a6a624eaa3 Revert "format fix"
This reverts commit ed06e07c536e3faa984326a02bbc633b7837e859.

GitOrigin-RevId: b4ed8349c9867838442af9c06a2a1a54fe40e57b
2020-02-12 04:20:21 +00:00
Ersun Warncke
5abb9ab855 format fix
GitOrigin-RevId: ed06e07c536e3faa984326a02bbc633b7837e859
2020-02-12 04:20:17 +00:00
Ersun Warncke
b4fbb0c9fc fix acceptance tests
GitOrigin-RevId: 7e61102f91654431761f5f72b4355c6e5954b0d7
2020-02-12 04:20:12 +00:00
Ersun Warncke
7e200d2aea Revert "Revert "format fix""
This reverts commit 4617b9ec2ed63b14418a8510a214e58397314831.

GitOrigin-RevId: abb3f94c50b94cd87012d9e55c40afd9cbfe97e0
2020-02-12 04:19:45 +00:00
Ersun Warncke
93bf7cc4db Revert "Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid""
This reverts commit 7acba5876581044a08d6deb4767a4a2196dcb765.

GitOrigin-RevId: 034ae6fa4d8515944683395ef14d99801829cb6a
2020-02-12 04:19:41 +00:00
Jessica Lawshe
f2636e0555 Merge pull request #2572 from overleaf/ta-personal-plan-test
Personal Plan Filter Test

GitOrigin-RevId: e0e75bdd43b27cda787d039f9cfaad64e96afa67
2020-02-06 04:20:09 +00:00
Ersun Warncke
76a6c399e3 Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid"
This reverts commit 539982adbf55014400f4aff94195e7f567cda676.

GitOrigin-RevId: 7acba5876581044a08d6deb4767a4a2196dcb765
2020-02-06 04:19:46 +00:00
Ersun Warncke
d8b627f59b Revert "format fix"
This reverts commit 71faf86ccd19dfa6428c2d5bcc8c88ec7f0ee41f.

GitOrigin-RevId: 4617b9ec2ed63b14418a8510a214e58397314831
2020-02-06 04:19:41 +00:00
Ersun Warncke
3bf57edd14 format fix
GitOrigin-RevId: 71faf86ccd19dfa6428c2d5bcc8c88ec7f0ee41f
2020-02-06 04:18:43 +00:00
Ersun Warncke
74ecb4bebe clear rootDoc_id when deleting doc, reset on compiles if invalid
GitOrigin-RevId: 539982adbf55014400f4aff94195e7f567cda676
2020-02-06 04:18:37 +00:00
nate stemen
aa48d639a0 Merge pull request #2560 from overleaf/ta-group-admin-no-features
Don't Give Features To Group Admins

GitOrigin-RevId: 3588aff773bdc4cf18d18ce52f2c1b73462d806e
2020-02-04 04:18:55 +00:00
Simon Detheridge
dc35a7f75e Merge pull request #2536 from overleaf/spd-projectstructuretests-cleanup
Clean up ProjectStructureTests helper methods

GitOrigin-RevId: bc2b5bd66fc875442a703a57ee79b3cca8585ba5
2020-01-28 04:18:40 +00:00
Eric Mc Sween
b055612e3c Removal of default API passwords (#2422)
GitOrigin-RevId: d831adcf2fb8bec8792dda624c255474480bb897
2019-12-19 04:21:30 +00:00
Jessica Lawshe
1e8fc5337c Merge pull request #2449 from overleaf/ew-user-helper-docs-and-tweaks
add docs on UserHelper and tweak a few things

GitOrigin-RevId: 410be6b3cdf32cc72e14e26569f56369ce30c0a2
2019-12-17 04:22:59 +00:00
Eric Mc Sween
a493ec94b2 Merge pull request #2414 from overleaf/ta-features-overrides
Persistent Features Override

GitOrigin-RevId: 9bb389458a4fde3cc36dbc5b8c3f7185b7e4e9bf
2019-12-02 14:09:53 +00:00
Eric Mc Sween
465329527b Merge pull request #2398 from overleaf/ta-skip-registration-tests
Skip Registration-Related Tests in OSS Codebase

GitOrigin-RevId: 72647f6f54799145bf7bec93ad088c35ceae8fa6
2019-11-26 13:30:56 +00:00
Eric Mc Sween
0aafef36ca Merge pull request #2397 from overleaf/ta-metrics-tests-move-redo
Move Metrics Acceptance Tests Redo

GitOrigin-RevId: 0fbc6e5c4c9f1da9b1f44356d7431b3426bd794d
2019-11-26 13:30:51 +00:00
Eric Mc Sween
3da8413156 Merge pull request #2369 from overleaf/em-imports-tpds
Defer flushing to TPDS on project import from v1

GitOrigin-RevId: f2782326716999c37565b3e527b54444bbc53711
2019-11-26 13:30:46 +00:00
Eric Mc Sween
78f6148ca1 Merge pull request #2393 from overleaf/em-revert-tests-move
Revert "move metrics authorization tests to module"

GitOrigin-RevId: 0f209d3deca731c2b1f34b4e9cabd174fa70877a
2019-11-21 14:54:38 +00:00
Eric Mc Sween
c419918e60 Merge pull request #2390 from overleaf/ta-metrics-tests-move
Move Metrics Acceptance Tests

GitOrigin-RevId: ac789ef9157615b89b1d63f28a2be090df5b62a8
2019-11-21 13:00:34 +00:00
Miguel Serrano
11419845e8 Remove v1 defaults (#2391)
GitOrigin-RevId: e9812c9d7785ac64500dcd3925a6b5be4cb04d7c
2019-11-21 10:24:41 +00:00
Miguel Serrano
475e6971a2 Revert "Remove settings.apis.v1 defaults (#2365)" (#2388)
This reverts commit 53d191a080fd50b83236f4e16a0dd10e72e705ad.

GitOrigin-RevId: 15b703670efd1cb13ebe9bd12015ec1109f60bb8
2019-11-20 12:06:18 +00:00
Simon Detheridge
81103c93e6 Add support for removing words from user dictionaries to admin panel (#2371)
* Add support for deletion of words from user dictionary to admin-panel

Co-authored-by: Jessica Lawshe <jessica.lawshe@overleaf.com>

* Add confirmation modal to dictionary word deletion

* Improve dictionary view with some helpful text

* Add MockSpellingApi

* Handle errors more cleanly in SpellingHandler

GitOrigin-RevId: a7d7f8bad120a15b0eaa7d77b5ee804998477ed1
2019-11-20 12:06:13 +00:00
Miguel Serrano
e4d180955f Remove settings.apis.v1 defaults (#2365)
GitOrigin-RevId: 53d191a080fd50b83236f4e16a0dd10e72e705ad
2019-11-20 12:06:08 +00:00
Eric Mc Sween
4f9eb281b7 Merge pull request #2356 from overleaf/em-upgrade-test-deps
Upgrade test dependencies

GitOrigin-RevId: 0bda49dea086f525211836b6008f67bafa2bbe48
2019-11-18 14:53:42 +00:00
Ersun Warncke
af63c8de97 add email rate limiter on login
GitOrigin-RevId: a0da310e5537b420e46c9ed48f8b97051e7e933a
2019-11-13 12:55:30 +00:00
Shane Kilkelly
add98c889c Merge pull request #2312 from overleaf/sk-fix-join-project-null
When we can't join project, produce a 403 response

GitOrigin-RevId: 7a52dd019ed33474e18cdb378fd3d4622f378e56
2019-11-07 10:48:40 +00:00
Shane Kilkelly
cbf08c599b Merge pull request #2333 from overleaf/em-unhandled-rejections
Fail tests on unhandled promise rejection

GitOrigin-RevId: 3cc53ce5b46c63c62374eb83f9442b8d6979272e
2019-11-07 10:48:36 +00:00
Ersun Warncke
8d44f44784 finish saml link after sso login
GitOrigin-RevId: 688ce78ddfb0cfd6a025985dc2dd6f62bce76523
2019-11-06 12:45:58 +00:00
Ersun Warncke
9319229657 move institutional email check to overleaf-integration
GitOrigin-RevId: 3e08b1e86bb14d90115df5337cab5c36bb6a69fc
2019-10-28 08:36:36 +00:00
Simon Detheridge
2c147f575c Merge pull request #2206 from overleaf/sk-restricted-users-redux
Update the joinProject api to include isRestrictedUser flag

GitOrigin-RevId: 38988b5c886e5355edc2edcd834ae6e334fc9f10
2019-10-18 16:41:24 +00:00
Ersun Warncke
0cc7783ad2 pr fixes
GitOrigin-RevId: 8bbe27be51951304673a21e7ba6cd1e7cef1ea60
2019-10-17 14:10:25 +00:00
Ersun Warncke
d59d8dddad sso bailout pages
GitOrigin-RevId: e0e39268227896660a02d8b74cd00249bdf431eb
2019-10-17 14:10:19 +00:00
Ersun Warncke
849f21fde3 add saml acceptance tests. get/set entitlement.
GitOrigin-RevId: 65721aadb91678eafaf5a214a2921fe3dd276efa
2019-10-08 13:29:32 +00:00
Ersun Warncke
3a7384c83f new UserHelper class for acceptance tests
GitOrigin-RevId: 194593b8b70c74d2771f8e6f695faa47c84beeca
2019-10-08 08:58:12 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Ersun Warncke
d9b5941642 do not use v1 for setting default email
GitOrigin-RevId: 00d4610ae55c0a90699d4bc79e7d08d432087abe
2019-07-23 10:59:58 +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
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
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
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
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
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
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
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
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
Miguel Serrano
9226237a36 Merge pull request #1837 from overleaf/msm-revert-commit-by-error-master
Revert "disabled logging during acceptance test execution"

GitOrigin-RevId: 5d613ef0abeb00b2c4b42a660fac95876aebcd46
2019-06-03 09:38:54 +00:00
Miguel Serrano
df026f9f81 disabled logging during acceptance test execution
GitOrigin-RevId: 185077cc0f0c8791bc063bd8da6dd755f94c74d6
2019-06-01 01:57:49 +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
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
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
89ee728514 Revert "oauth and collabratec migration"
This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248.

GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a
2019-05-13 15:52:30 +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
8f339603f4 add thirdPartyIdentifiers to User model and add manager class
GitOrigin-RevId: 5839f1f43237c19efed7f4ce1dfb500da9327f70
2019-05-13 12:04:40 +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
Timothée Alby
85e7f688d5 Display Pricing Exceptions on Subscription Dashboard (#1720)
Display Pricing Exceptions on Subscription Dashboard

GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd
2019-04-23 14:35:21 +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
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
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
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
Ersun Warncke
81e3db260c Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route
Add close site setting and private disconnect all users route

GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0
2019-02-06 14:24:52 +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
Ersun Warncke
330f878085 Merge pull request #1378 from sharelatex/ew-post-logout
POST logout instead of GET

GitOrigin-RevId: b502a6ed945acd336d1a921e5c4c5433d8b7c7b7
2019-01-15 16:48:00 +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
7807435c2d Merge pull request #1353 from sharelatex/spd-incorrect-test-description
Fix incorrect test description (copy-paste error)

GitOrigin-RevId: f45b5baec2c65d459324668e9cfca02c946c07f3
2019-01-11 14:43:54 +00:00
Simon Detheridge
f49523f6bc Merge pull request #1375 from sharelatex/spd-open-in-overleaf-brand-variation-ids
open-in-overleaf: Add support for 'brand_variation_id' parameter
GitOrigin-RevId: 65c7732c3a3b85e524e9ac1ae6f13cd322ef8ccb
2019-01-11 14:43:44 +00:00
Ersun Warncke
c303af5d4d Merge pull request #1354 from sharelatex/ew-async-zip-download
use async project history zip download api

GitOrigin-RevId: 847e22eb3bf89e2e9e3c86bcc9ae92f8c90b25b1
2019-01-07 17:38:33 +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
Ersun Warncke
c313b255bb Merge pull request #1309 from sharelatex/sk-git-bridge-acceptance-tests-2
Add more acceptance tests for git-bridge api

GitOrigin-RevId: 404c857fb73686d7073cd314dd4ee050a5b2e3bc
2018-12-21 12:23:02 +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
0c1e754736 Merge pull request #1289 from sharelatex/sk-labeled-versions-in-git-bridge-v2
Add support for labeled-versions in git-bridge api.

GitOrigin-RevId: 94858627034ffd000d49b92ba5c7ab45e7294840
2018-12-20 10:55:59 +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
Simon Detheridge
531f5fb6ee Merge pull request #1280 from sharelatex/spd-open-in-overleaf-conversions
open-in-overleaf: Add support for partner and client_media_id parameters
GitOrigin-RevId: a4c18a03affa62a1ef2cfb0c595766724ba8969b
2018-12-19 16:02:47 +00:00
Simon Detheridge
b0b87a7b6e Merge pull request #1299 from sharelatex/spd-redirect-bypass-header
Add support for header to allow bypass of redirects

GitOrigin-RevId: 2d40c51c23809c19f0a053093e8ee0719a0190e2
2018-12-19 16:02:29 +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
1836932256 Merge pull request #1247 from sharelatex/sk-git-bridge-acceptance-tests
Git bridge acceptance tests (initial)

GitOrigin-RevId: 66736ed568296674046b368861446eeb6eae664b
2018-12-13 15:09:53 +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
65c1943c63 Merge pull request #1249 from sharelatex/ja-single-process-acceptance-tests-2
Move to running acceptance tests in same process as web server

GitOrigin-RevId: 65757f0b57ac621cafb0066b5c5a7abb30333edd
2018-12-13 09:25:50 +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
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
James Allen
e603afe106 Merge pull request #1217 from sharelatex/ja-download-zip-version
Add option to download zip file of version in history

GitOrigin-RevId: 11ffb9a3305e1e5e0492fccf2be41be7beb67d68
2018-12-05 12:32:26 +00:00
James Allen
fc069c1752 Merge pull request #1216 from sharelatex/ja-remove-only-from-tests
Remove stray 'only' in acceptance tests

GitOrigin-RevId: 37417cfb98a512584723f5eaf6c3c684b5c60f68
2018-12-03 18:02:11 +00:00
Simon Detheridge
eed29c0adc Merge pull request #1189 from sharelatex/spd-open-in-overleaf-zip-files
open-in-overleaf: Zip file support
GitOrigin-RevId: 06442e44d5333fab5df3e48e76fc13c5bcbbd7ba
2018-12-03 11:20:49 +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
James Allen
ee800f7448 Merge pull request #1176 from sharelatex/ja-manage-v1-subs
Manage v1 subscriptions from v2

GitOrigin-RevId: 1fd63b3630f781e8b4cc3dc1413966540e8d0076
2018-11-30 10:43:37 +00:00
Ersun Warncke
87409d4b6a Merge pull request #1152 from sharelatex/ew-collabratec-delete-project-api
collabratec delete project api

GitOrigin-RevId: f40a8cb7ce13f559842c8f22380976780a1c0ef7
2018-11-26 15:44:56 +00:00
James Allen
49e19cad64 Merge pull request #1162 from sharelatex/ja-show-group-management
Add group and institution membership and management info to subscription dashboard

GitOrigin-RevId: 1aba5d5a20cd00ff5090811d0f66dc9c4944dd60
2018-11-20 11:03:56 +00:00
James Allen
0f1c732d15 Merge pull request #1130 from sharelatex/ja-subscription-dashboard
Refactor subscription dashboard

GitOrigin-RevId: 3573822b8b48c7181c661b2c253d7713f4a4328c
2018-11-19 16:01:59 +00:00
Paulo Jorge Reis
af2d959504 Merge pull request #1072 from sharelatex/spd-open-with-overleaf
Implement v1 open-with-overleaf API in v2 (part 1)

GitOrigin-RevId: 488f4eeefc29086a72295ccbc7c63d2f927add12
2018-11-15 10:04:33 +00:00
James Allen
8c70d680f4 Merge pull request #1145 from sharelatex/ew-collabratec-create-project2
Collabratec create project api

GitOrigin-RevId: 5f421625baa5c48f1745a15e15fe3a18fc1a4884
2018-11-14 14:44:17 +00:00
Shane Kilkelly
81b09c7800 Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2
Enable git-bridge in v2

GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7
2018-11-14 11:29:35 +00:00
Ersun Warncke
59a849d46e Merge pull request #1117 from sharelatex/ew-collabratec-project-metadata-api2
Collabratec project metadata api

GitOrigin-RevId: 46f4b84bfb302f68c0a176a8a1686ce22829ba08
2018-11-09 09:11:53 +00:00
Ersun Warncke
f3b92bbeec Collabratec Get Projects API (#1092)
collabratec get projects api

GitOrigin-RevId: c733aecf515cf75ca1ae9c454efa7a35f09cf495
2018-11-06 13:48:49 +00:00
Douglas Lovell
b1bda995a6 Merge branch 'deploy-20181029a'
GitOrigin-RevId: c51d4da706319564bd31514370fe13413655b6cf
2018-10-29 15:01:41 +00:00
Simon Detheridge
8b55643f7e Merge pull request #1030 from sharelatex/spd-bonus-program
Implement bonus program

GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8
2018-10-23 11:36:17 +00:00
Shane Kilkelly
70b56d0362 Fix up acceptance tests 2018-10-04 15:05:40 +01:00
Shane Kilkelly
2ef23194df WIP: trying to get acceptance tests to pass 2018-10-04 15:05:40 +01:00
Ersun Warncke
642b45d0d6 use v1 doc info api 2018-10-02 11:16:46 -04:00
Alasdair Smith
1330c8da73 Also check if v1 project exported if not found for read-only tokens 2018-09-28 11:47:14 +01:00
Alasdair Smith
435fe11115 Check if v1 project was exported if not found
This prevents a redirect loop for projects which were exported but then
deleted on v2. v2 would not find the project, redirect to v1, which
would find that it was exported and redirect back to v2.
2018-09-28 11:47:14 +01:00
Alasdair Smith
4f2c91a59a Add new redirect option to auth with v1, which will urlencode the query string
This is necessary for the GET /docs endpoint, which can be used to send
urls as part of query parameters. If these are not encoded before
redirecting, they can become corrupted.
2018-09-27 12:19:16 +01:00
Ersun Warncke
7b90fcb186 Merge pull request #969 from sharelatex/ew-check-doc-token-access
check access for doc on read only token
2018-09-25 08:35:56 -04:00
Ersun Warncke
eeed857dd9 change api path 2018-09-25 06:45:27 -04:00
Alasdair Smith
298ee2dbb4 Fix v1 return to path 2018-09-25 10:06:24 +01:00
Alasdair Smith
da16e8d01f Add acceptance test for unimported read only token 2018-09-25 09:43:39 +01:00
Alasdair Smith
ca895ae1b1 Redirect to v1 via sign in link 2018-09-25 09:37:22 +01:00
Ersun Warncke
f89e85231a check access for doc on read only token 2018-09-24 18:03:28 -04:00
Shane Kilkelly
7d5bd74c43 Enable legacy login for tests 2018-09-24 08:34:50 +01:00
Shane Kilkelly
eff7b4d59e Add the enableLegacyRegistration option to acceptance test settings 2018-09-20 15:34:14 +01:00
Alasdair Smith
7e358ab318 Support passing through query params 2018-09-18 11:34:04 +01:00
James Allen
15103ac894 Support the same URL with multiple methods in redirects 2018-09-17 15:38:58 +01:00
James Allen
83a1039b7e Add acceptance tests for RedirectManager 2018-09-17 15:38:58 +01:00
Alasdair Smith
42cef8e393 Merge pull request #920 from sharelatex/mm-gallery-exports
Add gallery fields to export controller and handler
2018-09-17 09:42:26 +01:00
Michael Mazour
10fcdd6daf Add optional gallery fields to export request
Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.
2018-09-14 11:02:51 +01:00
Alasdair Smith
893e2dd235 Add test for location of redirect to v1 2018-09-13 12:09:19 +01:00
Alasdair Smith
cf8ae7c28c Add test for redirecting to v1 if project unimported 2018-09-13 12:09:19 +01:00
Ersun Warncke
dd056e36ae add overleaf method 2018-09-10 06:10:36 -04:00
Ersun Warncke
9feb8ef39f Revert "Merge pull request #843 from sharelatex/ew-collabratec"
This reverts commit 223beab491d2f8dcf4c7285267fda355cfce3f05, reversing
changes made to a726537c4372641bfca0eb37fc130ca3a932d433.
2018-08-29 12:00:53 -04:00
Ersun Warncke
c1859f3e80 Merge pull request #843 from sharelatex/ew-collabratec 2018-08-29 10:17:02 -04:00
Tim Alby
ef37902dfc check institution confirmation status 2018-08-27 15:45:31 +02:00
Ersun Warncke
8f21ab7f10 add overleaf method 2018-08-22 13:44:40 -04:00
James Allen
7dc82597e1 Merge pull request #765 from sharelatex/ja-update-email-in-v1
Update email in v1 when setting as default in v2
2018-07-26 10:58:57 +01:00
Alberto Fernández-Capel
8fb9554c3f Revert "Revert "add v2 history labels endpoints"" 2018-07-20 15:36:03 +01:00
Alberto Fernández-Capel
f260f42466 Revert "add v2 history labels endpoints" 2018-07-20 12:39:01 +01:00
Alberto Fernández-Capel
da632c3117 Merge pull request #750 from sharelatex/hof-labels
add v2 history labels endpoints
2018-07-20 11:07:29 +01:00
James Allen
2c25cbaf25 Update error handling on backend 2018-07-17 11:12:09 +01:00
Alberto Fernández-Capel
e7738b851d Merge pull request #764 from sharelatex/afc-import-managers
Import managers
2018-07-17 10:10:51 +01:00
James Allen
ca97698724 Handle v1 response when email is already in use 2018-07-16 17:27:01 +01:00
Hayden Faulds
04bb83f3de add v2 history labels endpoints 2018-07-16 16:06:17 +01:00
James Allen
d0f77abc70 Update email in v1 when setting default in v2 2018-07-16 13:26:52 +01:00
James Allen
476f4e55c3 Just generate a new token on resending confirmation email 2018-07-13 10:42:31 +01:00
Alberto Fernández Capel
46a1cdc510 Use the admin_ids array to query for subscriptions 2018-07-13 09:38:58 +01:00
James Allen
33b28db061 Add backend endpoint for resending confirmation email 2018-07-12 16:39:04 +01:00
Tim Alby
791dc0df5b check institution features on features update 2018-07-10 17:53:37 +02:00
James Allen
7a1bb30952 Merge pull request #699 from sharelatex/ja-fix-bonus-feature-allocation
Don't consider current features when assigning bonus
2018-07-06 11:06:34 +01:00
Tim Alby
b78212290a handle dynamic Proxy URLs 2018-07-06 12:03:47 +02:00
Shane Kilkelly
0777e44abf Merge branch 'sk-linked-files-mendeley' 2018-07-04 12:16:39 +01:00
Shane Kilkelly
b32c9be8ca Linked files from Mendeley. 2018-07-04 10:05:03 +01:00
Alberto Fernández-Capel
d904622b05 Merge pull request #695 from sharelatex/sk-fix-validation-on-refresh-output-file
Fix validation of project-output-file, no build_id when imported from v1
2018-07-03 13:38:59 +01:00
Paulo Reis
80b7641652 Update UserEmails acceptance tests to use the new POST-based email deletion endpoint. 2018-07-02 12:31:36 +01:00
James Allen
156c417df0 Don't consider current features when assignin bonus 2018-06-26 11:26:07 +01:00
Tim Alby
c6de896bb5 decorate emails list with affiliation data 2018-06-25 13:47:04 +02:00
Tim Alby
c81f9c24ed mock affiliations API in acceptance tests 2018-06-25 13:45:46 +02:00
Shane Kilkelly
04be842b30 Fix validation of project-output-file, no build_id for imported v1 projects 2018-06-25 12:27:56 +01:00
Shane Kilkelly
a8222f2e31 Fix tests after sync with master 2018-06-22 13:20:13 +01:00
Shane Kilkelly
ebe828aa62 Refactor, and remove the source_project_display_name prop from linkedFileData 2018-06-22 13:09:18 +01:00
Shane Kilkelly
6058f3ef9b Refactor the LinkedFiles/Agent system, and track build_id for output files 2018-06-22 13:09:18 +01:00
Shane Kilkelly
2ade78783b Add acceptance test for refreshing output file from v1 project 2018-06-22 13:09:18 +01:00
Shane Kilkelly
28257462ae Acceptance tests for project-output-file 2018-06-22 13:09:18 +01:00
James Allen
de45c08585 Restrict token look ups by id to not conflict with other tests 2018-06-21 11:00:25 +01:00
James Allen
46fbf0c641 Merge pull request #672 from sharelatex/ja-refactor-email-templating
Refactor email templating
2018-06-21 10:28:26 +01:00
James Allen
4608a59e3d Store OneTimeTokens in mongo rather than redis 2018-06-21 10:22:08 +01:00
James Allen
0dcbc5facb Send out confirmation emails on register and record confirmedAt date 2018-06-21 10:21:15 +01:00
Michael Mazour
0246631443 Add public API endpoints to reach CLSIs
- `/api/clsi/compile/:submission_id`
- `/api/clsi/compile/:submission_id/build/:build_id/output/:file`

Also per review:
- DRY up ClsiManager.sendRequestOnce and ClsiManager.sendExternalRequest
- Include submission_id in a log message
- Don't include timeout in limits when getting file
2018-06-19 12:04:02 +01:00
Shane Kilkelly
3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
Tim Alby
31827ae6b5 add emails attribute on user creation 2018-06-08 17:53:45 +02:00
Timothée Alby
7cdcd725fd Revert "Use Multiple Emails" 2018-06-07 18:44:59 +02:00
Timothée Alby
f422b7242d Merge pull request #603 from sharelatex/ta-use-multi-emails
Use Multiple Emails
2018-06-07 15:40:43 +02:00
James Allen
c2ef93b212 Merge pull request #610 from sharelatex/ja-sync-from-v2
Tell v1 when refreshing features in v2
2018-06-07 13:30:34 +01:00
Tim Alby
c5530163f5 add emails attribute on user creation 2018-06-06 11:45:01 +02:00
Tim Alby
613c9193e3 implement multi emails logic 2018-06-05 16:42:12 +02:00
James Allen
c5b553d4a6 Notify v1 by default 2018-05-29 17:31:15 +01:00
James Allen
301ae80f99 Allow refreshFeatures to notify v1 to update its features 2018-05-29 17:21:42 +01:00
Shane Kilkelly
14898acd7f Update linked-file acceptance tests 2018-05-29 10:40:38 +01:00
Shane Kilkelly
78f87c0ecf Add acceptance test for the project-list and project-entities endpoints 2018-05-23 15:02:45 +01:00
Shane Kilkelly
691eec48ba Merge branch 'master' into sk-linked-files-from-project 2018-05-22 15:39:09 +01:00
Shane Kilkelly
e34131ed45 Add acceptance test for project linked files 2018-05-22 15:01:51 +01:00