Commit graph

279 commits

Author SHA1 Message Date
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