8346 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alasdair Smith	562534034f	Stub out brandPrefix for email tests	2017-12-21 17:18:10 +00:00
Paulo Reis	0484b46027	Redundancy.	2017-12-21 13:52:34 +00:00
Paulo Reis	399ebc473f	Center global alerts in v2.	2017-12-21 13:38:40 +00:00
Paulo Reis	baa57c56aa	Improve dropdown spacing in v2.	2017-12-21 13:34:11 +00:00
Paulo Reis	f5751c34a9	Make inline tags look nicer with v2 typography.	2017-12-21 12:57:33 +00:00
Paulo Reis	484d34e296	Only render announcements in SL.	2017-12-21 12:57:07 +00:00
Alasdair Smith	8c29b93ae9	Merge pull request #216 from sharelatex/as-update-v2-copy ... Update v2 copy	2017-12-21 12:00:04 +00:00
Alasdair Smith	1be9e29f35	Switch from button to link to fit better	2017-12-21 11:10:23 +00:00
Paulo Reis	d5502fd502	Make layout work nicely without navbar (content BG now expands to the top).	2017-12-21 11:03:27 +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	940b22ef95	Remove debug line	2017-12-20 16:42:09 +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	d22a9acc76	Highlight project name a little, style renaming widget in v2.	2017-12-20 15:56:32 +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
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
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 Jorge Reis	7d3e463061	Merge pull request #210 from sharelatex/pr-style-v2-chatpane ... Style v2 chat	2017-12-20 09:52:52 +00:00
Paulo Reis	8d1736af59	Fix forgotten conflict.	2017-12-20 09:51:32 +00:00
Paulo Reis	0a0c6c6c0c	Merge branch 'master' into pr-style-v2-chatpane	2017-12-20 09:50:49 +00:00
Paulo Jorge Reis	c8741daeb2	Merge pull request #204 from sharelatex/pr-style-v2-pdf ... Style v2 PDF viewer, alerts and logs	2017-12-20 09:17:21 +00:00
James Allen	339b7ec14f	Merge branch 'ja-allow-importing-without-history'	2017-12-19 15:06:17 +00:00
James Allen	1653de9301	Revert "Build from module branch" ... This reverts commit 34d4b72ddd8b16bd34013e7bea9459940fbf0032.	2017-12-19 15:01:17 +00:00
James Allen	98ff097981	Merge pull request #219 from sharelatex/as-ignore-require ... Ignore content-addressible compiled require js	2017-12-19 15:00:50 +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	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