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 |
|