1138 commits

Author	SHA1	Message	Date
Henry Oswald	3eb13ccdd1	fix stupid mistake	2017-01-25 10:38:39 +00:00
Henry Oswald	2a00b9c7a2	use user._id for error log	2017-01-25 10:33:30 +00:00
Henry Oswald	cc717f0357	domainAnnouncementsToShow -> domainAnnouncements	2017-01-25 09:44:13 +00:00
Henry Oswald	02e6eb4dd1	Merge pull request #399 from sharelatex/ho-promote-case-study ... promote domain alerts	2017-01-25 09:41:50 +00:00
Henry Oswald	1280a2313d	add check for id to exist in domain announcments ... null check user at start of getUnreadAnnouncements fix spelling mistake	2017-01-25 09:35:11 +00:00
Henry Oswald	13d21b881f	use new annoncments feature for case study info	2017-01-24 16:03:05 +00:00
Henry Oswald	9153ffac41	limit project name in email to 40 chars	2017-01-21 12:58:16 +00:00
Henry Oswald	74240e28c7	rate limit via ip the number of invite to project requests	2017-01-21 12:44:09 +00:00
Henry Oswald	6d35585847	limit number of invites each user can do ... done with the number of collaborators a user can add prevents notifications getting filled up as well	2017-01-21 12:43:15 +00:00
Shane Kilkelly	cfa2777d62	Merge branch 'sk-launchpad'	2017-01-20 13:58:16 +00:00
Shane Kilkelly	8922c9dbf5	New email layout for "testEmail"	2017-01-18 15:28:51 +00:00
James Allen	3413687833	Merge pull request #393 from sharelatex/ja-track-changes ... Ja track changes	2017-01-18 15:32:16 +01:00
Shane Kilkelly	707838baa4	Merge branch 'master' into sk-launchpad	2017-01-17 16:25:59 +00:00
Shane Kilkelly	59ab66fca2	Fix double-callback	2017-01-17 16:25:18 +00:00
James Allen	5a34d17947	Toggle track changes in a project based on the owner's feature switch	2017-01-17 15:59:18 +01:00
Shane Kilkelly	d7251c6bfe	Merge branch 'master' into sk-launchpad	2017-01-17 14:55:08 +00:00
Shane Kilkelly	1137ab0715	Don't record redirect to static asset paths	2017-01-17 14:35:37 +00:00
Shane Kilkelly	70c7e32e58	Add a 'testEmail' email type	2017-01-17 10:52:04 +00:00
James Allen	9c0bf885be	Merge branch 'master' into ja-track-changes	2017-01-17 10:16:41 +01:00
Shane Kilkelly	82ddeab2bd	If user tries to invite themselves to project, don't.	2017-01-16 13:45:01 +00:00
Henry Oswald	fed88504f8	rate limit emails sent sharing projects by users	2017-01-14 14:52:32 +00:00
James Allen	aab4dea8ae	Merge branch 'master' into ja-track-changes	2017-01-13 13:46:01 +01:00
Henry Oswald	daee77f052	Merge pull request #387 from sharelatex/pr-email-template-improvements ... Email template improvements	2017-01-12 12:34:35 +00:00
James Allen	f9b8ada215	track changes for anonymous users	2017-01-12 13:29:57 +01:00
James Allen	64b9fe52dd	Handle deleted users in comments gracefully	2017-01-12 12:31:01 +01:00
Shane Kilkelly	f5ced03074	Set redirect when sending user to login page. ... Allows smart redirecting to work when public access is turned off.	2017-01-10 15:42:36 +00:00
James Allen	f31fa98679	Sync track changes state between sessions and client	2017-01-10 16:11:12 +01:00
James Allen	d03aa7056e	Rename /ranges/users end point to /changes/users	2017-01-10 13:43:53 +01:00
James Allen	4e128b6ab7	Send user data in /threads dat	2017-01-09 17:25:06 +01:00
James Allen	43f6b9de7c	Inform other clients when we accept a change	2017-01-09 15:54:12 +01:00
James Allen	9379cff89d	Add end point for accepting change in doc updater	2017-01-09 15:25:27 +01:00
James Allen	3a5d45fa32	Get user info via web, not chat	2017-01-06 13:41:58 +01:00
Henry Oswald	862e15b842	log out user id and anonymous when loading editor	2017-01-05 15:02:10 +00:00
James Allen	84d9b2aa49	Save resolve and reopened state	2017-01-04 16:26:02 +01:00
Shane Kilkelly	259c589076	Add option to restrict invites to existing user accounts.	2016-12-20 09:54:42 +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
James Allen	988005e929	Send and get comments via the chat api	2016-12-16 16:42:41 +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	2234c438a1	Support a secondary message in the single CTA email template.	2016-12-16 12:16:33 +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
James Allen	293ba1fc4c	Fetch all ranges from docstore when viewing overview panel	2016-12-09 15:43:08 +00:00
James Allen	1830d41eba	Proxy ranges between doc updater and docstore	2016-12-08 14:09:06 +00:00
Henry Oswald	e6eeb86046	add read property to announcments	2016-12-07 11:39:22 +00:00
Shane Kilkelly	a5d2183441	if Recurly error, parse body xml rather than using regex match	2016-12-06 10:39:59 +00:00
Shane Kilkelly	58280bf6ee	Merge branch 'master' into sk-user-delete-with-cancelled-sub	2016-12-06 09:31:42 +00:00
James Allen	48cc5a992f	Merge branch 'master' into ja-set-version-in-docstore	2016-12-01 09:30:53 +00:00
Shane Kilkelly	e03d16e0cd	Deleting user: if subscription is already cancelled, ignore and proceed.	2016-11-30 16:03:18 +00:00