1701 commits

Author	SHA1	Message	Date
James Allen	2fb4059633	Merge pull request #258 from sharelatex/ja-allow-v1-imports ... Go back to allowing v1 projects to be imported	2018-01-23 10:30:23 +00:00
Alasdair Smith	89205092b6	Fix v2 faq link	2018-01-17 11:41:25 +00:00
James Allen	c466025df4	Go back to allowing v1 projects to be imported	2018-01-16 09:40:58 +00:00
James Allen	79055d0e8d	Merge pull request #243 from sharelatex/ja-dont-show-binary-diffs ... Show apology message instead of raw binary files	2018-01-11 08:42:13 +00:00
James Allen	626e0a16ef	Fix acceptance test when overleaf setting not present	2018-01-04 15:49:31 +00:00
James Allen	692182c784	Show apology message instead of raw binary files	2018-01-04 10:53:49 +00:00
James Allen	967353d080	Update comment to use button for import dialog for a11y	2018-01-03 17:06:51 +00:00
James Allen	f0d7658bdd	Don't show import dialog for projects, just link to v1 editor	2018-01-03 16:46:26 +00:00
Paulo Reis	8b9f3268b1	Make plans page consistent with others, fixing header issues.	2018-01-03 13:54:33 +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	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
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
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
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	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	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
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
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
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
Alasdair Smith	da2c0b3fea	Switch redirectToOLFreeTrialUrl to calculate trial url ... Sending unnecessary query params to OL seems like a footgun, so switch to compromise that is more explicit but doesn't send unnecessary query params	2017-12-14 17:09:11 +00:00
Alasdair Smith	7322522323	Use freeTrialBaseUrl instead of potentially fragile v1BaseUrl	2017-12-14 17:05:12 +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	ca68f01a9d	Build chat message styles on the controller side (allowing for extra parameters).	2017-12-14 11:23:22 +00:00
Henry Oswald	bbbba701b0	Update editor.pug	2017-12-14 10:21:53 +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	f021f21f11	only hash when minified	2017-12-13 16:37:51 +00:00
Henry Oswald	ccbb15c82e	remove fingerprint from ide	2017-12-13 14:54:08 +00:00
Alasdair Smith	e7992e65e4	Merge branch 'master' into as-v2-upgrade-redirect	2017-12-13 14:45:51 +00:00
Henry Oswald	dd6bd3b91e	Merge branch 'master' into ho-hash-static	2017-12-13 14:25:32 +00:00
Henry Oswald	357617d952	works with libs compiled into it	2017-12-13 14:19:19 +00:00
Henry Oswald	88334959d7	added remove extension	2017-12-13 14:13:45 +00:00