3364 commits

Author	SHA1	Message	Date
James Allen	0f1b0be231	Merge pull request #236 from sharelatex/sk-fix-doc-updater-logging ... Change an erroneous `logger.error` to `logger.log`; Fixes #227	2018-01-03 11:30:46 +00:00
James Allen	7918232757	Merge pull request #240 from sharelatex/pr-v2-styling-fixes ... v2 styling fixes	2018-01-03 11:30:39 +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	882286afb1	Merge pull request #245 from sharelatex/as-autocompile-rollout-100 ... Increase autocompile rollout to 100%	2018-01-03 11:30:10 +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
Alasdair Smith	b2d92ea482	Increase autocompile rollout to 100%	2018-01-03 10:01:35 +00:00
Paulo Reis	0484b46027	Redundancy.	2017-12-21 13:52:34 +00:00
Paulo Reis	484d34e296	Only render announcements in SL.	2017-12-21 12:57:07 +00:00
Alasdair Smith	1be9e29f35	Switch from button to link to fit better	2017-12-21 11:10:23 +00:00
Alasdair Smith	fb23b30c45	Merge branch 'master' into as-update-v2-copy	2017-12-21 10:57:16 +00:00
Alasdair Smith	0114ed362f	Swap out email templates based on brand prefix	2017-12-21 10:26:14 +00:00
Alasdair Smith	1fc527ff48	Fix OL auto-linking styles	2017-12-21 09:59:19 +00:00
Shane Kilkelly	c76bdaa824	Change an erroneous logger.error to logger.log	2017-12-21 09:54:35 +00:00
Alasdair Smith	9657108146	Add OL themed email templates	2017-12-20 17:53:45 +00:00
Alasdair Smith	7f7916f5b1	Clean up whitespace	2017-12-20 17:52:49 +00:00
James Allen	e6281911f0	Add history-file-tree.pug	2017-12-20 16:42:23 +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
Paulo Reis	70b755603d	Fix empty project list card.	2017-12-20 16:03:12 +00:00
Paulo Reis	cf30cfd923	Create new style for links inside alerts; apply it to the reconnection alert.	2017-12-20 15:39:50 +00:00
Alasdair Smith	b1f656826e	Remove unnecessary & incorrect title	2017-12-20 14:10:05 +00:00
Shane Kilkelly	18ae27fd66	Merge branch 'sk-account-sync'	2017-12-20 14:02:45 +00:00
James Allen	c191ac2e8d	Show deleted files in v2 history	2017-12-20 13:59:17 +00:00
Henry Oswald	ec41f984e6	Merge branch 'ho-remove-groove'	2017-12-20 13:37:15 +00:00
Paulo Reis	0a0c6c6c0c	Merge branch 'master' into pr-style-v2-chatpane	2017-12-20 09:50:49 +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	0a4febfce6	Merge pull request #225 from sharelatex/ho-hash-on-minifiy-only ... only hash the static content when minified is on	2017-12-19 15:00:15 +00:00
James Allen	e18dc1e41d	Merge pull request #214 from sharelatex/hof-version-entity-deletion ... version entity deletion	2017-12-19 14:59:37 +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	d84580f12d	Label actions with text rather than icons	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	4691a6e85c	Get diffs showing in client	2017-12-19 13:58:47 +00:00
James Allen	a1615e6d84	Prototype of requesting history information by doc path, while tracking renames	2017-12-19 13:58:47 +00:00
Shane Kilkelly	529d35936d	Merge pull request #203 from sharelatex/sk-prevent-archived-deletion ... Prevent user from trying to delete archived project they don't own	2017-12-19 13:36:26 +00:00
Henry Oswald	70298ba65c	only hash the static content when minified is on	2017-12-19 13:13:31 +00:00
Paulo Reis	cb83e2c1b2	Tone down chat colors.	2017-12-19 10:52:23 +00:00
Alasdair Smith	f3342f327d	Merge pull request #202 from sharelatex/as-v2-upgrade-redirect ... Use V1 trial page on V2 instead of legacy SL	2017-12-19 10:07:08 +00:00
Alasdair Smith	dc2ddf7e09	Check for OL free trial instead of host as it may be fragile indicator	2017-12-18 16:53:58 +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