5427 commits

Author	SHA1	Message	Date
Henry Oswald	314dcd1901	added null checks to mandrill	2017-12-11 11:48:31 +00:00
Henry Oswald	3e2c997e8b	added stubs for nodemailer into unit tests	2017-12-11 11:40:25 +00:00
Henry Oswald	bd7e2d956d	add mandrill as email option	2017-12-11 11:05:04 +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
Paulo Jorge Reis	37a571283a	Merge pull request #194 from sharelatex/as-autocompile-rollout-40 ... Increase autocompile rollout to 40%	2017-12-06 11:22:40 +00:00
Paulo Jorge Reis	a5f99ccce3	Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling ... V2 editor styling	2017-12-06 11:22:28 +00:00
Paulo Reis	2ccf0750f2	Run SVGs through SVGOMG.	2017-12-06 11:21:02 +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	2d66fd7280	Merge pull request #169 from sharelatex/as-import-v1 ... V1 Import Modal	2017-12-05 13:19:49 +00:00
Alasdair Smith	ab6830976e	Merge branch 'master' into as-show-v1-warnings	2017-12-05 11:13:25 +00:00
Alasdair Smith	9f4aef76ea	Merge branch 'master' into as-import-v1	2017-12-05 10:43:07 +00:00
Paulo Reis	5dffdf3efc	Add a small a11y fix.	2017-12-05 10:23:28 +00:00
Paulo Reis	a88538c3fd	Make the back to projects button closer to current SL.	2017-12-05 10:20:25 +00:00
Paulo Reis	aab43f5916	Smaller line-height in the file tree.	2017-12-05 10:07:45 +00:00
James Allen	eb5ba2814e	Merge branch 'master' into as-import-v1	2017-12-04 10:41:07 +00:00
James Allen	9e0f5424d0	Merge branch 'master' into as-show-v1-warnings	2017-12-04 10:40:28 +00:00
James Allen	5da7d170a1	Merge branch 'master' into pr-ol-beta-editor-styling	2017-12-04 10:17:00 +00:00
James Allen	52b414498c	Merge branch 'master' into as-show-v1-warnings	2017-12-04 10:03:38 +00:00
James Allen	0602fed6e5	Merge branch 'master' into as-import-v1	2017-12-04 10:02:21 +00:00
James Allen	f21870aac2	Merge branch 'master' into pr-ol-beta-editor-styling	2017-12-04 10:01:27 +00:00
Hayden Faulds	4094801f18	pass object to DocumentUpdater.updateProjectStructure instead of separate arrays	2017-12-04 09:42:10 +00:00
Hayden Faulds	1405b645f3	fix acceptance tests after rebase	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	9736513f59	fix ProjectEntityHandler.replaceFile	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	62f88402e8	fix DocumentUpdaterHandler casing	2017-12-04 09:42:09 +00:00
Hayden Faulds	acda4c2295	remove inline requires from ProjectEntityHandler	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
Hayden Faulds	6e84c635cf	return url from FileStoreHandler.uploadFileFromDisk	2017-12-04 09:42:09 +00:00
Hayden Faulds	0178f78249	handle file additions in DocumentUpdaterHandler.updateProjectStructure	2017-12-04 09:42:09 +00:00
Hayden Faulds	28bcf83d87	better error when project creation fails	2017-12-04 09:25:22 +00:00
Hayden Faulds	eacb19fac9	create user in db and use login endpoint instead of register	2017-12-04 09:25:22 +00:00