James Allen
|
47ab15c39f
|
Merge pull request #1318 from sharelatex/ja-hide-v1-dash-link
Hide link back to v1 dash after we start force exporting to v2
GitOrigin-RevId: 1221bfc3d09224b09040604e0a3f6120d63d8946
|
2019-01-07 11:33:25 +00:00 |
|
James Allen
|
87b983ec6b
|
Merge pull request #1348 from sharelatex/as-tweak-import-status-page
Tweak import status page
GitOrigin-RevId: df30c354dfeb27828225f535e3bfab782212ee60
|
2019-01-07 11:33:19 +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 |
|
James Allen
|
0de359b70b
|
Merge pull request #1345 from sharelatex/ja-remove-git-warning
Remove warning about no git bridge in import modal
GitOrigin-RevId: 7b5f83c1ad5d419ddb418313cfb49b13672a1077
|
2019-01-04 16:33:49 +00:00 |
|
Alasdair Smith
|
9737a04125
|
Merge pull request #1338 from sharelatex/as-remove-import-modal
Don't show project import modal if feature flag is set
GitOrigin-RevId: f48d5e5cc795030d6c3332f5fde744d2e67f6366
|
2019-01-04 10:51:47 +00:00 |
|
Ersun Warncke
|
ccb9ae6317
|
Merge pull request #1337 from sharelatex/mm-f1000-realrevisionurl
Real revisionURL for F1000 exports
GitOrigin-RevId: 6a9284c36680824fcc0be3b2f926deff27cb7cf8
|
2019-01-03 18:33:28 +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
|
258ce15d91
|
Merge pull request #1334 from sharelatex/spd-password-tweaks
Make password verification on backend match frontend when changing passwords
GitOrigin-RevId: e15aa103549d4d5753118b09cd0fc0551efa2654
|
2019-01-03 15:25:31 +00:00 |
|
Simon Detheridge
|
c4d0cf9fd0
|
Merge pull request #1325 from sharelatex/ew-enable-collabratec-v2-for-all
Enable collabratec v2 for all users
GitOrigin-RevId: 586dccdcfee8f9d219838b73e0a217b0e10550b8
|
2019-01-03 15:25:26 +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 |
|
James Allen
|
df2dd2cb80
|
Merge pull request #1308 from sharelatex/spd-open-in-overleaf-form-character-encoding
Open in Overleaf: Fix character-encoding problems when passing content via 'snip' parameter
GitOrigin-RevId: d5d9faef8583696dfe7c94e4b5dfd88fc5bf6f4a
|
2019-01-03 10:20:55 +00:00 |
|
James Allen
|
93bf6fcb19
|
Merge pull request #1323 from sharelatex/spd-open-in-overleaf-documentation
Open in Overleaf: Add '/devs' documentation page
GitOrigin-RevId: 4ab5a296570bee147cd79bccb436392f941c076b
|
2019-01-03 10:20:50 +00:00 |
|
James Allen
|
6bcf209fab
|
Merge pull request #1306 from sharelatex/sk-take-git-bridge-out-of-beta
Take git-bridge out of beta-program
GitOrigin-RevId: ba95dcd1c818f11f44915ea3731d29aa50473622
|
2019-01-03 10:20:44 +00:00 |
|
Christopher Hoskin
|
95c8e29e66
|
Merge pull request #1322 from sharelatex/csh-issue-1309-node-6.15.1
Bump node to 6.15.1
GitOrigin-RevId: 7ae516d1231cd79baf0ff29768768a53b1f5f080
|
2019-01-02 16:03:52 +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 |
|
Ersun Warncke
|
7bf860cde5
|
Merge pull request #1312 from sharelatex/ja-add-rate-limits
Add rate limits to adding emails and changing password
GitOrigin-RevId: e73c17985cc9c74d60f8856b3b47b28fecd0d489
|
2018-12-21 12:22:56 +00:00 |
|
James Allen
|
2cf7fefaeb
|
Merge pull request #1307 from sharelatex/pr-git-bridge-modal
Redo the git bridge trial modal.
GitOrigin-RevId: 9ddb61a84a018459fa040ab1514dc35085c93d4e
|
2018-12-20 15:48:58 +00:00 |
|
James Allen
|
5a7f72c9f9
|
Merge pull request #1302 from sharelatex/jel-cms-iframe-attr
Allow style attribute on iframes
GitOrigin-RevId: f6a88f544eab665fecc00b8c89e87d489f39b88d
|
2018-12-20 15:48:52 +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
|
d2465f8d6a
|
Merge pull request #1297 from sharelatex/ja-rate-limit-v2-login
Add rate limit to v2 login end point
GitOrigin-RevId: 81b14387e4a6381f4c0eae17e43af84b2af7fea5
|
2018-12-19 16:02:38 +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
|
366dbbd54f
|
Merge pull request #1288 from sharelatex/cmg-cancel-comments-ff
Make comments cancel when you cancel them on firefox
GitOrigin-RevId: 68b8be1ac34f0510103f3b9a8e7b617988fb55de
|
2018-12-19 10:38:35 +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 |
|
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 |
|