7629 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Shane Kilkelly	e1c3689aec	Update the email-merge email template	2018-09-19 09:28:59 +01:00
Shane Kilkelly	2ec7747b60	Add a help link to the account-merge email in case of error	2018-09-19 09:28:59 +01:00
Shane Kilkelly	c95d925d56	When regenerating session, don't copy the __tmp key	2018-09-19 09:28:59 +01:00
Shane Kilkelly	c9e3418049	Working overleaf-side of account-merge	2018-09-19 09:28:59 +01:00
Shane Kilkelly	fcfcbdb4c5	Remove dead code	2018-09-19 09:28:59 +01:00
Shane Kilkelly	fc0a4298f1	Move scripts related to account-merge checker to relevant modules	2018-09-19 09:28:59 +01:00
Shane Kilkelly	d0be98e89c	Move the account-merge-finish page to the integration module	2018-09-19 09:28:59 +01:00
Shane Kilkelly	677b3c759d	Remove old controller	2018-09-19 09:28:59 +01:00
Shane Kilkelly	843f1c6b35	Move AccountMergeEmailController to integration module	2018-09-19 09:28:59 +01:00
Shane Kilkelly	54a5c563fb	Address feedback	2018-09-19 09:28:59 +01:00
Shane Kilkelly	b0e4b12714	Finish off the copy of the account-merge-finish page	2018-09-19 09:28:59 +01:00
Shane Kilkelly	5e17dfd1cb	Also add the final email to the array of emails on the account	2018-09-19 09:28:59 +01:00
Shane Kilkelly	efb6018246	Add a rate-limit to the email-confirm endpoint	2018-09-19 09:28:59 +01:00
Shane Kilkelly	6cfe68db26	Roughly working account-merge-by-email callback endpoint	2018-09-19 09:28:59 +01:00
Shane Kilkelly	958c7a19b6	Add a skeleton of a callback endpoint for merging accounts via email	2018-09-19 09:28:59 +01:00
Shane Kilkelly	ba221a1135	WIP: add email-based account merge flow to ShareLaTeX	2018-09-19 09:28:59 +01:00
Timothée Alby	b16cffe587	Merge pull request #932 from sharelatex/as-redirect-query-string ... Support passing through query params in redirects	2018-09-18 12:35:21 +01:00
Timothée Alby	b6925647ef	Merge pull request #922 from sharelatex/ta-forbid-null-query ... Prevent Calls to UserGetter.getUser with Null Query	2018-09-18 12:24:19 +01:00
Timothée Alby	7981d867e8	Merge pull request #924 from sharelatex/ta-sign-in-v1 ... Change Links to v1 to Sign User In	2018-09-18 12:24:08 +01:00
Alasdair Smith	7e358ab318	Support passing through query params	2018-09-18 11:34:04 +01:00
Hugh O'Brien	a32762bba1	Merge pull request #931 from sharelatex/hb-s1-ui-form ... Send required export fields for s1 submission	2018-09-18 11:21:14 +01:00
hugh-obrien	39f580d6ba	fixing broken exports test	2018-09-18 10:13:33 +01:00
hugh-obrien	6f00d1f45a	send required export fields for s1 submission	2018-09-18 10:05:35 +01:00
Jessica Lawshe	203c005f26	Merge pull request #928 from sharelatex/jel-content-updates ... Link mixin paths and universities list styling	2018-09-17 13:16:52 -05:00
Jessica Lawshe	08a9534f8c	Vertically align universities list items	2018-09-17 10:45:59 -05:00
James Allen	fee2a1f401	Merge pull request #912 from sharelatex/ja-improve-redirect-logic ... Add additional functionality to RedirectManager	2018-09-17 16:41:58 +01:00
Jessica Lawshe	66bfbce45f	Correct link mixin paths	2018-09-17 09:46:34 -05:00
James Allen	15103ac894	Support the same URL with multiple methods in redirects	2018-09-17 15:38:58 +01:00
James Allen	83a1039b7e	Add acceptance tests for RedirectManager	2018-09-17 15:38:58 +01:00
James Allen	40f08d1592	Add additional functionality to RedirectManager	2018-09-17 15:38:45 +01:00
Chrystal Maria Griffiths	784984dd78	Merge pull request #923 from sharelatex/cmg-share-modal ... Show share button for collaborators	2018-09-17 15:19:44 +01:00
Alasdair Smith	42cef8e393	Merge pull request #920 from sharelatex/mm-gallery-exports ... Add gallery fields to export controller and handler	2018-09-17 09:42:26 +01:00
Alasdair Smith	e1e7091f30	Merge pull request #905 from sharelatex/as-project-intelligent-redirect ... Intelligently redirect to v1 if no v2 project found	2018-09-17 09:40:52 +01:00
Jessica Lawshe	3b729c7b9c	Merge pull request #925 from sharelatex/jel-sanitize-videos ... Allow HTML5 videos in sanitized HTML	2018-09-14 11:11:37 -05:00
Jessica Lawshe	c8b803681e	Set max-width for <video> on CMS pages	2018-09-14 10:48:56 -05:00
Jessica Lawshe	bcd465a35d	Allow <video> and <source> in sanitized HTML	2018-09-14 10:36:46 -05:00
Tim Alby	09c92c0b69	don't encode /	2018-09-14 16:09:24 +01:00
Tim Alby	2e4d3d7aab	change links to v1 to sign user in first	2018-09-14 14:26:16 +01:00
Tim Alby	41b92d4647	prevent calls to UserGetter.getUser with null query	2018-09-14 12:46:00 +01:00
Timothée Alby	b14fe82c1c	Merge pull request #921 from sharelatex/ta-remove-unused-call ... Remove Unused Call to UserGetter.getUser	2018-09-14 12:43:44 +01:00
Chrystal Griffiths	6334066d2d	Merge branch 'master' into cmg-share-modal	2018-09-14 12:09:10 +01:00
Chrystal Griffiths	915bd18058	Read-only collaborators table	2018-09-14 11:47:18 +01:00
Michael Mazour	79dc415064	Slightly refactor exports controller body handling ... 1. Move all body parsing together 2. Remove `firstName && lastName` condition, which duplicates one present in the Handler.	2018-09-14 11:02:51 +01:00
Michael Mazour	10fcdd6daf	Add optional gallery fields to export request ... Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.	2018-09-14 11:02:51 +01:00
Chrystal Griffiths	3b43cf9075	Slight copy change	2018-09-13 17:57:11 +01:00
Tim Alby	0051e59309	remove unused call to UserGetter.getUser	2018-09-13 17:39:30 +01:00
Chrystal Griffiths	b51fc01bde	Remove temporary solution	2018-09-13 17:17:18 +01:00
James Allen	14b77a2060	Merge pull request #916 from sharelatex/revert-900-ja-show-last-modified ... Revert "Record and show last modified by user for projects"	2018-09-13 14:01:36 +01:00
James Allen	ef11161ddb	Revert "Record and show last modified by user for projects"	2018-09-13 14:00:30 +01:00
James Allen	078575b236	Merge pull request #900 from sharelatex/ja-show-last-modified ... Record and show last modified by user for projects	2018-09-13 13:19:25 +01:00