3239 commits

Author	SHA1	Message	Date
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
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
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	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
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
Henry Oswald	aaa908187d	added layout.pug back in	2017-12-02 13:38:23 +00:00
Henry Oswald	c020e4e6bd	moment and fineuploader are loaded seperately in editor, not packaged up	2017-12-02 12:29:06 +00:00
Shane Kilkelly	3ee6f5d4be	Update fineuploader on project page	2017-12-01 11:27:06 +00:00
Shane Kilkelly	2ea3caf08b	Properly version the fineuploader library	2017-12-01 11:22:41 +00:00
Alasdair Smith	5b8c9b2f4c	Add aria role to warning	2017-12-01 11:00:13 +00:00
Alasdair Smith	7d58427485	Show warnings on project list for some V1 data	2017-11-30 16:59:13 +00:00
Alasdair Smith	52ad852814	Add check for OL host to prevent failure on legacy SL	2017-11-30 15:14:47 +00:00
Alasdair Smith	f232899f3f	Show warning symbol on second step	2017-11-30 10:16:15 +00:00
Alasdair Smith	6eae1d59ea	Use asyncForm directive to trigger import	2017-11-30 10:16:15 +00:00
Alasdair Smith	3aaf6559c8	Add image of v2 editor	2017-11-30 10:16:15 +00:00
Alasdair Smith	265e659999	Add multiple steps	2017-11-30 10:16:15 +00:00
Alasdair Smith	b68d6411ee	Basic styles for import modal	2017-11-30 10:16:15 +00:00