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 |
|
Paulo Jorge Reis
|
4563ce864c
|
Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes
History compare labels fixes
GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3
|
2018-12-18 11:48:49 +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 Reis
|
4ff98f0237
|
Import history compare controller.
GitOrigin-RevId: 61d9a3f340703b07046bb6d7a6d67905befd6faa
|
2018-12-17 12:54:07 +00:00 |
|
Paulo Jorge Reis
|
d5c651c132
|
Merge pull request #1276 from sharelatex/pr-fix-history-v1
Undo rename and removal of the v1 history list controller.
GitOrigin-RevId: 7201214134e8c8988e49d99ebb308ea12010c694
|
2018-12-17 12:16:20 +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
|
bd8642cedd
|
Merge pull request #1272 from sharelatex/jel-login-password-error-view
Add password reset link when password wrong/missing
GitOrigin-RevId: b0b5b5c0f8019d73e028890543da51e5e474a883
|
2018-12-14 21:12:19 +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
|
a72b29efd8
|
Merge pull request #1259 from sharelatex/ja-sso-settings-link
Add link from v2 settings page to manage linked accounts in v1
GitOrigin-RevId: 2aabd0669349023d6b0da520c55587feb19b5201
|
2018-12-13 15:09:59 +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 |
|
James Allen
|
d0744d779e
|
Merge pull request #1233 from sharelatex/ja-owner-userstubs
Allow importing projects by non-owners
GitOrigin-RevId: b8e5597deef8229b22c5605965d246e6ed95d624
|
2018-12-13 09:25:45 +00:00 |
|
Timothée Alby
|
6e25c872e3
|
Merge pull request #1255 from sharelatex/ta-remove-teams-redirect
Remove /teams Route
GitOrigin-RevId: d520cae19fd41a1fbba7fb24dd67b5b9accce36f
|
2018-12-13 02:00:36 +00:00 |
|
Timothée Alby
|
4861a86a21
|
Merge pull request #1254 from sharelatex/ta-fix-error-log
fix var name in error logging
GitOrigin-RevId: 5cb11d033737faabb235101049f4c8c55e1f7600
|
2018-12-13 02:00:30 +00:00 |
|
Ersun Warncke
|
42c3ffbca4
|
Merge pull request #1218 from sharelatex/hb-publishers-hub-v2
Publishers hub v2
GitOrigin-RevId: 532d7afde471a39ec2e63a045d40769c7c37d06f
|
2018-12-10 20:12:20 +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
|
95b3724e36
|
Merge pull request #1206 from sharelatex/sk-git-bridge-migrated-projects
GitBridge: If a project is migrated from v1, add a `migratedFromId` to get-doc response
GitOrigin-RevId: 2ff3f4207b15ce811dd173e4fb44088e51a80d86
|
2018-12-06 14:09:20 +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 |
|
Jessica Lawshe
|
028ad9c05b
|
Merge pull request #1209 from sharelatex/jel-mobile-improvements
Mobile improvements
GitOrigin-RevId: 4b2fa8b1ab12b7ca23a0a64aeadea90f7cfc6f4d
|
2018-12-05 17:59:47 +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
|
12004962fb
|
Merge pull request #1221 from sharelatex/ew-collabratec-zip-upload-api
collabratec zip upload api
GitOrigin-RevId: cf93d47112404e9dcbecd723aa806fc213c057f3
|
2018-12-05 12:32:31 +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 |
|
Simon Detheridge
|
b69cc6ce77
|
Merge pull request #1211 from sharelatex/ta-fetch-v1-data-log-errors
Log Errors in fetchV1Data
GitOrigin-RevId: 4b709430c2ad97ca369e93eaa4c4edf5ad7f3f52
|
2018-12-03 11:20:37 +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 |
|
Jessica Lawshe
|
e8b7ab1f8a
|
Merge pull request #1195 from sharelatex/jel-portal-ieee
Add IEEE portal
GitOrigin-RevId: 7f3ba43be0874791cfd32bb8bf3004aac61b22d3
|
2018-11-29 15:27:09 +00:00 |
|
James Allen
|
1070cd36bb
|
Merge pull request #1163 from sharelatex/ja-zotero
Add support for Zotero linked files
GitOrigin-RevId: 917a881254949163126746667d6debc2a3f16941
|
2018-11-28 11:35:27 +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 |
|
Timothée Alby
|
be6950292d
|
Merge pull request #1190 from sharelatex/ta-team-importer-timeout-fix
Team Importer Timeout Fix
GitOrigin-RevId: 4951262e3eb980b45e3ba5785c1d17c58aa5009e
|
2018-11-28 10:17:30 +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
|
03b37b0289
|
Merge pull request #1177 from sharelatex/jel-active-tab-css
Fix active tab link styling
GitOrigin-RevId: ec8da3ccb7514f70b1b5021e65a6ef60ba920318
|
2018-11-26 16:53:37 +00:00 |
|