github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
8926 commits 3 branches 7 tags 201 MiB
Commit graph

317 commits

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