2158 commits

Author	SHA1	Message	Date
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
Tim Alby	c00a0a435d	remove console.log in tests	2018-10-05 16:24:28 +01:00
Tim Alby	7b4b75b51a	fix incorrect or missing test mocks	2018-10-05 16:24:05 +01:00
Shane Kilkelly	70b56d0362	Fix up acceptance tests	2018-10-04 15:05:40 +01:00
Shane Kilkelly	2ef23194df	WIP: trying to get acceptance tests to pass	2018-10-04 15:05:40 +01:00
Shane Kilkelly	f9ed367148	Move the auth mechanism for sudo-mode into SudoModeHandler	2018-10-04 15:05:40 +01:00
Ersun Warncke	752658f773	Merge pull request #990 from sharelatex/ew-use-v1-doc-info-api ... Use v1 Doc Info API for Token Access	2018-10-03 09:22:41 -04:00
Timothée Alby	c74c782cee	Merge pull request #961 from sharelatex/ta-account-sync-affiliations ... Add getInstitutionsPlan Function	2018-10-03 14:19:56 +01:00
Brian Gough	2b738907aa	Merge pull request #989 from sharelatex/bg-clean-up-broken-project-on-error ... clean up broken project on error in ProjectDuplicator	2018-10-03 10:04:30 +01:00
Ersun Warncke	642b45d0d6	use v1 doc info api	2018-10-02 11:16:46 -04:00
Brian Gough	4621234220	clean up broken project on error in ProjectDuplicator	2018-10-02 12:14:22 +01:00
Alasdair Smith	1330c8da73	Also check if v1 project exported if not found for read-only tokens	2018-09-28 11:47:14 +01:00
Alasdair Smith	435fe11115	Check if v1 project was exported if not found ... This prevents a redirect loop for projects which were exported but then deleted on v2. v2 would not find the project, redirect to v1, which would find that it was exported and redirect back to v2.	2018-09-28 11:47:14 +01:00
Brian Gough	6d5908f2f4	Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email ... Don't include the license name twice in invite emails	2018-09-28 11:15:40 +01:00
Brian Gough	1f6abd4e69	fix invalid project names when opening templates	2018-09-28 10:38:25 +01:00
Brian Gough	6b80d3563d	add support for creating unique project names	2018-09-28 09:48:15 +01:00
hugh-obrien	52859cdfaa	make the zip fetching endpoint for exports generic to either zips or pdfs	2018-09-27 16:11:11 +01:00
Alasdair Smith	4f2c91a59a	Add new redirect option to auth with v1, which will urlencode the query string ... This is necessary for the GET /docs endpoint, which can be used to send urls as part of query parameters. If these are not encoded before redirecting, they can become corrupted.	2018-09-27 12:19:16 +01:00
Ersun Warncke	a23f0a3d15	fix test failure from merge	2018-09-25 08:54:01 -04:00
Ersun Warncke	7b90fcb186	Merge pull request #969 from sharelatex/ew-check-doc-token-access ... check access for doc on read only token	2018-09-25 08:35:56 -04:00
Ersun Warncke	eeed857dd9	change api path	2018-09-25 06:45:27 -04:00
Ersun Warncke	f0c0834b0f	only do v1 access check when api config present	2018-09-25 05:42:04 -04:00
James Allen	e2f90ba01a	Merge pull request #966 from sharelatex/as-no-project-token-based ... Redirect logged out users to v1 if project is not found from token based url	2018-09-25 10:25:30 +01:00
Alasdair Smith	298ee2dbb4	Fix v1 return to path	2018-09-25 10:06:24 +01:00
Alasdair Smith	da16e8d01f	Add acceptance test for unimported read only token	2018-09-25 09:43:39 +01:00
Alasdair Smith	ca895ae1b1	Redirect to v1 via sign in link	2018-09-25 09:37:22 +01:00
Brian Gough	89ba3912c0	Merge pull request #964 from sharelatex/csh-issue-963-MultipleProjectDownloads ... Replace ShareLaTeX with Overleaf in name of multiple project download file	2018-09-25 09:33:53 +01:00
Brian Gough	5947294016	Merge branch 'bg-support-main-file-for-templates'	2018-09-25 09:32:14 +01:00
Brian Gough	0d4143205d	strip quotes from mainFile	2018-09-25 09:05:49 +01:00
Ersun Warncke	f89e85231a	check access for doc on read only token	2018-09-24 18:03:28 -04:00
Alasdair Smith	d6350c963e	Remove projectExists flag from higher access check ... Now that find project by read and read/write token methods check whether the project exists, it is not neccessary to check whether the project exists in the higher access check. Therefore it has been removed	2018-09-24 19:00:10 +01:00
Alasdair Smith	99dec02266	If no project found for read/write token, redirect to v1	2018-09-24 19:00:10 +01:00
Alasdair Smith	237810509a	If no project found for read token, redirect to v1	2018-09-24 19:00:10 +01:00
Christopher Hoskin	5c35cc9593	Replace ShareLaTeX with Overleaf in name of multiple project download file (Closes: #963)	2018-09-24 16:33:54 +01:00
Brian Gough	418bc10a18	allow getting doc paths by project id	2018-09-24 16:04:23 +01:00
Brian Gough	5954e45016	add missing require	2018-09-24 15:44:09 +01:00
Brian Gough	2692090f3f	support a mainFile parameter for templates	2018-09-24 15:27:16 +01:00
Tim Alby	51c5228288	add getInstitutionsPlan function	2018-09-24 13:16:31 +01:00
hugh-obrien	c0b32f031e	force gallery items to use legacy OL v1 texlive image	2018-09-24 10:49:01 +01:00
Shane Kilkelly	7d5bd74c43	Enable legacy login for tests	2018-09-24 08:34:50 +01:00
Shane Kilkelly	eff7b4d59e	Add the enableLegacyRegistration option to acceptance test settings	2018-09-20 15:34:14 +01:00
Hugh O'Brien	b377b89447	Merge pull request #933 from sharelatex/bg-avoid-exception-for-no-emails ... fix exception when user has no emails field	2018-09-19 11:33:03 +01:00
Brian Gough	02854274a7		2018-09-18 14:09:05 +01:00
Timothée Alby	b16cffe587	Merge pull request #932 from sharelatex/as-redirect-query-string ... Support passing through query params in redirects	2018-09-18 12:35:21 +01:00
Timothée Alby	b6925647ef	Merge pull request #922 from sharelatex/ta-forbid-null-query ... Prevent Calls to UserGetter.getUser with Null Query	2018-09-18 12:24:19 +01:00
Alasdair Smith	7e358ab318	Support passing through query params	2018-09-18 11:34:04 +01:00
hugh-obrien	39f580d6ba	fixing broken exports test	2018-09-18 10:13:33 +01:00
James Allen	15103ac894	Support the same URL with multiple methods in redirects	2018-09-17 15:38:58 +01:00
James Allen	83a1039b7e	Add acceptance tests for RedirectManager	2018-09-17 15:38:58 +01:00
James Allen	40f08d1592	Add additional functionality to RedirectManager	2018-09-17 15:38:45 +01:00
Alasdair Smith	42cef8e393	Merge pull request #920 from sharelatex/mm-gallery-exports ... Add gallery fields to export controller and handler	2018-09-17 09:42:26 +01:00
Alasdair Smith	e1e7091f30	Merge pull request #905 from sharelatex/as-project-intelligent-redirect ... Intelligently redirect to v1 if no v2 project found	2018-09-17 09:40:52 +01:00
Tim Alby	41b92d4647	prevent calls to UserGetter.getUser with null query	2018-09-14 12:46:00 +01:00
Michael Mazour	10fcdd6daf	Add optional gallery fields to export request ... Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.	2018-09-14 11:02:51 +01:00
Tim Alby	0051e59309	remove unused call to UserGetter.getUser	2018-09-13 17:39:30 +01:00
James Allen	ef11161ddb	Revert "Record and show last modified by user for projects"	2018-09-13 14:00:30 +01:00
Michael Mazour	1f976a0e04	Improve ExportsController unit tests ... Test the params the handler's called with.	2018-09-13 12:24:03 +01:00
Alasdair Smith	8a969d1c25	Redirect directly from controller instead of via handler	2018-09-13 12:09:19 +01:00
Alasdair Smith	0c658127ef	Add tests for ProjectNotTokenAccessError	2018-09-13 12:09:19 +01:00
Alasdair Smith	893e2dd235	Add test for location of redirect to v1	2018-09-13 12:09:19 +01:00
Alasdair Smith	cf8ae7c28c	Add test for redirecting to v1 if project unimported	2018-09-13 12:09:19 +01:00
James Allen	ab10336110	Record last update time and user from project-history	2018-09-13 10:38:52 +01:00
Hugh O'Brien	24c479e984	Merge pull request #885 from sharelatex/hb-ip-matcher-notifications ... IP matcher affiliation CTA notifications	2018-09-13 08:59:25 +01:00
Ersun Warncke	7d3e17651f	set options and method for request, pass cookies and form body	2018-09-10 06:10:36 -04:00
Ersun Warncke	dd056e36ae	add overleaf method	2018-09-10 06:10:36 -04:00
hugh-obrien	8ef90a0dcb	move call for creating ip matched notifcation to project controller	2018-09-05 15:40:59 +01:00
Tim Alby	9ec60a128a	add userHasSubscriptionOrIsGroupMember alias	2018-09-05 11:37:37 +01:00
hugh-obrien	23e6292fd7	updating tests for ip matcher logic	2018-09-05 11:22:26 +01:00
hugh-obrien	de83df2703	adding tests for ip matching notifications	2018-09-05 11:22:25 +01:00
James Allen	24f60bf791	Don't include the license name twice in invite emails	2018-09-05 11:05:38 +01:00
Shane Kilkelly	d432b6799f	Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix ... Don't Regard v1 Teams as Paid Subscriptions	2018-09-05 10:22:46 +01:00
Ersun Warncke	e4e6a0fa1b	add new tag methods	2018-09-03 10:40:28 -04:00
Tim Alby	3324796086	don't regard v1 teams as paid subscriptions ... - use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember ` - remove `userHasV1SubscriptionOrTeam` - rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription` - rename some variables for clarity	2018-09-03 15:09:57 +01:00
James Allen	52381c8fb7	Merge pull request #851 from sharelatex/jel-remove-a-b-test ... Remove Plans and Pricing A/B Test	2018-08-30 15:19:56 +01:00
Paulo Jorge Reis	cb4d4145a1	Merge pull request #855 from sharelatex/pr-v2-light-theme ... v2 light theme	2018-08-30 11:24:52 +01:00
Ersun Warncke	9feb8ef39f	Revert "Merge pull request #843 from sharelatex/ew-collabratec" ... This reverts commit 223beab491d2f8dcf4c7285267fda355cfce3f05, reversing changes made to a726537c4372641bfca0eb37fc130ca3a932d433.	2018-08-29 12:00:53 -04:00
Ersun Warncke	afc22dc5c2	Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy" ... This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.	2018-08-29 12:00:20 -04:00
Ersun Warncke	e7eefc0474	Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy ... set options and method for request, pass cookies and form body	2018-08-29 10:17:21 -04:00
Ersun Warncke	c1859f3e80	Merge pull request #843 from sharelatex/ew-collabratec	2018-08-29 10:17:02 -04:00
Jessica Lawshe	8889f2aed2	Remove Plans and Pricing A/B Test ... Remove all layouts, analytics events, and scope related to the A/B test. The group modal from the default layout of the A/B test should be maintained though for v2.	2018-08-28 12:42:09 -05:00
Paulo Reis	76fcee721e	Update unit tests.	2018-08-28 14:24:05 +01:00
Paulo Reis	efc926ffc5	Load theme as a user setting; allow the user to change it; update tests.	2018-08-27 15:25:00 +01:00
Tim Alby	ef37902dfc	check institution confirmation status	2018-08-27 15:45:31 +02:00
Hugh O'Brien	29253c5a93	Merge branch 'master' into hb-fetch-licences-graph	2018-08-23 16:11:43 +01:00
Tim Alby	753fb02c05	always return an array when getting affiliations	2018-08-23 15:15:53 +02:00
Paulo Jorge Reis	d838f8778a	Merge pull request #832 from sharelatex/pr-change-free-history-limits ... Change history limits for free users	2018-08-23 14:02:08 +01:00
Ersun Warncke	8f21ab7f10	add overleaf method	2018-08-22 13:44:40 -04:00
hugh-obrien	8d72fc78fc	send licences graph request to v1 for data instead of analytics	2018-08-22 18:31:29 +01:00
Hugh O'Brien	eeadd1e9bb	Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms ... Tell v1 confirmation status of affiliation emails	2018-08-22 08:34:33 +01:00
Paulo Reis	54e0a7cfd2	Merge branch 'master' into pr-change-free-history-limits	2018-08-21 11:23:28 +01:00
Alasdair Smith	d99a42e678	Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login ... Allow for redirection of unlinked SL account to /user/login_to_ol_v2	2018-08-21 10:13:52 +01:00
Paulo Reis	4dee3fd5e1	Update frontend unit tests.	2018-08-20 17:02:55 +01:00
Tim Alby	8d6505b518	log institutions API errors	2018-08-17 17:48:00 +02:00
Tim Alby	f5513f36ca	add param to skip affiliation creation on user create	2018-08-17 17:48:00 +02:00
Alasdair Smith	9bc3fa2df0	Pass req to preDoPassportLogin module hook	2018-08-17 12:04:05 +01:00
hugh-obrien	96ffeef73d	send fixed confirmed date to v1 for affiliations	2018-08-16 13:50:34 +01:00
hugh-obrien	55597b9279	inform v1 when confirming affiliation emails	2018-08-16 13:50:34 +01:00
Paulo Reis	713a39171a	Fix history frontend tests.	2018-08-16 13:44:48 +01:00
Henry Oswald	5ed95694da	Merge pull request #801 from sharelatex/ho-mailchimp ... Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.	2018-08-16 11:40:39 +01:00
Brian Gough	c2828c8ca5	add unit tests	2018-08-13 10:53:43 +01:00
Tim Alby	197e7ce8ab	refactor institutions getter	2018-08-10 13:40:25 +02:00
James Allen	69e8eddff0	Merge pull request #796 from sharelatex/pr-history-labels-ui ... History labels UI	2018-08-09 10:50:28 +01:00
James Allen	9cbb51bbbc	Merge pull request #793 from sharelatex/sk-sl-login-v2 ... If we're creating v1 accounts, don't allow login for users already linked up	2018-08-08 15:51:25 +01:00
Henry Oswald	687637eec7	change email address in newsletter when changing default email ... put mongo_id into mailchimp merge fields	2018-08-08 13:50:03 +01:00
Henry Oswald	6cf1f71604	add newsletter checkbox to user register forms	2018-08-06 17:43:03 +01:00
Brian Gough	efcd3577ce	avoid clobbering imported image names	2018-08-06 16:56:44 +01:00
Shane Kilkelly	05df55c89e	Add a unit test for the preDoPassportLogin module hook.	2018-08-03 16:10:50 +01:00
Shane Kilkelly	d8c9a96619	If we're creating v1 accounts, don't allow login for users already linked up	2018-08-03 14:58:29 +01:00
Paulo Reis	80eeaaaaea	Update web acceptance tests.	2018-08-02 17:19:16 +01:00
Hugh O'Brien	22b664da1a	Merge pull request #792 from sharelatex/hb-fetch-export-zips ... Fetch export zips	2018-08-02 13:50:11 +01:00
hugh-obrien	395406407e	add test for export fetch zip	2018-07-30 19:39:35 +01:00
Ersun Warncke	426c391153	set options and method for request, pass cookies and form body	2018-07-27 10:43:03 -04:00
Michael Mazour	ddbe1a5b22	Add compiler and imageName to export API request	2018-07-27 15:42:37 +01:00
Tim Alby	66bcdbcac9	institution upgrade	2018-07-26 13:01:44 +02:00
Tim Alby	63c7f756ce	refactor into InstitutionsAPI	2018-07-26 13:01:42 +02:00
James Allen	7dc82597e1	Merge pull request #765 from sharelatex/ja-update-email-in-v1 ... Update email in v1 when setting as default in v2	2018-07-26 10:58:57 +01:00
James Allen	f99b6b6f0a	Merge pull request #746 from sharelatex/ta-refresh-features ... Refresh Features After Confirming Email	2018-07-24 10:04:48 +01:00
James Allen	faf36f0265	Merge pull request #775 from sharelatex/revert-774-revert-750-hof-labels ... Add v2 history labels endpoints	2018-07-24 10:04:13 +01:00
James Allen	5b989f0a8e	Merge pull request #759 from sharelatex/sk-login-with-v1-credentials ... Login with v1 credentials	2018-07-24 10:04:02 +01:00
Alberto Fernández-Capel	8fb9554c3f	Revert "Revert "add v2 history labels endpoints""	2018-07-20 15:36:03 +01:00
Alberto Fernández-Capel	f260f42466	Revert "add v2 history labels endpoints"	2018-07-20 12:39:01 +01:00
Alberto Fernández-Capel	da632c3117	Merge pull request #750 from sharelatex/hof-labels ... add v2 history labels endpoints	2018-07-20 11:07:29 +01:00
Shane Kilkelly	c423672b55	Unit test for finishLogin	2018-07-18 12:08:34 +01:00
Shane Kilkelly	943bfe98aa	Unit test for _loginAsyncHandlers	2018-07-18 11:13:42 +01:00
Shane Kilkelly	dae9506f84	Un-break unit tests	2018-07-18 09:57:05 +01:00
Alasdair Smith	62f69a4bcd	Fix case sensitivity	2018-07-18 09:26:03 +01:00
Alasdair Smith	823e12e4a8	Fix tests to add new Features dependency	2018-07-18 09:26:03 +01:00
James Allen	c2777918fa	Add some missing unit test mocks	2018-07-17 11:26:07 +01:00
James Allen	2c25cbaf25	Update error handling on backend	2018-07-17 11:12:09 +01:00
Alberto Fernández-Capel	e7738b851d	Merge pull request #764 from sharelatex/afc-import-managers ... Import managers	2018-07-17 10:10:51 +01:00
James Allen	ca97698724	Handle v1 response when email is already in use	2018-07-16 17:27:01 +01:00
Hayden Faulds	04bb83f3de	add v2 history labels endpoints	2018-07-16 16:06:17 +01:00
Alberto Fernández Capel	66b492ba5f	Use id to find subscription ... It's the new method signature.	2018-07-16 14:42:41 +01:00
Alberto Fernández Capel	ae440f2ee6	Better variable name in test ... It should be a subscription id, instead of an admin id. The test passes anyway because the db calls are mocked, but the wrong variable name can cause confusion.	2018-07-16 14:40:53 +01:00
James Allen	d0f77abc70	Update email in v1 when setting default in v2	2018-07-16 13:26:52 +01:00
James Allen	b150a7b4ae	Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments ... Affiliations UI, second round	2018-07-16 10:08:47 +01:00
Alberto Fernández Capel	0bf807fa9f	Remove SubscriptionLocator.getManagedSubscription ... It was used as a kind of access control check, but it's clearer if the check is in the only controller that actually needs it.	2018-07-13 11:47:26 +01:00
James Allen	476f4e55c3	Just generate a new token on resending confirmation email	2018-07-13 10:42:31 +01:00
Alberto Fernández Capel	46a1cdc510	Use the admin_ids array to query for subscriptions	2018-07-13 09:38:58 +01:00
James Allen	33b28db061	Add backend endpoint for resending confirmation email	2018-07-12 16:39:04 +01:00
Alberto Fernández Capel	abcfa0b0d2	Store manager ids in an array	2018-07-12 16:35:27 +01:00
Tim Alby	35cb3924e2	refresh features after confirming email	2018-07-11 14:57:35 +02:00
Alberto Fernández Capel	3586fe8406	Update var name	2018-07-11 11:50:14 +01:00
Alberto Fernández Capel	4e8185d369	Use the id in methods that modify a subscription ... This will make it easier to allow a user to manage multiple groups.	2018-07-11 09:56:36 +01:00
Tim Alby	791dc0df5b	check institution features on features update	2018-07-10 17:53:37 +02:00
James Allen	91079f3af2	Fix unit tests	2018-07-10 11:32:19 +01:00
James Allen	cb449f4b75	Delete a subscription on expiry, rather than set personal plan code	2018-07-10 10:31:25 +01:00
James Allen	7a1bb30952	Merge pull request #699 from sharelatex/ja-fix-bonus-feature-allocation ... Don't consider current features when assigning bonus	2018-07-06 11:06:34 +01:00
Tim Alby	b78212290a	handle dynamic Proxy URLs	2018-07-06 12:03:47 +02:00
Tim Alby	cfd5c65be4	add affiliation before confirming email	2018-07-05 16:02:55 +02:00
Tim Alby	9d4df4271a	try adding affiliation on user creation	2018-07-05 16:01:15 +02:00
Tim Alby	3e1d61438f	add endpoint to endorse affiliation	2018-07-05 15:59:36 +02:00
Timothée Alby	958012533d	Merge pull request #724 from sharelatex/ta-parse-email ... parse email in UserUpdater	2018-07-05 15:57:20 +02:00
Hugh O'Brien	a230b5efab	Merge pull request #720 from sharelatex/mm-export-v1projectid ... Include project's and user's v1 ID in export requests	2018-07-05 12:12:35 +01:00
Shane Kilkelly	0777e44abf	Merge branch 'sk-linked-files-mendeley'	2018-07-04 12:16:39 +01:00
Shane Kilkelly	b32c9be8ca	Linked files from Mendeley.	2018-07-04 10:05:03 +01:00
Tim Alby	3a541307b4	parse email in UserUpdater	2018-07-03 20:59:38 +02:00
Alberto Fernández-Capel	f1ef053caf	Merge pull request #705 from sharelatex/afc-import-team-from-v1 ... Changes to allow importing a team from v1	2018-07-03 13:39:19 +01:00
Alberto Fernández-Capel	d904622b05	Merge pull request #695 from sharelatex/sk-fix-validation-on-refresh-output-file ... Fix validation of project-output-file, no build_id when imported from v1	2018-07-03 13:38:59 +01:00
Michael Mazour	235534d269	Also include user's v1 ID in export requests	2018-07-03 10:15:51 +01:00
Douglas Lovell	260f927980	Merge pull request #719 from sharelatex/dcl-test-fix ... Small repair to SubscriptionController Test	2018-07-02 13:16:10 -03:00
Paulo Reis	80b7641652	Update UserEmails acceptance tests to use the new POST-based email deletion endpoint.	2018-07-02 12:31:36 +01:00
Alasdair Smith	ec1dbc47bf	Merge pull request #703 from sharelatex/as-cm-pos-assertion ... Add assertion method for CodeMirror Pos objects	2018-07-02 11:35:26 +01:00
Michael Mazour	8436b67260	Include project's v1 ID in export requests ... If a project was imported from v1, include its v1 ID when making an export request back to v1. Use case: v1 project exported via ScholarOne and then migrated to v2 needs to be linked up to its earlier v1 export records.	2018-07-02 11:12:42 +01:00
Douglas Lovell	1df5b0b942	Fixup mixed indentation	2018-06-29 19:36:59 -03:00
Douglas Lovell	20835a79e2	Repair not logged in subscription controller test	2018-06-29 19:36:40 -03:00
Alberto Fernández Capel	18ded60619	Fix unit tests	2018-06-28 15:28:44 +01:00
Alberto Fernández Capel	193579070c	Ensure features are updated for users but not for stubs	2018-06-28 13:25:04 +01:00
Tim Alby	fe0fdd11bf	call v1 affiliation deletion endpoint with POST instead of DELETE	2018-06-28 13:48:28 +02:00
Tim Alby	1d80878bf8	delete affiliations on user deletion	2018-06-28 13:47:19 +02:00
Tim Alby	837f614df4	refactor affiliation requests	2018-06-28 13:47:16 +02:00
Alberto Fernández Capel	4366a0ea2c	Remove trailing whitespace	2018-06-28 11:08:20 +01:00
Tim Alby	8c70ba88b7	Add missing greater-than character in tests	2018-06-28 10:15:55 +02:00
Alberto Fernández Capel	c19fc6d245	Fetch the whole user doc ... Other attributes are needed to calculate features.	2018-06-27 12:52:47 +01:00
Alberto Fernández Capel	8b8742d60f	Fix ReferalFeatures tests	2018-06-27 12:28:22 +01:00
Alasdair Smith	3a90a2d004	Add custom assertion method to chai for comparing CM Pos objects	2018-06-27 11:28:29 +01:00
James Allen	156c417df0	Don't consider current features when assignin bonus	2018-06-26 11:26:07 +01:00
Henry Oswald	c1a8d8b31a	Merge branch 'master' into ho-clsi-double-backend	2018-06-25 13:43:40 +01:00
Tim Alby	c6de896bb5	decorate emails list with affiliation data	2018-06-25 13:47:04 +02:00
Tim Alby	c81f9c24ed	mock affiliations API in acceptance tests	2018-06-25 13:45:46 +02:00
Tim Alby	e41391fb4a	ignore affiliations if v1 is not configured	2018-06-25 13:45:46 +02:00
Tim Alby	d3b2a2650f	add/remove affiliations when adding/removing emails	2018-06-25 13:45:46 +02:00
Shane Kilkelly	04be842b30	Fix validation of project-output-file, no build_id for imported v1 projects	2018-06-25 12:27:56 +01:00
Tim Alby	b65ba388ba	replace OldAssetProxy	2018-06-25 12:36:51 +02:00
Shane Kilkelly	f6424ada40	Merge pull request #655 from sharelatex/sk-linked-files-output-redux ... Linked files from project output	2018-06-25 10:28:29 +01:00
James Allen	0a2fe7e941	Merge pull request #687 from sharelatex/ja-fix-subscription-upsell ... Fix check for hasSubscription	2018-06-22 15:59:51 +01:00
James Allen	0edd2b5fe7	Fix check for hasSubscription	2018-06-22 14:10:20 +01:00
Shane Kilkelly	d76c6c2c22	Merge pull request #682 from sharelatex/sk-copy-linked-file-data-on-clone ... Copy linkedFileData when cloning a project	2018-06-22 13:22:45 +01:00
Shane Kilkelly	a8222f2e31	Fix tests after sync with master	2018-06-22 13:20:13 +01:00
Shane Kilkelly	ebe828aa62	Refactor, and remove the source_project_display_name prop from linkedFileData	2018-06-22 13:09:18 +01:00
Shane Kilkelly	6058f3ef9b	Refactor the LinkedFiles/Agent system, and track build_id for output files	2018-06-22 13:09:18 +01:00
Shane Kilkelly	2ade78783b	Add acceptance test for refreshing output file from v1 project	2018-06-22 13:09:18 +01:00
Shane Kilkelly	28257462ae	Acceptance tests for project-output-file	2018-06-22 13:09:18 +01:00
Shane Kilkelly	fadbd72837	Add unit test for copying project with linked files	2018-06-22 10:52:49 +01:00
Alberto Fernández-Capel	d36dbfda07	Merge pull request #665 from sharelatex/afc-import-team-invites ... Add method to import invites	2018-06-22 09:55:19 +01:00
Timothée Alby	caee25d85d	Revert "Replace OldAssetsProxy"	2018-06-21 15:52:20 +02:00
Timothée Alby	c30cdf955b	Merge pull request #666 from sharelatex/ta-smart-proxy ... Replace OldAssetsProxy	2018-06-21 14:35:16 +02:00
James Allen	de45c08585	Restrict token look ups by id to not conflict with other tests	2018-06-21 11:00:25 +01:00
James Allen	46fbf0c641	Merge pull request #672 from sharelatex/ja-refactor-email-templating ... Refactor email templating	2018-06-21 10:28:26 +01:00
James Allen	4608a59e3d	Store OneTimeTokens in mongo rather than redis	2018-06-21 10:22:08 +01:00
James Allen	0dcbc5facb	Send out confirmation emails on register and record confirmedAt date	2018-06-21 10:21:15 +01:00
Henry Oswald	5a7b8f4887	fix broken test for compile controller	2018-06-20 13:44:07 +01:00
Alasdair Smith	6c1994e25b	Stub errors in tests to cache	2018-06-20 11:19:23 +01:00
Henry Oswald	e60157094b	improve logging for 2 compile backends	2018-06-20 11:07:34 +01:00
Tim Alby	bbed5fca9a	simplify proxy	2018-06-20 10:58:19 +02:00
Henry Oswald	b5581c4d40	Merge branch 'master' into ho-clsi-double-backend	2018-06-19 14:55:18 +01:00
Henry Oswald	ab0f258c03	don't make request to google cloud clsi if there is no url	2018-06-19 14:22:34 +01:00
Michael Mazour	0246631443	Add public API endpoints to reach CLSIs ... - `/api/clsi/compile/:submission_id` - `/api/clsi/compile/:submission_id/build/:build_id/output/:file` Also per review: - DRY up ClsiManager.sendRequestOnce and ClsiManager.sendExternalRequest - Include submission_id in a log message - Don't include timeout in limits when getting file	2018-06-19 12:04:02 +01:00
Tim Alby	3d272ca297	replace OldAssetProxy	2018-06-18 18:37:58 +02:00
Alberto Fernández Capel	81c102b501	Add method to import invites	2018-06-18 14:48:27 +01:00
Henry Oswald	5f8985811d	mvp to send requests to 2 backends	2018-06-14 17:41:30 +01:00
Timothée Alby	55112dc7dc	Merge pull request #648 from sharelatex/hb-export-status ... Export status endpoint	2018-06-14 13:59:11 +02:00
Timothée Alby	984d81f5b8	Merge pull request #649 from sharelatex/ta-emails-endpoints ... Add Emails Endpoints	2018-06-14 13:59:00 +02:00
hugh-obrien	0321780eba	adding tests for exports status checker	2018-06-14 09:44:05 +01:00
James Allen	c60b74a2b1	Merge pull request #652 from sharelatex/ja-fix-front-end-test ... Fix frontend HistoryV2ManagerTests	2018-06-14 09:11:32 +01:00
James Allen	82c6d9b293	Merge pull request #629 from sharelatex/ja-display-subscriptions ... Link subscriptions to v1	2018-06-13 13:55:57 +01:00
Shane Kilkelly	3baf0836bc	Support project-linked-files originating from imported v1 projects	2018-06-13 10:02:54 +01:00
James Allen	6e2ec2f982	Update remaining unit tests	2018-06-12 13:52:47 +01:00
James Allen	28f51cd4b4	Update SubscriptionController unit tests	2018-06-12 13:52:47 +01:00
James Allen	606419476f	Update LimitationsManager unit tests	2018-06-12 13:52:47 +01:00
James Allen	f7532e5854	Merge pull request #619 from sharelatex/afc-email-tokens ... Use emails with tokens for team invites	2018-06-12 08:30:23 +01:00
James Allen	d4efdb3ede	Fix frontend HistoryV2ManagerTests	2018-06-11 15:47:23 +01:00
James Allen	155102df64	Use Error classes, and ensure invited_emails is cleared on new invite	2018-06-11 14:20:35 +01:00
Tim Alby	97c145433e	use EmailHelper.parseEmail on registration ... Also changed EmailHelper to use the regexp already used in UserRegistrationHandler rather than the `mimelib` package as it is deprecated.	2018-06-11 12:31:18 +02:00
Tim Alby	e614ed9248	add emails endpoints	2018-06-11 10:35:23 +02:00
Tim Alby	5438a565b9	use multiple emails when relevant	2018-06-08 17:53:45 +02:00
Tim Alby	31827ae6b5	add emails attribute on user creation	2018-06-08 17:53:45 +02:00
Jessica Lawshe	d57660aeb5	Merge pull request #632 from sharelatex/jel-plans-pricing-fix ... Plans and Pricing fixes	2018-06-08 07:17:28 -05:00
Alberto Fernández Capel	59688efb56	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-08 12:21:17 +01:00
Alberto Fernández Capel	57775e60b1	Merge remote-tracking branch 'origin/master' into afc-update-user-references	2018-06-08 11:28:58 +01:00
Alberto Fernández Capel	c45b4463bb	Fix unit test	2018-06-08 10:05:26 +01:00
Alberto Fernández Capel	5159f6f33d	Check the subscription is in a group plan before adding new members	2018-06-08 09:58:51 +01:00
Timothée Alby	7cdcd725fd	Revert "Use Multiple Emails"	2018-06-07 18:44:59 +02:00
Jessica Lawshe	484ee9ad61	Should not AB test when signed up before 2018-06-06	2018-06-07 10:30:21 -05:00
Alberto Fernández Capel	a3bb99d755	Honour invited_emails for the team being ... We'll remove them soon, but we want to keep them for a while so recent invites can join their teams.	2018-06-07 16:22:38 +01:00
Alberto Fernández Capel	670f24ef6f	Simplify method name	2018-06-07 16:12:02 +01:00
Hugh O'Brien	6f5c777163	Merge pull request #622 from sharelatex/hb-take-emis-names-as-input ... Take user entered first and last names for EMIS	2018-06-07 15:52:33 +01:00
Timothée Alby	f422b7242d	Merge pull request #603 from sharelatex/ta-use-multi-emails ... Use Multiple Emails	2018-06-07 15:40:43 +02:00
James Allen	c2ef93b212	Merge pull request #610 from sharelatex/ja-sync-from-v2 ... Tell v1 when refreshing features in v2	2018-06-07 13:30:34 +01:00
Alberto Fernández Capel	959db80177	Check all emails to prevent invite duplicates	2018-06-07 12:49:46 +01:00
Alberto Fernández Capel	566c41cafd	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-07 11:40:03 +01:00
Alberto Fernández Capel	1fc047d08e	Fix invitation resend	2018-06-06 17:11:25 +01:00
Alberto Fernández Capel	553878064b	Resend email if the user has already been invited	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	e753ef3af5	Invite users in the invited_emails array ... We'll remove that attribute soon, but for the time being we want users to still be able to join the team.	2018-06-06 15:36:53 +01:00
Tim Alby	7726314e7c	add test to explicitely check filter	2018-06-06 15:45:12 +02:00
Tim Alby	e4da748257	add filter to query on emails attribute	2018-06-06 14:52:09 +02:00
Tim Alby	813289f5de	use multiple emails when relevant	2018-06-06 11:45:01 +02:00
Tim Alby	c5530163f5	add emails attribute on user creation	2018-06-06 11:45:01 +02:00
Alberto Fernández Capel	6fb6119ca8	Merge remote-tracking branch 'origin' into afc-email-tokens	2018-06-05 15:42:17 +01:00
Tim Alby	613c9193e3	implement multi emails logic	2018-06-05 16:42:12 +02:00
Jessica Lawshe	b63384cbf1	Merge pull request #537 from sharelatex/jel-pricing-plans ... Plans and pricing variant	2018-06-05 09:30:43 -05:00
Hayden Faulds	0bb37d4991	move tk call to before sandboxed module call	2018-06-05 13:42:26 +01:00
Jessica Lawshe	8b672dea0d	Add unit tests	2018-06-04 14:42:26 -05:00
hugh-obrien	54ce196500	test custom first and last name for exports	2018-06-04 13:16:21 +01:00
hugh-obrien	b02eea1e7e	update tests for exports name options	2018-06-04 13:16:21 +01:00
Alberto Fernández Capel	58c4e72b2a	Update references to UserLocator ... UserLocator was refactored in another branch: UserLocator -> UserGetter	2018-06-01 16:53:16 +01:00
Alberto Fernández Capel	25d7196570	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-01 16:49:47 +01:00
Alberto Fernández Capel	7fcdf68296	Remove dead code	2018-06-01 16:05:44 +01:00
Alberto Fernández Capel	3bd18715db	Add some tests	2018-06-01 15:37:09 +01:00
Hugh O'Brien	a79c9b94a8	Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web ... Extract v1 templates code to web	2018-06-01 11:29:36 +01:00
Alberto Fernández Capel	9b18e58b68	Choose a better method name ... This method is now only notifying users about a potential domain licence	2018-06-01 11:28:06 +01:00
Alberto Fernández Capel	385fec1914	Clean up code that uses invited_emails	2018-06-01 11:23:25 +01:00
hugh-obrien	d47e845367	add v1 template tests	2018-05-31 13:26:54 +01:00
Shane Kilkelly	d3ae276091	Merge pull request #579 from sharelatex/sk-linked-files-from-project ... Linked Files from Project	2018-05-31 11:08:08 +01:00
James Allen	c5b553d4a6	Notify v1 by default	2018-05-29 17:31:15 +01:00
James Allen	301ae80f99	Allow refreshFeatures to notify v1 to update its features	2018-05-29 17:21:42 +01:00
Alberto Fernández Capel	b52fbdbfa4	Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups	2018-05-29 15:37:04 +01:00
Shane Kilkelly	14898acd7f	Update linked-file acceptance tests	2018-05-29 10:40:38 +01:00
Tim Alby	5fbe5c5537	remove UserLocator ... Use UserGetter instead	2018-05-28 14:11:13 +02:00
Tim Alby	bbaca91e57	add UserGetter#getUserByMainEmail ... Use only that method to find users by email.	2018-05-28 14:11:09 +02:00
Tim Alby	5a590aa021	remove getUserOrCreateHoldingAccount function ... The function is deprecated	2018-05-28 14:09:13 +02:00
Shane Kilkelly	0cb5beb689	Merge branch 'master' into sk-linked-files-from-project	2018-05-24 13:47:28 +01:00
Alasdair Smith	81fdca91c1	Fix failing test	2018-05-24 10:27:36 +01:00
Shane Kilkelly	3181f624a7	Remove obsolete auth check	2018-05-24 10:22:17 +01:00
Shane Kilkelly	78f87c0ecf	Add acceptance test for the project-list and project-entities endpoints	2018-05-23 15:02:45 +01:00
Shane Kilkelly	4daf062be9	Add unit test for ProjectController.projectEntitiesJson	2018-05-22 16:40:39 +01:00
Shane Kilkelly	b1c1cdecef	Add unit test for ProjectController.userProjectsJson	2018-05-22 16:17:59 +01:00
Shane Kilkelly	bc5769cd73	Stub out the ProjectEntityHandler in ProjectController tests	2018-05-22 15:56:01 +01:00
Shane Kilkelly	691eec48ba	Merge branch 'master' into sk-linked-files-from-project	2018-05-22 15:39:09 +01:00
Shane Kilkelly	e34131ed45	Add acceptance test for project linked files	2018-05-22 15:01:51 +01:00
James Allen	701a803da7	Fix ProjectInvite tests since the user no longer had the features	2018-05-22 10:19:47 +01:00
James Allen	1d0be569a6	Fix SubscriptionUpdater -> FeaturesUpdater miscall	2018-05-22 10:05:08 +01:00
James Allen	50bd60dd51	Split FeaturesUpdater out of SubscriptionUpdater	2018-05-22 10:05:08 +01:00
James Allen	0830c473ad	Update unit tests and refactor to make more testable	2018-05-22 10:05:08 +01:00
James Allen	b1f378208d	Properly merge subscriptions from different places	2018-05-22 10:05:08 +01:00
Alasdair Smith	5b3fbe47db	Merge pull request #528 from sharelatex/as-cm-spelling ... Rich text spelling	2018-05-21 11:50:30 +01:00
Hugh O'Brien	346f37011f	Merge pull request #546 from sharelatex/ns-allow-latexmkrc ... Allow for latexmkrc files in project zip upload	2018-05-21 09:03:40 +01:00
Alasdair Smith	681e67ecea	Be more consistent with naming	2018-05-18 11:29:27 +01:00
Alasdair Smith	9c56f6c2fc	Add init test for SpellCheckManager	2018-05-18 11:29:27 +01:00
Michael Mazour	3922b8b916	Add project export acceptance tests ... - Add acceptance tests - Add `MockV1Api` helper - Add flush endpoint to `MockProjectHistoryApi` helper	2018-05-16 14:58:34 +01:00
Michael Mazour	e34dd90a1f	Add project export route and controller	2018-05-16 14:58:34 +01:00
Michael Mazour	a661084485	Add ExportsHander for project exports performed via v1	2018-05-16 14:58:34 +01:00
Shane Kilkelly	06c0b45ef7	Merge branch 'master' into sk-fix-references-full-index	2018-05-14 13:45:12 +01:00
Shane Kilkelly	43d00a2e5f	Account for the new referencesSearch flag when deciding to do fullIndex	2018-05-14 11:31:59 +01:00
Nate Stemen	d108b11bc0	Add latexmkrc in FileTypeManager	2018-05-10 16:59:58 -04:00
Hayden Faulds	9ccdf073c4	accept attributes rather than projectHistoryId to ProjectCreationHandler	2018-05-10 11:39:23 +01:00
Brian Gough	1278e2da45	fix project structure version when deleting folder	2018-05-08 13:37:33 +01:00
Brian Gough	afd4a10a19	retry lock with exponential backoff	2018-05-04 15:02:36 +01:00
Brian Gough	e414100c41	add support for unique lock values	2018-05-04 13:22:33 +01:00
James Allen	40da785363	Fix test for sampling front users	2018-05-01 09:02:43 +01:00
James Allen	6399621d1f	Show front widget for paid and sampled free users	2018-04-30 17:13:57 +01:00
Jessica Lawshe	820f9c7acc	Merge pull request #506 from sharelatex/as-document-event-emitter ... Add documentation and tests of EventEmitter implementation	2018-04-23 11:33:40 -05:00
Alasdair Smith	152c816b5c	Add documentation and tests of EventEmitter implementation	2018-04-23 11:01:19 +01:00
Alasdair Smith	ad1df3532f	Merge pull request #490 from sharelatex/hof-deleted-project-history ... Pass project history id with updates	2018-04-23 10:05:07 +01:00
Alasdair Smith	61648e1f19	Merge pull request #497 from sharelatex/as-naming-consistency ... Include snake_case named file in frontend tests	2018-04-23 10:03:54 +01:00
Alasdair Smith	d524249fc8	Include snake_case named tests	2018-04-17 15:03:52 +01:00
James Allen	37f009c3cd	Remove blank test causing race condition	2018-04-17 10:00:06 +01:00
James Allen	d6605610f5	Fix HistoryV2Manager front end tests	2018-04-16 16:31:49 +01:00
James Allen	d1b68ddf7c	Fix RestoreManager unit tests	2018-04-16 16:27:24 +01:00
James Allen	9e525702c1	Merge branch 'master' into ja-restore-files	2018-04-16 16:14:31 +01:00
Hayden Faulds	7755a7cc1f	add overleaf to projections for project structure updates	2018-04-13 13:45:07 +01:00
Hayden Faulds	3006d018d9	send projectHistoryId with project structure updates	2018-04-13 13:45:03 +01:00
Hayden Faulds	e5f3c472e3	return projectHistoryId in DocumentController.getDoc	2018-04-13 13:45:02 +01:00
Alberto Fernández Capel	1b8f4bff2f	Ensure dump folder exists before running LinkedFiles tests ... The folder is also created in another test, so it will work the second time the tests are executed, but it fails the first time.	2018-04-12 10:29:24 -05:00
Hayden Faulds	50686090c8	push doc pathname logic into DocController	2018-04-12 16:16:44 +01:00
Brian Gough	882b555433	create new file on replace	2018-04-09 12:05:08 +01:00
Brian Gough	baec4eb195	move uploads outside the lock	2018-04-09 12:05:07 +01:00
James Allen	2c0bd94fa7	Use mkdirp when restoring a file if the folder doesn't exist	2018-04-06 15:20:51 +01:00
James Allen	1e8439a2c6	Fix restore of docs from old deleted docs	2018-04-06 10:30:13 +01:00
James Allen	b4fa47d664	Add unit tests for RestoreManager	2018-04-06 10:30:13 +01:00
James Allen	0a1c543841	Hook up front end to restore documents	2018-04-06 10:30:13 +01:00
James Allen	3832850be6	Implement restore end point with acceptance tests	2018-04-06 10:30:13 +01:00
James Allen	beee86f1ce	First pass at restore end point	2018-04-06 10:30:13 +01:00
Alasdair Smith	e9de83789a	Rename tests to match their purpose better	2018-03-23 12:37:47 +00:00
Alasdair Smith	4ad0416f24	Extract cmEditor tests to RT module	2018-03-23 12:37:47 +00:00
Alasdair Smith	74099440f3	Generate webpack entry points including modules	2018-03-23 12:37:16 +00:00
Hayden Faulds	57de597e60	404 when resyncing deleting projects	2018-03-16 15:26:19 +00:00
Hayden Faulds	d22d8324af	disable history resync when project-history is not enabled	2018-03-15 16:57:39 +00:00
James Allen	371caa41ca	Merge pull request #378 from sharelatex/hof-history-resync ... resync project history endpoint	2018-03-13 13:33:08 +00:00
Shane Kilkelly	2ceb7daa97	Merge pull request #361 from sharelatex/ta-record-new-project-event ... Record New Project Event	2018-03-12 13:11:20 +00:00
Shane Kilkelly	9dc8600588	Add a unit test for the analytics events sent from project-creation	2018-03-12 10:50:15 +00:00
Hayden Faulds	75f5fbcdbf	refactor DocumentUpdaterHandler	2018-03-09 11:15:18 +00:00
Hayden Faulds	5b2e7d981a	resyncProject -> resyncProjectHistory	2018-03-09 11:11:06 +00:00
Hayden Faulds	50fdfec6e8	add unit tests for project history resync	2018-03-09 11:11:06 +00:00
Alasdair Smith	9ed4f121b1	Append fixture el to actual DOM	2018-03-07 09:51:54 +00:00
Tim Alby	4b291fab2a	Record new project event	2018-03-06 18:13:24 -05:00
Shane Kilkelly	84fff5e9b7	Merge pull request #379 from sharelatex/sk-geolocate-user-sessions ... Geolocate user, and pass country-code to editing-sessions	2018-03-06 11:33:50 +00:00
Shane Kilkelly	feee992b43	Reverse an un-necessary re-arrangement of tests	2018-03-06 10:13:39 +00:00
Alasdair Smith	6d9a7e90f5	Add simple fixtures support	2018-03-06 10:11:04 +00:00
Shane Kilkelly	b3f47ea44a	Remove obsolete segmentation payload in editing-session request	2018-03-05 11:15:41 +00:00
Shane Kilkelly	f625b22ec5	Move the geolocation out of login, to the editingSession action	2018-03-05 10:46:51 +00:00
James Allen	a99f55891f	Use external proxy	2018-03-05 10:37:53 +00:00
James Allen	cae09028ff	Fix tests	2018-03-05 10:37:53 +00:00
James Allen	01d84bd983	Handle error cases when downloading URL	2018-03-05 10:37:00 +00:00
James Allen	85f25b810c	First pass at URL based linked files	2018-03-05 10:37:00 +00:00
Brian Gough	3bbd49c7eb	Merge pull request #377 from sharelatex/bg-add-project-structure-version-number ... add project structure version number	2018-03-05 08:41:14 +00:00
Shane Kilkelly	1629f68d5e	Geolocate user on login, and pass country-code to editing-sessions	2018-03-02 12:02:45 +00:00
Alasdair Smith	68d85f03c2	Clean up frontend stub	2018-03-02 10:41:58 +00:00
Brian Gough	af494dedf2	check project structure version in unit tests	2018-03-01 12:32:09 +00:00
Brian Gough	e6020e2e9b	update acceptance tests to include project structure version ... this tests the version sent to the docupdater	2018-03-01 12:32:09 +00:00
Brian Gough	389f2d64ef	prepare tests for versioning	2018-03-01 12:32:09 +00:00
Brian Gough	792c0135a0	update acceptance tests helper to include version	2018-03-01 12:32:09 +00:00
Brian Gough	f7e70e8228	add acceptance tests	2018-03-01 12:32:09 +00:00
Brian Gough	67d784a74a	increment project version on every structure change	2018-03-01 12:32:08 +00:00
James Allen	becb76d69b	Don't allow backslashes in file names	2018-03-01 11:42:44 +00:00
Alasdair Smith	1f450085e9	Fix mocha complaining about returning Promise-like object	2018-02-27 15:57:40 +00:00
Alasdair Smith	f11f208772	Revert "Revert "Upgrade to mocha 5.0.1""	2018-02-27 15:03:21 +00:00
Alasdair Smith	315587605c	Revert "Upgrade to mocha 5.0.1"	2018-02-27 12:25:42 +00:00
Alasdair Smith	2a2eb23c78	Fix bug where tests from new ES code being included in requirejs wrapped code	2018-02-26 16:56:04 +00:00
Alasdair Smith	19cec9451d	Switch to using scoped variable instead of variables on context ... Changes to mocha mean that a new context is passed to each describe block instead of it persisting between them. This means that this test cannot be parallelised, however this was the case beforehand (subsequent tests are dependent on earlier tests).	2018-02-26 15:31:41 +00:00
Alasdair Smith	3217a3fbf0	Fix mocha complaining about returning Promise-like object	2018-02-26 15:31:34 +00:00
Alasdair Smith	46ac74a160	Fix incorrectly scoped variable	2018-02-26 14:26:04 +00:00
Alasdair Smith	2247e4d465	Fix scoping issues where stubs were defined in wrong describe blocks	2018-02-26 14:21:14 +00:00
Alasdair Smith	abf53625fe	Fix scope not being applied through callback	2018-02-26 14:02:08 +00:00
Alasdair Smith	136fd84810	Fix module stub in incorrect scope	2018-02-26 13:52:58 +00:00
Alasdair Smith	be6fa346d5	Fix bug where incorrect variable was used	2018-02-26 13:37:17 +00:00
Alasdair Smith	ec7237b7e8	Fix callback stub being defined in wrong scope	2018-02-26 12:33:48 +00:00
Alasdair Smith	2529ed756a	Fix callback being defined in wrong describe block	2018-02-26 12:27:54 +00:00
Alasdair Smith	fd8c61985f	Fix bug where stubs were attached to undefined variables	2018-02-26 12:19:56 +00:00
Alasdair Smith	5d017beac5	Fix stub incorrectly overriding top level beforeEach	2018-02-26 11:46:06 +00:00
Alasdair Smith	cfc9dbdbb3	Fix bad scoping of user agent	2018-02-26 11:34:08 +00:00
Alasdair Smith	34b53726d4	Fix error not being defined in wrong describe block	2018-02-26 11:19:52 +00:00
Alasdair Smith	192eb8b44f	Fix error not being defined in wrong describe block	2018-02-26 11:16:04 +00:00
Alasdair Smith	d79e226a20	Fix callback defined in wrong describe block scope	2018-02-26 10:58:20 +00:00
Alasdair Smith	29410b7aab	Fix applyAsync from not evaluating expression in tests ... See https://github.com/angular/angular.js/issues/10788#issuecomment-70376834 which explains that applyAsync is scheduled to evaluate in the next tick, but this is managed by $browser. Therefore we can manually flush the trigger	2018-02-22 13:28:16 +00:00
Alasdair Smith	791c126df6	Fix test to match implementation	2018-02-22 12:09:51 +00:00
Alasdair Smith	eae8b5a592	Merge pull request #330 from sharelatex/as-karma-tests ... Karma tests	2018-02-22 11:06:56 +00:00
Hayden Faulds	adc90b68e7	use gauge not inc	2018-02-21 13:25:25 +00:00
Alasdair Smith	00f1450b94	Rename test files to match source directory and name	2018-02-20 14:01:50 +00:00
Alasdair Smith	c7957b8ad4	Convert existing frontend tests to run in karma	2018-02-20 14:01:50 +00:00
Alasdair Smith	3faa0556e8	Add test for cmEditor directive	2018-02-20 14:01:50 +00:00
Alasdair Smith	89c9475d29	Configure karma to load angular, requirejs and test/source files ... Use test-main.js file to configure requirejs so that AMD loader can be used	2018-02-20 14:01:02 +00:00
Alasdair Smith	0b77e97df2	Added angular mocks for testing and stub out globals	2018-02-20 14:01:02 +00:00
Hayden Faulds	d924dbd1ed	improve metrics	2018-02-20 13:58:09 +00:00
Hayden Faulds	e50c3837bc	add extra metrics around locking	2018-02-19 12:15:02 +00:00
Hayden Faulds	23c7ab0529	add locking tests	2018-02-16 16:57:12 +00:00
Hayden Faulds	dd582d1b2e	type-check ProjectGetter.getProject and getProjectWithoutLock arguments	2018-02-16 14:44:21 +00:00
Hayden Faulds	693c8e8c60	move where lock keys are defined	2018-02-16 14:44:21 +00:00
Hayden Faulds	66cd5cd24b	use ProjectGetter.getProject in other ProjectGetter methods	2018-02-16 14:44:21 +00:00
Hayden Faulds	95b82a3c9d	use ProjectGetter in ProjectLocator.findElementByPath	2018-02-16 14:44:21 +00:00
Hayden Faulds	cbc6fb232d	add mongo transaction lock when getting or updating projects	2018-02-16 14:44:21 +00:00
Brian Gough	fc1e94b14a	Merge pull request #343 from sharelatex/bg-block-javascript-property-names ... block javascript property names being used as file names	2018-02-16 14:07:12 +00:00
Hayden Faulds	eb198cd8c3	make getSafePathname a method in CompileController rather than Project	2018-02-16 13:10:48 +00:00
Brian Gough	8a10e98b56	block javascript property names being used as file names	2018-02-16 10:31:47 +00:00
Hayden Faulds	304a6bc332	use ProjectGetter rather than Project directly	2018-02-16 08:55:09 +00:00
Hayden Faulds	aa89b7e70b	Merge pull request #327 from sharelatex/hof-entity-refactoring ... Refactor ProjectEntityHandler	2018-02-14 13:28:41 +00:00
Hayden Faulds	e9b218fe5f	allow the updating of doc lines for deleted docs	2018-02-13 14:39:38 +00:00
Shane Kilkelly	9c83ff5353	Merge pull request #316 from sharelatex/afc-fix-typo-in-path ... Update analytics manager to use new path	2018-02-13 09:39:09 +00:00
Hayden Faulds	458bbc7cfd	refactor ProjectEntityHandler ... - moves project locking into ProjectEntityHandler - splits ProjectEntityHandler into ProjectEntityHandler, ProjectEntityUpdateHandler and ProjectEntityMongoUpdateHandler - adds upsertDoc/upsertFile and upsertDocWithPath/upsertFileWithPath to EditorController and ProjectEntiyUpdateHandler	2018-02-12 13:33:59 +00:00
Brian Gough	ecea3dd1be	add an extra test for invalid element names	2018-02-09 15:13:58 +00:00
Brian Gough	2c2b6e5f36	fix filename length check	2018-02-09 15:05:52 +00:00
Brian Gough	cba4a391a9	Merge pull request #314 from sharelatex/bg-validate-filenames-server ... server side check for valid filenames	2018-02-08 09:16:31 +00:00
Brian Gough	c6f74d24f1	add missing SafePath.clean function	2018-02-07 15:21:04 +00:00
Alberto Fernández Capel	413e81f29a	Update analytics manager to use new path ... It fixes a typo in the path. Related to https://github.com/sharelatex/analytics-sharelatex/pull/43	2018-02-07 09:39:00 +00:00
Brian Gough	7f727d434e	server side check for valid filenames	2018-02-06 10:44:58 +00:00
Michael Walker	5987d6d79c	Add unit tests for failing history API	2018-02-02 10:12:57 +00:00
Michael Walker	217940d76f	Fix failing unit tests	2018-02-02 10:12:57 +00:00
Hayden Faulds	9955fd570c	Merge pull request #299 from sharelatex/hof-tpds-locking ... Project Locking: TPDS locking	2018-02-02 09:20:07 +00:00
Shane Kilkelly	19c97cb15b	Merge pull request #289 from sharelatex/afc-track-edit-sessions ... Send editing session heartbeat to the analytics service	2018-02-01 12:31:38 +00:00
Hayden Faulds	a9be50ebcd	stream request to file outside of project lock	2018-02-01 10:44:53 +00:00
Hayden Faulds	9496480a29	test project lock is taken	2018-02-01 10:44:53 +00:00
Hayden Faulds	22737e8bd6	group together tests	2018-02-01 10:44:53 +00:00
Hayden Faulds	a6666bee62	group together private in UpdateMerger tests	2018-02-01 10:44:53 +00:00
Hayden Faulds	44d4a1dbe2	replace mocks with stubs in UpdateMerger tests	2018-02-01 10:44:52 +00:00
Hayden Faulds	e214347ede	add locking around project structure updates in TPDS	2018-02-01 10:44:52 +00:00
Brian Gough	b7b40faefe	fix unit test	2018-01-31 13:28:11 +00:00
Brian Gough	c19acd82a4	Merge pull request #291 from sharelatex/bg-fix-project-get-exclusion ... fix typo in project getter exclusions	2018-01-31 11:51:01 +00:00
Brian Gough	5e52ade1ff	Merge pull request #286 from sharelatex/bg-prevent-duplicate-filenames ... prevent duplicate filenames	2018-01-31 11:50:45 +00:00
Brian Gough	21c1ea6687	remove comment in test	2018-01-31 10:26:06 +00:00
Brian Gough	2f52e6c4b4	remove comments	2018-01-29 10:38:25 +00:00
Brian Gough	cd2688a740	added tests for rename/move	2018-01-26 17:00:33 +00:00
Brian Gough	69bed6dbb2	fix MockFileStoreApi to record uploaded files	2018-01-25 17:09:31 +00:00
Brian Gough	68ac597a93	initial acceptance tests	2018-01-25 17:09:31 +00:00
Brian Gough	ea9976994a	update unit tests for duplicate checks	2018-01-25 17:09:31 +00:00
James Allen	626f652c77	Update User acceptance test helper to expose methods for modules	2018-01-24 16:56:31 +00:00
Brian Gough	77adb60a8a	fix typo in project getter exclusions	2018-01-24 10:06:53 +00:00
Alberto Fernández Capel	8dbb89c09e	Add test for the updateEditingSession endpoint	2018-01-23 10:29:11 +00:00
James Allen	d79d6b4ede	Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents	2018-01-22 16:25:11 +00:00
James Allen	6d04eeaa03	Merge pull request #256 from sharelatex/ja-display-v2-history-users ... Inject v2 user details into project-history updates and diffs	2018-01-15 14:21:14 +00:00
Hayden Faulds	e781779c24	use LockManager.runWithLock in EditorController	2018-01-12 10:53:36 +00:00
Hayden Faulds	76c7dff33a	rename EditorController.replaceFile -> replaceFileWithoutLock	2018-01-12 10:06:18 +00:00
Hayden Faulds	a8818a4149	add locking for EditorController.renameEntity	2018-01-12 10:06:18 +00:00
Alberto Fernández-Capel	4dce9e36c3	Merge pull request #251 from sharelatex/fix-group-member-subscription-page ... Fix subscription page for members of a group	2018-01-11 14:41:31 +00:00
Alberto Fernández-Capel	feaa7c6d3f	Merge pull request #242 from sharelatex/rename-entity-bugfix ... Ensure the dirname is not affected when we rename an entity	2018-01-11 14:41:21 +00:00
James Allen	17a5dfa5a5	Inject v2 user details into project-history updates and diffs	2018-01-11 11:32:16 +00:00
James Allen	945ef25ef5	Merge pull request #244 from sharelatex/hof-lock-file-upload ... Project Locking: ProjectUploadController	2018-01-11 08:42:36 +00:00
Timothée Alby	859e03cd4f	Merge pull request #234 from sharelatex/hof-remove-unused-method ... remove unused EditorController.getListOfDocPaths	2018-01-10 15:26:02 +02:00
Alberto Fernández Capel	0200fd66cd	Mock LimitationsManager as well	2018-01-10 10:26:16 +00:00
Alberto Fernández Capel	a81b56556f	Add test for SubscriptionViewModelBuilder	2018-01-09 17:00:56 +00:00
Hayden Faulds	817840840a	use LockManger.runWithLock	2018-01-09 16:37:34 +00:00
James Allen	bbfcff30fb	Enable project history for new projects if enabled in settings	2018-01-03 16:55:33 +00:00
James Allen	ada76e820a	Merge pull request #238 from sharelatex/as-ol-emails ... v2 themed emails	2018-01-03 11:30:28 +00:00
James Allen	2dcc17ad09	Merge pull request #235 from sharelatex/ja-show-deleted-files-in-v2-history ... Handle deleted and renamed files better in v2 history UI; Fixes #226	2018-01-03 11:29:59 +00:00
Hayden Faulds	fe62db05a0	lock project when uploading a file	2018-01-02 12:43:41 +00:00
Alberto Fernández Capel	bf324b5e04	Ensure the dirname is not affected when we rename an entity ... Fixes https://github.com/sharelatex/web-sharelatex-internal/issues/93	2017-12-22 14:24:00 +00:00
Alasdair Smith	562534034f	Stub out brandPrefix for email tests	2017-12-21 17:18:10 +00:00
James Allen	d0fee7e76c	Show a file tree of changed paths, so we can work with renamed and deleted files	2017-12-20 16:22:32 +00:00
Hayden Faulds	8663dba37c	remove unused EditorController.getListOfDocPaths	2017-12-20 15:14:56 +00:00
Shane Kilkelly	18ae27fd66	Merge branch 'sk-account-sync'	2017-12-20 14:02:45 +00:00
James Allen	339b7ec14f	Merge branch 'ja-allow-importing-without-history'	2017-12-19 15:06:17 +00:00
James Allen	1d89a535a1	Merge pull request #208 from sharelatex/ja-front-end-history ... Add in web front end that supports v2 history; Fixes #168	2017-12-19 15:00:34 +00:00
James Allen	5463b608ad	Add add{File|Doc}WithoutUpdatingHistory methods to allow importing OL projects with existing history	2017-12-19 13:59:06 +00:00
James Allen	ffa2e231fd	Fix up tests	2017-12-19 13:58:47 +00:00
James Allen	810b5e0e9a	Fix front end tests	2017-12-19 13:58:47 +00:00
James Allen	8a3fadbfc1	Style the edit/add/rename options	2017-12-19 13:58:47 +00:00
James Allen	50b12e88a2	Add HistoryV2Manager alongside existing HistoryManager	2017-12-19 13:58:47 +00:00
James Allen	8ea779af58	Add some front end tests for HistoryManager	2017-12-19 13:58:47 +00:00
Hayden Faulds	ac36de9629	make ProjectEntityHandler._clean* argument signatures consistent	2017-12-18 15:15:36 +00:00
Hayden Faulds	938caed4f7	set userId when deleting entities via the tpds	2017-12-18 15:15:36 +00:00
Hayden Faulds	ca15fdb6eb	pass userId to EditorHttpController.deleteEntity	2017-12-18 15:15:36 +00:00
Hayden Faulds	5f6686ed3b	pass userId to ProjectEntityHandler.deleteEntity	2017-12-18 15:15:36 +00:00
Hayden Faulds	2ac74b9adc	pass userId into _clean methods in ProjectEntityHandler	2017-12-18 15:15:36 +00:00
Hayden Faulds	99a52d48c8	acceptance test versioning entity deletions	2017-12-18 15:15:36 +00:00
Hayden Faulds	475e84b039	version entity deletions in ProjectEntityHandler	2017-12-18 15:15:36 +00:00
Hayden Faulds	81c061c6a7	acceptance test moving entities	2017-12-18 15:15:36 +00:00
Hayden Faulds	e5e75a8ccb	update DocumentUpdaterHandler.updateProjectStructure to support entity deletions	2017-12-18 15:15:36 +00:00
Shane Kilkelly	6fe937bcad	Finish unit tests for SubscriptionUpdater	2017-12-13 10:57:56 +00:00
Henry Oswald	3e2c997e8b	added stubs for nodemailer into unit tests	2017-12-11 11:40:25 +00:00
Shane Kilkelly	a1f1c25294	Merge branch 'master' into sk-account-sync	2017-12-07 11:51:41 +00:00
Shane Kilkelly	44c289d8dd	Fix unit tests for SubscriptionUpdater	2017-12-04 15:34:46 +00:00
Hayden Faulds	4094801f18	pass object to DocumentUpdater.updateProjectStructure instead of separate arrays	2017-12-04 09:42:10 +00:00
Hayden Faulds	19643f4bb5	pass user_id into editorController.addDoc in ThirdPartyDataStore/UpdateMerger	2017-12-04 09:42:10 +00:00
Hayden Faulds	497c6facd5	fix ProjectEntityHandler.replaceFile	2017-12-04 09:42:10 +00:00
Hayden Faulds	77eac423c7	add tpds project structure acceptance tests	2017-12-04 09:42:09 +00:00
Hayden Faulds	3466db0aae	add acceptance tests	2017-12-04 09:42:09 +00:00
Hayden Faulds	61a1336ec6	pass userId into ProjectEntiyHandler.copyFileFromExistingProjectWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	feee582368	pass user_id into EditorController.replaceFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	08891c7a7f	pass userId into ProjectEntityHandler.replaceFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	088ce33cbc	version ProjectEntityHandler.copyFileFromExistingProjectWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	60ee78704a	return url from FileStoreHandler.copyFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	4ec0d07aae	remove unused ProjectEntityHandler.copyFileFromExistingProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	90e3b71c1c	version replacing files	2017-12-04 09:42:09 +00:00
Hayden Faulds	980e43e478	pass user_id into EditorController.addDoc	2017-12-04 09:42:09 +00:00
Hayden Faulds	e4ca3bc5ad	pass user_id into EditorController.addDocWithoutLock	2017-12-04 09:42:09 +00:00
Hayden Faulds	7d63939f79	pass owner_id to ProjectEntityHandler.addDoc from ProjectDuplicator	2017-12-04 09:42:09 +00:00
Hayden Faulds	300f76bc5c	pass user_id into ProjectEntityHandler.addDoc / addDocWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	bfd22899a0	fix DocumentUpdaterHandler.updateProjectStructure	2017-12-04 09:42:09 +00:00
Hayden Faulds	ef68c6a531	avoid N+1 lookups in DocumentUpdaterHandler	2017-12-04 09:42:09 +00:00
Hayden Faulds	953dba0ede	pass userId into Editorcontroller.addFile / addFileWithoutLock	2017-12-04 09:42:09 +00:00
Hayden Faulds	42a1deaaca	pass userId into ProjectEntityHandler.addFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	c1481d596f	call DocumentUpdaterHandle.updateProjectStructure from ProjectEntityHandler.addDoc and addFile ... pass in user_id as null	2017-12-04 09:42:09 +00:00