1639 commits

Author	SHA1	Message	Date
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	731cd57250	Make intermediate argument signature clearer	2017-12-19 13:59:06 +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	8311101ec0	Split project_history.enable in initializeHistoryForNewProjects and sendProjectStructureOps	2017-12-19 13:58:47 +00:00
James Allen	50b12e88a2	Add HistoryV2Manager alongside existing 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	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	56ec81bb3e	Change 'oveleafPlanCode' to 'v1PlanCode'	2017-12-18 13:52:37 +00:00
Alasdair Smith	4a9c9c563a	Merge branch 'master' into as-autocompile-rollout-60	2017-12-13 14:44:31 +00:00
Alasdair Smith	60b00d2b94	Merge pull request #196 from sharelatex/as-clean-up-failed-import ... Add unsupported file type error	2017-12-13 10:31:02 +00:00
Alasdair Smith	5c62ac4f8a	Change error type for consistency	2017-12-12 12:59:10 +00:00
James Allen	53dc8cddfc	Refactor captcha into middleware and angular service	2017-12-11 12:58:55 +00:00
James Allen	83086e4a79	Add recaptch to share endpoint	2017-12-11 11:57:59 +00:00
Henry Oswald	314dcd1901	added null checks to mandrill	2017-12-11 11:48:31 +00:00
Alasdair Smith	89bdb6eff9	Increase autocompile rollout to 60%	2017-12-11 11:45:53 +00:00
Henry Oswald	bd7e2d956d	add mandrill as email option	2017-12-11 11:05:04 +00:00
Shane Kilkelly	eefe56d0f7	Fix up error handling in SubscriptionUpdater	2017-12-08 11:37:24 +00:00
Alasdair Smith	6198491e5f	Add unsupported file type error	2017-12-08 11:31:44 +00:00
Shane Kilkelly	a675e774b8	Fix how the getOverleafPlanCode integration is done	2017-12-08 11:29:11 +00:00
Shane Kilkelly	3adbc52089	Add a method to explicitely refresh subscription feature	2017-12-07 16:28:07 +00:00
Shane Kilkelly	4e86a03b46	Fix a problem with the order of module initialization	2017-12-07 15:06:32 +00:00
Nate Stemen	d224e09b5e	Merge pull request #192 from sharelatex/ns-remove-labels ... removing labels service	2017-12-07 09:38:00 -05:00
Shane Kilkelly	a1f1c25294	Merge branch 'master' into sk-account-sync	2017-12-07 11:51:41 +00:00
Alasdair Smith	fa89b91ac6	Increase rollout to 40%	2017-12-06 09:58:38 +00:00
Nate Stemen	9bf5d1e14c	removing labels service	2017-12-05 13:57:36 -05:00
Alasdair Smith	ab6830976e	Merge branch 'master' into as-show-v1-warnings	2017-12-05 11:13:25 +00:00
Shane Kilkelly	e7d8848a6a	Include possible overleaf subscription in feature setting	2017-12-04 15:12:26 +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	9736513f59	fix ProjectEntityHandler.replaceFile	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