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 |
|
Brian Gough
|
e42a3d1dc5
|
Merge pull request #1227 from sharelatex/spd-better-project-name-parsing
Handle embedded commands when parsing project name from title
GitOrigin-RevId: 09c1720897056a40d38b4f2f80f9d48caad4258b
|
2018-12-10 09:51:42 +00:00 |
|
Brian Gough
|
bed59cf8f6
|
Merge pull request #1223 from sharelatex/bg-fast-import
parallelise file uploads for v1 project import
GitOrigin-RevId: d4ae617b26e6d341bccd6202a1697a6ba3fc01ad
|
2018-12-10 09:51:38 +00:00 |
|
Shane Kilkelly
|
231d89477b
|
Merge pull request #1234 from sharelatex/ta-teamplate-without-brand-metrics
Handle Access for Template Without Brands
GitOrigin-RevId: f1127298fcede8075b31f6b1bc7161f474817a7e
|
2018-12-06 14:09:15 +00:00 |
|
Simon Detheridge
|
f3a10ac221
|
Merge pull request #1192 from sharelatex/ta-publisher-create
Add Interface to Create Publishers
GitOrigin-RevId: 50af2d1c05821d20b1ec33e8f68a05d824e55c46
|
2018-12-06 11:10:20 +00:00 |
|
Simon Detheridge
|
0097564754
|
Merge pull request #1220 from sharelatex/spd-open-in-overleaf-file-arrays
Open in Overleaf: Add support for arrays of files
GitOrigin-RevId: 5ef6d1ace6b7c6c041f2846f2f433b39fb137372
|
2018-12-06 11:10:08 +00:00 |
|
Timothée Alby
|
fde672542e
|
Merge pull request #1193 from sharelatex/ta-template-metrics
Template Metrics
GitOrigin-RevId: 0a8648aec3a9446426c70cd8220bb1f776313303
|
2018-12-05 15:12:14 +00:00 |
|
Timothée Alby
|
e0148bf69b
|
Merge pull request #1213 from sharelatex/ta-fix-mocks
Fix Missing Mocks
GitOrigin-RevId: 1ef7359eb65dd7dc0a4b48547b0a8b47e5dc318e
|
2018-12-05 15:12:05 +00:00 |
|
Simon Detheridge
|
2973302e73
|
Merge pull request #1230 from sharelatex/spd-fix-projectrootdocmanager-tests
Fix tests in ProjectRootDocManager
GitOrigin-RevId: b68c4b597f24a009c35a0f83f4573fdf84959cd7
|
2018-12-05 13:40:16 +00:00 |
|
James Allen
|
79a7a596b0
|
Merge pull request #1228 from sharelatex/ja-fix-subscription-tests
Remove redundant sandboxed module require in tests
GitOrigin-RevId: 957af70aacefed34f853549ef2357f59c01a4b3e
|
2018-12-05 12:32:41 +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 |
|
Ersun Warncke
|
28c934e8ff
|
Merge pull request #1194 from sharelatex/ew-collabratec-link-project-apis
collabratec link/unlink apis, auth refactor
GitOrigin-RevId: dc901494197334e87d3e6702c789654ccef5e56a
|
2018-12-04 11:38:57 +00:00 |
|
Jessica Lawshe
|
f02e3e604b
|
Merge pull request #1172 from sharelatex/jel-portal-templates-link
Link to portal templates from project dash
GitOrigin-RevId: 303f65b9c5b85a23535479a7d06e70e75069db6c
|
2018-12-03 19:13:45 +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 |
|
Timothée Alby
|
dffb6bc7a2
|
Merge pull request #1187 from sharelatex/ta-publisher-membership
Add Publisher Entity for UserMemberships
GitOrigin-RevId: 862b1e4fe6d33b63ddfdaef47c02809c4558f9cc
|
2018-11-28 10:17:36 +00:00 |
|
Simon Detheridge
|
05801085b0
|
Merge pull request #1185 from sharelatex/spd-better-unique-filenames
Use numeric suffixes to disambiguate duplicate project names
GitOrigin-RevId: 489b080d0514a33bbbf775095dd587f5e1a254a4
|
2018-11-26 16:53:42 +00:00 |
|
Simon Detheridge
|
50cba1a86f
|
Merge pull request #1153 from sharelatex/spd-open-in-overleaf-local-storage
Use browser local storage instead of session for tex snippets
GitOrigin-RevId: 9609dc882c37ccd2f58bf6d36ea851bbe746fa25
|
2018-11-26 16:53:31 +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 |
|
Timothée Alby
|
210ebbeaf9
|
Merge pull request #1091 from sharelatex/ta-entity-authorization-refactor
UserMembershipAuthorization Refactor
GitOrigin-RevId: 055cebcd9298ed6dace081198f68491a000cf4a3
|
2018-11-26 13:42:58 +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 |
|
Hugh O'Brien
|
bcd7a740ec
|
Merge pull request #1154 from sharelatex/ta-display-institution-name
display institution name on managment and metrics pages
GitOrigin-RevId: 302bffee358d9d5090877ca833584f50afc0ff7b
|
2018-11-16 09:18:58 +00:00 |
|