51 commits

Author	SHA1	Message	Date
Simon Detheridge	286f25529a	Remove secondary CTA link from account merge confirmation email ... bug: sharelatex/web-sharelatex-internal#987 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-05 13:19:05 +01:00
Simon Detheridge	d316a76106	Revert "add plain text link to email address confirmation emails" ... This reverts commit 48cd7e604dcc5f3b7ae8eb699f14b44bc073f107.	2018-10-05 13:16:42 +01:00
Tim Alby	4e9737bf71	add plain text link to email address confirmation emails	2018-09-28 13:36:31 +01:00
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	c9e3418049	Working overleaf-side of account-merge	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
Nate Stemen	6d00f38a71	move typeform survey to google forms	2018-08-23 12:34:13 -04:00
James Allen	74ca0c4220	Refactor email template system	2018-06-21 10:19:12 +01:00
Alberto Fernández Capel	88d12b43ac	Make CTA message match regular message	2018-06-07 16:12:02 +01:00
Alberto Fernández Capel	1fc047d08e	Fix invitation resend	2018-06-06 17:11:25 +01:00
Alberto Fernández Capel	8a317b5bfe	Better wording	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	a73a869d03	I can haz some grammar	2018-06-01 16:17:11 +01:00
Alberto Fernández Capel	7fcdf68296	Remove dead code	2018-06-01 16:05:44 +01:00
Alberto Fernández Capel	7e09c0e0b1	First stab at email token invites (WIP)	2018-05-30 11:29:21 +01:00
Alasdair Smith	0114ed362f	Swap out email templates based on brand prefix	2017-12-21 10:26:14 +00:00
James Allen	b086d7afa2	Refactor rate limiting code around sending invites	2017-01-27 16:26:58 +01:00
Henry Oswald	9153ffac41	limit project name in email to 40 chars	2017-01-21 12:58:16 +00:00
Shane Kilkelly	8922c9dbf5	New email layout for "testEmail"	2017-01-18 15:28:51 +00:00
Shane Kilkelly	70c7e32e58	Add a 'testEmail' email type	2017-01-17 10:52:04 +00:00
Paulo Reis	d6fcc21ab5	Add support for GMail go-to actions in the single CTA template.	2016-12-16 17:04:26 +00:00
Paulo Reis	869f729132	Fix forgotten templating function.	2016-12-16 15:15:06 +00:00
Paulo Reis	ca5040882f	Use the new template in the join group email.	2016-12-16 14:57:59 +00:00
Paulo Reis	0fe3664a82	Use the new template in the reset pwd email.	2016-12-16 12:16:45 +00:00
Paulo Reis	7dfc2c61a6	Make the CTA button text configurable.	2016-12-16 10:06:56 +00:00
Paulo Reis	47a5eb5382	Add a new layout and body template for e-mails.	2016-12-15 17:22:39 +00:00
Shane Kilkelly	4c092e7ff1	Remove deprecated "projectSharedWithYou" email.	2016-10-28 10:37:10 +01:00
Shane Kilkelly	751a116921	add plainTextTemplate to all emails	2016-10-27 14:41:13 +01:00
Henry Oswald	1beca53b3d	project name should be clickable href in invite email	2016-10-18 15:53:56 +01:00
Shane Kilkelly	e699fcb1fa	Add plain-text component to the project-invite email	2016-10-03 15:25:38 +01:00
James Allen	53b3e3831d	Update cancellation survey link	2016-09-14 10:51:19 +01:00
Shane Kilkelly	85f49d6c9c	Make whole 'red button' in email a link	2016-08-17 10:37:44 +01:00
Shane Kilkelly	e7251aab53	Small wording changes	2016-08-03 14:06:08 +01:00
Shane Kilkelly	d9c6df0e47	start adding the ProjectInvite workflow.	2016-07-21 15:56:41 +01:00
Henry Oswald	8f14526354	added custom footer in email option	2016-06-28 17:07:27 +01:00
Henry Oswald	940586f654	sped up unit tests to improve speed ... also removed some unneeded requires.	2016-03-09 12:51:19 +00:00
James Allen	c0dfdb3bd8	Use translations for activation page	2015-12-11 14:25:17 +00:00
Henry Oswald	6727c3ee00	changed ShareLaTeX thoughts to go into type form	2015-05-29 16:27:35 +01:00
Henry Oswald	cad8d8a23b	v1 basic invite works, not pretty or tested	2015-05-22 13:57:15 +01:00
James Allen	e2d515f957	Allow public registration module to hook into email system	2015-03-19 17:19:56 +00:00
James Allen	9b8cf7bcfa	Remove public registration and require that a user be registered by an admin	2015-03-19 14:22:48 +00:00
James Allen	5a922e2356	Include email address explicitly in welcome email to avoid any confusion	2015-02-05 12:52:50 +00:00
James Allen	8fa8a64c6f	Update email templates	2014-10-16 12:46:38 +01:00
Henry Oswald	375669cd3b	changed emails to adams design. Does not render brilliantly in gmail, but overall not bad.	2014-07-21 14:18:11 +01:00
Henry Oswald	426b699865	links in emails use site url	2014-06-17 16:28:52 +01:00
Henry Oswald	133c4759f8	fix tests, whoops	2014-05-15 18:26:00 +01:00
Henry Oswald	96d98329f1	token based reset works	2014-05-15 17:58:25 +01:00
Henry Oswald	38d3bbb556	changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future	2014-03-06 12:28:07 +00:00
Henry Oswald	64257a7b2c	testing out new google analytics	2014-03-05 15:45:24 +00:00
Henry Oswald	8ba1a08245	hooked up password reset to use new email sending	2014-03-05 11:57:57 +00:00