6060 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James Allen	2d8b47295f	Build from module branch	2017-12-19 13:59:06 +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	ffa2e231fd	Fix up tests	2017-12-19 13:58:47 +00:00
James Allen	8311101ec0	Split project_history.enable in initializeHistoryForNewProjects and sendProjectStructureOps	2017-12-19 13:58:47 +00:00
James Allen	dfe6e26946	test_unit_frontend -> test_frontend in Makefile	2017-12-19 13:58:47 +00:00
James Allen	810b5e0e9a	Fix front end tests	2017-12-19 13:58:47 +00:00
James Allen	b4a5e5a041	Tidy up HistoryV2Manager	2017-12-19 13:58:47 +00:00
James Allen	b0812864ac	Clean up CI output	2017-12-19 13:58:47 +00:00
James Allen	d7a26e27e5	Run front end tests in CI	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	8ea779af58	Add some front end tests for 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
Brian Gough	388a052647	Merge pull request #213 from sharelatex/bg-allow-autocompile-without-code-check ... allow autocompile without code check	2017-12-19 13:46:12 +00:00
Nate Stemen	685595ed0a	remove comment	2017-12-19 08:44:19 -05: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	547c0cb79f	Use new theme red shade as the danger red; tone down compile log alerts.	2017-12-19 13:10:12 +00:00
Paulo Reis	cb83e2c1b2	Tone down chat colors.	2017-12-19 10:52:23 +00:00
Paulo Reis	88d669cbb5	Remove debugging statements.	2017-12-19 10:52:17 +00:00
Paulo Reis	91d479378b	Apply padding and font-weight changes.	2017-12-19 10:51:49 +00:00
Paulo Reis	709a4bf4fb	Adjust padding values.	2017-12-19 10:50:33 +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	fdd861e824	Ignore content-addressible compiled require js	2017-12-19 10:02:15 +00:00
Alasdair Smith	8453a7a910	Increase width slightly	2017-12-18 17:26:24 +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
Paulo Reis	4e02033c82	Use Lato as the sans-serif font for v2.	2017-12-18 16:19:10 +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	99a52d48c8	acceptance test versioning entity deletions	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	72ca08ae2d	Reduce margin under list	2017-12-15 16:11:31 +00:00
Nate Stemen	7d5c661b4e	make command names local array	2017-12-15 11:10:44 -05:00
Alasdair Smith	61900cc1ea	Restyle step 2 for side-by-side layout	2017-12-15 16:01:00 +00:00
Alasdair Smith	75a34024bc	Restyle step 1 for side-by-side layout	2017-12-15 13:48:53 +00:00
Henry Oswald	7aaf08da48	added no-cache endpoint	2017-12-15 13:38:34 +00:00
Alasdair Smith	8862ed383c	Fix project title & bold	2017-12-15 13:28:53 +00:00
Alasdair Smith	7130d0b270	Update v1 import modal with updated copy	2017-12-15 12:49:17 +00:00
Alasdair Smith	2b3b8b2c3b	Use hardcoded OL url instead of settings - no point in linking to staging faq	2017-12-15 12:29:39 +00:00
Alasdair Smith	96af59d6b5	Update v1 project/tag tooltips	2017-12-15 12:17:08 +00:00
Alasdair Smith	a6cd210ef6	Update v1 dash pane with new copy & restyle to fit correctly	2017-12-15 12:02:11 +00:00