Brian Gough
32925f0c4e
Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely
...
allow reserved names safely
GitOrigin-RevId: d0c5f287411f5cd6d0639f57ef925409571acf8a
2019-03-13 11:18:06 +00:00
Brian Gough
0f22a626c8
Merge pull request #1595 from sharelatex/bg-remove-old-project-version-request
...
remove old project version request
GitOrigin-RevId: 1c0a36ddfde4852b4cae90f5f4c4cfcb727eff77
2019-03-13 09:12:42 +00:00
nate stemen
f699877959
Merge pull request #1540 from sharelatex/ns-less-spam-mail
...
add spam checkers on project invite emails
GitOrigin-RevId: 305825efe6a824b1c0f5b347d2ed2427165d2cef
2019-03-11 11:07:09 +00:00
Brian Gough
01fd6e9c8a
Merge pull request #626 from sharelatex/bg-use-atomic-project-structure-version
...
use atomic project structure version
GitOrigin-RevId: ac61039a63af3e94fe842031e90e0aac802ff2b8
2019-03-11 11:06:45 +00:00
Douglas Lovell
ce8695c951
Merge branch 'dcl-i1261b'
...
GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6
2019-03-11 11:05:47 +00:00
Simon Detheridge
3553fb2d9d
Merge pull request #1581 from sharelatex/spd-wearing-middle
...
Fix spelling of "middleware"
GitOrigin-RevId: d2b2b20ad8a6871cd6366303e75b340f0f2f2dda
2019-03-11 11:05:12 +00:00
Simon Detheridge
939922485c
Merge pull request #1555 from sharelatex/spd-email-escape-html
...
HTML-escape user-supplied data in HTML emails
GitOrigin-RevId: 7535ee8d0ac2c7c772a175ea5058e8cfc7f20e91
2019-03-11 11:05:01 +00:00
Simon Detheridge
870f183595
Merge pull request #1476 from sharelatex/spd-character-sets
...
Detect encoding of non-utf8 files and convert during load
GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69
2019-03-11 11:04:22 +00:00
Simon Detheridge
838fe00058
Merge pull request #1531 from sharelatex/spd-notify-users-on-affiliation-upgrade
...
Notify users when affiliations are upgraded
GitOrigin-RevId: 0f9e92b6a49f2ddef559e9e23fc73436910fb9f6
2019-03-11 11:00:01 +00:00
Ersun Warncke
57450bb0fb
Merge pull request #1522 from sharelatex/ew-smoke-test-remove-rate-limit
...
Remove smoke test rate limit, use POST for logout
GitOrigin-RevId: 0152f259b4a4375147857cc25156621de87f8bc9
2019-03-11 10:59:09 +00:00
Brian Gough
43899589dc
Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses
...
use explicit json content-type to avoid security issues with text/html
GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56
2019-03-11 10:58:32 +00:00
Brian Gough
2ab346e762
Merge pull request #1511 from sharelatex/as-inc-linked-file-rev
...
Increment rev of linked file to fix bug where dropbox not syncing
GitOrigin-RevId: 6779d10f9ed64eeca901590cc888f35382a2b284
2019-03-11 10:58:21 +00:00
Brian Gough
cc613f4370
Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors
...
Return error status to the publish modal on export creation error
GitOrigin-RevId: e46e9c1244ee540a4687240e8ecbb14ff36bd2e8
2019-02-14 15:03:42 +00:00
Shane Kilkelly
349d731745
Merge pull request #1493 from sharelatex/sk-read-write-token-match-on-prefix
...
Constant-time comparison for read-write tokens
GitOrigin-RevId: ddd83de551c540544fde426d7d5aca9f4c83fcc7
2019-02-14 11:09:40 +00:00
Timothée Alby
b39626751a
Merge pull request #1499 from sharelatex/ta-open-redirect-fix
...
Prevent Open Redirects
GitOrigin-RevId: 8cd2ead74de60f47b728ac227c21440281b111a5
2019-02-12 15:47:41 +00:00
Simon Detheridge
7dcc807caf
Merge pull request #1479 from sharelatex/sk-check-read-token-against-v1
...
Check generated read-tokens against v1
GitOrigin-RevId: 15749a41a295c0401b0a39968f2c3657f8abebb8
2019-02-11 11:42:29 +00:00
Simon Detheridge
ea807d053e
Merge pull request #1489 from sharelatex/spd-mendeley-csrf
...
Enforce use of csrf token in Mendeley / tpr OAuth
GitOrigin-RevId: b615ee195442123e0cd8ff19a864909ac2e6496d
2019-02-11 11:42:15 +00:00
Ersun Warncke
81e3db260c
Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route
...
Add close site setting and private disconnect all users route
GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0
2019-02-06 14:24:52 +00:00
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
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
Paulo Jorge Reis
af2d959504
Merge pull request #1072 from sharelatex/spd-open-with-overleaf
...
Implement v1 open-with-overleaf API in v2 (part 1)
GitOrigin-RevId: 488f4eeefc29086a72295ccbc7c63d2f927add12
2018-11-15 10:04:33 +00:00
James Allen
8c70d680f4
Merge pull request #1145 from sharelatex/ew-collabratec-create-project2
...
Collabratec create project api
GitOrigin-RevId: 5f421625baa5c48f1745a15e15fe3a18fc1a4884
2018-11-14 14:44:17 +00:00
Shane Kilkelly
81b09c7800
Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2
...
Enable git-bridge in v2
GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7
2018-11-14 11:29:35 +00:00
James Allen
140f97eb20
Merge pull request #1107 from sharelatex/ja-purchase-groups
...
Purchase group/team accounts directly via app
GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0
2018-11-13 13:50:46 +00:00
Chrystal Maria Griffiths
f1c8dcdf1e
Merge pull request #1127 from sharelatex/as-keep-tags-archive
...
Keep tags when archiving project
GitOrigin-RevId: 40b23895ef27a69500194cfc149a236ae615f271
2018-11-13 10:54:18 +00:00
Chrystal Maria Griffiths
afbeec3b02
Merge pull request #1099 from sharelatex/ta-management-ui-title
...
Management UI Wording Tweaks
GitOrigin-RevId: 9e1a8990f226e1fda423f6fa6efa25cf3b924544
2018-11-13 10:53:56 +00:00
Chrystal Maria Griffiths
6ea0b9cf46
Merge pull request #1097 from sharelatex/hb-fix-institutions-callbacks
...
Fix multiple callback and silent failures on institutions controller
GitOrigin-RevId: 2883445a4d960e7aca2dfbab45b8e268437e4769
2018-11-13 10:53:50 +00:00
Ersun Warncke
59a849d46e
Merge pull request #1117 from sharelatex/ew-collabratec-project-metadata-api2
...
Collabratec project metadata api
GitOrigin-RevId: 46f4b84bfb302f68c0a176a8a1686ce22829ba08
2018-11-09 09:11:53 +00:00
Ersun Warncke
de4f1a5abd
Merge pull request #1126 from sharelatex/mm-ensure-valid-rootdoc
...
Ensure project's root doc is valid before exporting
GitOrigin-RevId: 6f15955015097df9464267f458b8dbb126c22173
2018-11-09 08:26:24 +00:00
Jessica Lawshe
a18176b2fa
Merge pull request #1128 from sharelatex/jel-add-user-to-team-db-op
...
Change database operator to add user to team
GitOrigin-RevId: 0bf23c1f8958f74fa00a97559ebbf03e4edadfa6
2018-11-08 16:11:58 +00:00
Paulo Jorge Reis
49388c868b
Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui
...
Editor cobranding UI
GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5
2018-11-07 11:43:31 +00:00
Ersun Warncke
f3b92bbeec
Collabratec Get Projects API ( #1092 )
...
collabratec get projects api
GitOrigin-RevId: c733aecf515cf75ca1ae9c454efa7a35f09cf495
2018-11-06 13:48:49 +00:00
Brian Gough
2ea0644cfa
Merge pull request #1082 from sharelatex/bg-fix-backslash-on-v1-and-template-import
...
fix backslash on v1 and template import
GitOrigin-RevId: 8410a80a06ef48610f7b18f4556bd073253d4eb7
2018-11-06 08:33:00 +00:00
Alasdair Smith
659242b457
Merge pull request #1037 from sharelatex/as-decaffeinate
...
Decaffeinate frontend
GitOrigin-RevId: 1c8c53dedecfe55f9936a13408df17b852f996de
2018-11-05 10:19:25 +00:00
Jessica Lawshe
49acb719db
Merge pull request #1102 from sharelatex/mm-ensure-history-before-export
...
Ensure project has history before exporting
GitOrigin-RevId: 688131fbbca1cd339433d3b9be57a03a32303b3e
2018-11-01 17:48:09 +00:00
Ersun Warncke
365158f283
Merge pull request #1047 from sharelatex/ew-oauth-authorization
...
add oauth middlewear
GitOrigin-RevId: b68360763e1060fdbcbb4348d3d691a803fbfa41
2018-10-30 18:31:47 +00:00
Timothée Alby
c32a891cc8
Merge pull request #1077 from sharelatex/ta-create-institution
...
Create Institution When Confirming New Domain
GitOrigin-RevId: c0f5f0edde558eed744e813d6edccfc1f5acf8f0
2018-10-30 14:38:11 +00:00
Timothée Alby
92582fdc38
Merge pull request #1076 from sharelatex/ta-ui-error-handling
...
Management UI Error Handling
GitOrigin-RevId: a0567b5d54af3a8ca31f7e124c0c2d2d8d26b647
2018-10-30 14:37:59 +00:00
Simon Detheridge
1a9bb5f4eb
Merge pull request #1088 from sharelatex/ta-fix-entity-id-scope
...
Fix Scope Bug in Group Access Control
GitOrigin-RevId: 7d2cb5fc08e0c7e4bd1b70c03b62620bb7dd8d41
2018-10-30 10:16:25 +00:00
Douglas Lovell
b1bda995a6
Merge branch 'deploy-20181029a'
...
GitOrigin-RevId: c51d4da706319564bd31514370fe13413655b6cf
2018-10-29 15:01:41 +00:00
Brian Gough
207b0d84c7
Merge pull request #1074 from sharelatex/bg-fail-gracefully-on-copy-project-error
...
handle failure in parallel copy
GitOrigin-RevId: 67ad5ab9f31689ef66ea2cce75c99c72bf23df41
2018-10-29 13:57:02 +00:00
Brian Gough
707a258d5b
Merge pull request #1040 from sharelatex/bg-start-history-in-v2-for-old-projects
...
allow creating v2 history for existing project without v2 history
GitOrigin-RevId: 2ccbe55f5c203c37d37be00306de5e265555f909
2018-10-29 13:56:55 +00:00
Timothée Alby
3d94be22b1
Merge pull request #1065 from sharelatex/ta-manage-group-members
...
Manage Group Members
GitOrigin-RevId: f0b120630ded1874dfc0352055633afff0015da9
2018-10-25 15:26:00 +00:00
Timothée Alby
aa549dd0d4
Merge pull request #1063 from sharelatex/ta-remove-add-user-to-group
...
Remove addUserToGroup Action
GitOrigin-RevId: 4f0cbf3dce47ee317b14784402128960a2caffa1
2018-10-25 15:25:55 +00:00
Timothée Alby
edd832b1f2
Merge pull request #1067 from sharelatex/ta-add-missing-mock
...
Add Missing Test Mock
GitOrigin-RevId: 69a08a1a13a72fe180ab11d1001eca424b149d1f
2018-10-25 15:25:44 +00:00
Timothée Alby
b123f830ff
Merge pull request #1042 from sharelatex/ta-user-membership-access
...
User Membership Access Refactor
GitOrigin-RevId: 23e8d342bc4829450625146213ff92cb042550dd
2018-10-24 14:02:55 +00:00
Brian Gough
d75d8ee079
Merge pull request #1035 from sharelatex/bg-fix-github-sync-filetypes
...
check the filetype before syncing file
GitOrigin-RevId: ec1a309e2423c6ff2c73202dcabae610edce4f6e
2018-10-23 13:16:30 +00:00
Simon Detheridge
8b55643f7e
Merge pull request #1030 from sharelatex/spd-bonus-program
...
Implement bonus program
GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8
2018-10-23 11:36:17 +00:00
Paulo Reis
00a489a000
Fetch brand variation details for branded projects; inject details into the editor page front-end.
...
Test brand variation details.
Rename BrandVariationsController to BrandVariationsHandler.
Use the V1 API helper.
Do not swallow errors when fetching brand details for project load.
Fix indentation.
2018-10-19 10:47:02 +01:00
Brian Gough
c6ec31c773
Merge pull request #1024 from sharelatex/bg-avoid-duplicate-project-names
...
avoid duplicate project names for templates and zips
2018-10-18 13:51:05 +01:00
Simon Detheridge
6ad16c9406
Merge pull request #1028 from sharelatex/spd-no-github-for-new-users
...
retry: Don't add old v1 features for new accounts
2018-10-17 14:51:46 +01:00
Hugh O'Brien
3b766bf523
Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id
...
Create projects with brand variation id
2018-10-16 11:17:09 +01:00
Hugh O'Brien
876663f94b
Merge pull request #1006 from sharelatex/hb-v2-affiliations-callback
...
Add affiliations on university domain confirmation
2018-10-16 11:17:01 +01:00
Simon Detheridge
0f54bc2c52
Add additional tests for V1SubscriptionManager
...
One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call.
bug: overleaf/sharelatex#1014
2018-10-16 10:15:42 +01:00
Simon Detheridge
6fc6c44605
Don't add old v1 features for new accounts
...
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.
Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.
bug: overleaf/sharelatex#1014
2018-10-16 09:45:16 +01:00
Simon Detheridge
ec9c38df57
Revert "Don't add old v1 features for new accounts"
2018-10-15 17:46:48 +01:00
Simon Detheridge
85f097343f
Merge pull request #1022 from sharelatex/spd-no-github-for-new-users
...
Don't add old v1 features for new accounts
2018-10-15 15:28:34 +01:00
Tim Alby
e646c5c42a
refactor to use config file
2018-10-15 14:46:38 +02:00
Brian Gough
a640397052
make project names unique for zip uploads and template imports
2018-10-15 09:33:39 +01:00
Brian Gough
59cf0aa3cb
fix bug in call to findAllUsersProjects
2018-10-15 09:33:39 +01:00
Simon Detheridge
48995d2d44
Don't add old v1 features for new accounts
...
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.
Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.
bug: overleaf/sharelatex#1014
2018-10-12 17:45:57 +01:00
Hugh O'Brien
b825f0b267
Merge branch 'master' into hb-v2-affiliations-callback
2018-10-11 17:14:35 +01:00
Paulo Reis
b0802380ae
Update tests
2018-10-10 14:09:47 +01:00
Paulo Reis
901fb0fc1e
Unit test brand variation id.
2018-10-10 14:09:47 +01:00
Simon Detheridge
ea2782ff22
Merge pull request #1005 from sharelatex/spd-no-more-asterisks
...
Sanitize paths in all relevant ProjectEntityHandler methods
2018-10-10 10:44:13 +01:00
Tim Alby
48e5c6b523
add UserMembership logic
2018-10-09 12:09:11 +01:00
Brian Gough
a68bde819d
Merge pull request #1004 from sharelatex/ta-test-mock-fix
...
Fix Test Mock
2018-10-09 10:35:50 +01:00
Simon Detheridge
56dcbefb5b
Check for safe paths in all ProjectEntityHandler methods
...
Some import mechanisms (for example, Github project import) call methods such as 'upsert*' directly, bypassing existing filename checks.
Added checks to all methods in ProjectEntityHandler that can create or rename a file.
bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-08 15:31:04 +01:00
Simon Detheridge
e66210d2af
Add method to sanitize full paths
...
For convenience, add a method to SafePath to break a path into components and verify the status of each one.
bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-08 14:48:17 +01:00
hugh-obrien
f6307f9086
store reversedHostname property and update test accordingly
2018-10-08 13:37:12 +01:00
hugh-obrien
3919acad46
store reversed hostname and review fixes for v2 university domain confirmation
2018-10-08 12:08:29 +01:00
Alasdair Smith
e129172553
Fix ordering of boolean check to be more readable
2018-10-08 11:25:24 +01:00
Alasdair Smith
1ef947b1fe
Fix tests after refactoring register validation
2018-10-08 10:44:25 +01:00
Hugh O'Brien
cc962c3e6f
Merge pull request #978 from sharelatex/hb-use-exports-for-pdf-from-publish-modal
...
Generic Zip or Pdf Exports endpoint
2018-10-08 10:13:18 +01:00
hugh-obrien
65ecdf84f4
cleanup and tests for v2 affiliations confirmation
2018-10-07 16:40:26 +01:00