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 |
|
James Allen
|
286dd564e2
|
Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection
Fix history default file selection and bug when comparing with version zero
GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1
|
2019-01-29 10:12:17 +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 |
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Paulo Jorge Reis
|
217bc180ac
|
Merge pull request #1251 from sharelatex/pr-history-labels-compare
History labels compare
GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c
|
2018-12-17 10:10:48 +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 |
|
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 |
|
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 |
|