1966 commits

Author	SHA1	Message	Date
Timothée Alby	bdef7b707d	Merge pull request #241 from sharelatex/ta-analytics-proxy ... Proxy requests to analytics service	2018-01-10 15:39:28 +02: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
Tim Alby	08b74c95f5	proxy requests to analytics service	2018-01-10 15:03:14 +02:00
James Allen	bbfcff30fb	Enable project history for new projects if enabled in settings	2018-01-03 16:55:33 +00:00
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
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	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
Hayden Faulds	8663dba37c	remove unused EditorController.getListOfDocPaths	2017-12-20 15:14:56 +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
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	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
James Allen	4691a6e85c	Get diffs showing in client	2017-12-19 13:58:47 +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
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
Henry Oswald	7aaf08da48	added no-cache endpoint	2017-12-15 13:38:34 +00:00
Henry Oswald	7693d274b7	Merge pull request #209 from sharelatex/ho-hash-static ... Main.js Ide.js and libs.js (now libraries.js) use hash in file name when minified	2017-12-15 09:52:23 +00:00
Henry Oswald	bf276b0814	ripped file fingerprinting out	2017-12-14 12:11:13 +00:00
Henry Oswald	cbf656518f	remove versioned files from fingerprinting	2017-12-14 11:24:47 +00:00
Paulo Reis	36c79979bd	More color adjustments.	2017-12-14 11:24:06 +00:00
Paulo Reis	c03ce6fdf7	Configure chat messages colors per brand.	2017-12-14 11:24:05 +00:00
Paulo Reis	e47b20390b	Add per brand UI specific chat message styles.	2017-12-14 11:24:05 +00:00
Henry Oswald	288af6772a	write hashes for all files we fingerprint	2017-12-14 10:59:46 +00:00
Henry Oswald	490c56c692	libs -> libraries ... don't use hash in non minjs version	2017-12-13 17:15:44 +00:00
Henry Oswald	716b309208	remove todo statments	2017-12-13 16:50:18 +00:00
Alasdair Smith	4a9c9c563a	Merge branch 'master' into as-autocompile-rollout-60	2017-12-13 14:44:31 +00:00
Henry Oswald	dd6bd3b91e	Merge branch 'master' into ho-hash-static	2017-12-13 14:25:32 +00:00