1648 commits

Author	SHA1	Message	Date
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
Alasdair Smith	e7992e65e4	Merge branch 'master' into as-v2-upgrade-redirect	2017-12-13 14:45:51 +00:00
Alasdair Smith	4126e9bd31	Merge branch 'master' into as-v1-dash-link	2017-12-12 09:55:48 +00:00
Alasdair Smith	f5c914ed6c	When upgrading track changes on V2, redirect to V1 trial page	2017-12-11 18:03:09 +00:00
Paulo Reis	edfc259c53	Fix missing border on SL.	2017-12-11 16:55:50 +00:00
Paulo Reis	59e675797e	Merge branch 'master' into pr-style-v2-resizers	2017-12-11 15:55:50 +00:00
James Allen	69499847e4	Refactor front end code into validateCaptcha service	2017-12-11 12:32:43 +00:00
James Allen	0b03bbc7c3	Don't inject recaptcha element if recaptcha is not enabled	2017-12-11 12:04:33 +00:00
James Allen	83086e4a79	Add recaptch to share endpoint	2017-12-11 11:57:59 +00:00
Paulo Reis	7c5a7880b0	Merge branch 'master' into pr-style-v2-resizers	2017-12-06 15:49:18 +00:00
Alasdair Smith	48cd048e5c	Merge branch 'master' into as-v1-dash-link	2017-12-06 15:12:29 +00:00
Paulo Jorge Reis	a5f99ccce3	Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling ... V2 editor styling	2017-12-06 11:22:28 +00:00
Alasdair Smith	2d66fd7280	Merge pull request #169 from sharelatex/as-import-v1 ... V1 Import Modal	2017-12-05 13:19:49 +00:00
Paulo Reis	5dffdf3efc	Add a small a11y fix.	2017-12-05 10:23:28 +00:00
Paulo Reis	a88538c3fd	Make the back to projects button closer to current SL.	2017-12-05 10:20:25 +00:00
Alasdair Smith	c84c00d56d	Change query param for nicer api on OL side	2017-12-04 15:19:03 +00:00
Paulo Reis	0bad7d8549	Adjustments to synctex controls.	2017-12-04 15:12:13 +00:00
Alasdair Smith	77dc7adf1f	Revert "Move to sidebar template" ... This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.	2017-12-04 14:53:18 +00:00
Paulo Reis	9fda8e62fa	Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers	2017-12-04 13:48:52 +00:00
Paulo Reis	fd852004fe	Refactor synctex controls z-index handling.	2017-12-04 12:25:40 +00:00
Alasdair Smith	ab78cea48d	Move to sidebar template	2017-12-04 12:24:21 +00:00
Alasdair Smith	1fd518ec58	Add query param to mark as explicitly using V1 dash	2017-12-04 12:22:27 +00:00
Alasdair Smith	a25464d925	Add check for OL host	2017-12-04 11:34:00 +00:00
Alasdair Smith	f595009911	Switch to existing v1 dash flag	2017-12-04 11:23:09 +00:00
James Allen	52b414498c	Merge branch 'master' into as-show-v1-warnings	2017-12-04 10:03:38 +00:00
James Allen	0b0fd576eb	Merge branch 'master' into as-v1-dash-link	2017-12-04 10:02:42 +00:00
James Allen	0602fed6e5	Merge branch 'master' into as-import-v1	2017-12-04 10:02:21 +00:00
James Allen	158b0d56cf	Merge branch 'master' into pr-style-v2-resizers	2017-12-04 10:01:45 +00:00
James Allen	f21870aac2	Merge branch 'master' into pr-ol-beta-editor-styling	2017-12-04 10:01:27 +00:00
Henry Oswald	aaa908187d	added layout.pug back in	2017-12-02 13:38:23 +00:00
Henry Oswald	c020e4e6bd	moment and fineuploader are loaded seperately in editor, not packaged up	2017-12-02 12:29:06 +00:00
Alasdair Smith	7f622e2e6b	Conditionally show V1 dash link	2017-12-01 17:14:53 +00:00
Alasdair Smith	9a073cdaf0	Add link to V1 dash	2017-12-01 16:58:19 +00:00
Shane Kilkelly	3ee6f5d4be	Update fineuploader on project page	2017-12-01 11:27:06 +00:00
Shane Kilkelly	2ea3caf08b	Properly version the fineuploader library	2017-12-01 11:22:41 +00:00
Alasdair Smith	5b8c9b2f4c	Add aria role to warning	2017-12-01 11:00:13 +00:00
Alasdair Smith	7d58427485	Show warnings on project list for some V1 data	2017-11-30 16:59:13 +00:00
Paulo Reis	3a959cccfd	Use custom chat resizer values.	2017-11-30 15:24:48 +00:00
Alasdair Smith	52ad852814	Add check for OL host to prevent failure on legacy SL	2017-11-30 15:14:47 +00:00
Paulo Reis	e38c0de6b9	Merge branch 'pr-ol-beta-editor-styling' into pr-style-v2-resizers	2017-11-30 15:13:00 +00:00
Paulo Reis	71604ebd5c	Create uiConfig Pug local; render it in the HTML.	2017-11-30 15:12:36 +00:00
Alasdair Smith	f232899f3f	Show warning symbol on second step	2017-11-30 10:16:15 +00:00
Alasdair Smith	6eae1d59ea	Use asyncForm directive to trigger import	2017-11-30 10:16:15 +00:00
Alasdair Smith	3aaf6559c8	Add image of v2 editor	2017-11-30 10:16:15 +00:00
Alasdair Smith	265e659999	Add multiple steps	2017-11-30 10:16:15 +00:00
Alasdair Smith	b68d6411ee	Basic styles for import modal	2017-11-30 10:16:15 +00:00
Alasdair Smith	0e11668a61	Change v1 project link to button which opens import modal	2017-11-30 10:16:15 +00:00
Alasdair Smith	cbba7c38df	Add basic v1 import modal template & controller	2017-11-30 10:16:15 +00:00
Shane Kilkelly	c203a8d80a	Merge branch 'sk-use-recurly-hosted-details-page'	2017-11-29 09:45:54 +00:00