Commit graph

4658 commits

Author SHA1 Message Date
Simon Detheridge
b7daca4f3f Merge pull request #1379 from sharelatex/jel-import-page-mobile-friendly
Mobile friendly project import page

GitOrigin-RevId: b33a3fa5113d4400beec065fe856a19967e68845
2019-01-11 14:43:39 +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
ea415ea639 Merge pull request #1374 from sharelatex/as-fix-dash-user-fetch
Include owners email in user fetch to show on dashboard if needed

GitOrigin-RevId: 7175700f77501723f48763b9ee9397c0448d4109
2019-01-09 17:08:57 +00:00
James Allen
7ee0dcbd7c Merge pull request #1377 from sharelatex/as-deemphasise-download-zip
De-emphasise download zip button if not the primary action

GitOrigin-RevId: 041c44109897c30ade9f5ed2ef47a416749a87a5
2019-01-09 17:08:52 +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
James Allen
1530062d00 Merge pull request #1370 from sharelatex/as-update-v1-tag-messaging
Update messaging on v1 tags now that v1 dash is inaccessible

GitOrigin-RevId: 4e2ca9e58ccf9b9feb2e94e92a310f8ce949184e
2019-01-09 13:40:55 +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
563cdfd439 Merge pull request #1363 from sharelatex/as-gdpr-notice
Add note about deleting a project if no owner to import status page

GitOrigin-RevId: 3c88ab66b6e8c351c7111c87ba3b8d9df701bdb4
2019-01-08 13:02:19 +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
Alasdair Smith
42cf6a1216 Merge pull request #1362 from sharelatex/as-fix-status-page
Fixes for import status page

GitOrigin-RevId: 65c18e1c0ea981bf6e5cc8b65045566e14d5fb12
2019-01-08 12:02:58 +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
1bddd03335 Merge pull request #1319 from sharelatex/ja-account-deletion-message
Change account deletion message when v1 access is removed

GitOrigin-RevId: c81cc85042b30fcff998283cf1ffea0503d0ed40
2019-01-07 11:33:30 +00:00
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
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
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
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
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
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
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
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 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
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
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
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
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