1374 commits

Author	SHA1	Message	Date
James Allen	47a66eed50	Merge branch 'ja-include-track-changes-feature' into pr-track-changes-upgrade-prompt	2017-02-13 11:50:56 +01:00
James Allen	4728077cca	Add track changes feature flag into model	2017-02-13 11:50:32 +01:00
Shane Kilkelly	6a161b4071	remove commented out code	2017-02-06 16:35:52 +00:00
Shane Kilkelly	7d5dc34b3e	fix the set-password form for new (admin-created) users	2017-02-06 14:58:54 +00:00
James Allen	935847f2a1	Add track changes flag into user model	2017-02-03 14:47:04 +01:00
James Allen	343abfde23	Use user feature flags to determine track changes state	2017-02-03 14:36:11 +01:00
Shane Kilkelly	e2a207d618	Merge branch 'master' into sk-pug	2017-01-31 09:39:06 +00:00
James Allen	e7efa40c75	Merge pull request #401 from sharelatex/ja-spam-code-fixes ... Refactor rate limiting code around sending invites	2017-01-31 10:21:55 +01:00
Shane Kilkelly	4e9426e6bf	Merge branch 'master' into sk-pug	2017-01-30 14:36:10 +00:00
Shane Kilkelly	3ed85dad42	Merge branch 'master' into sk-upgrade-uuid	2017-01-30 11:09:50 +00:00
James Allen	b086d7afa2	Refactor rate limiting code around sending invites	2017-01-27 16:26:58 +01:00
James Allen	757c7002eb	Merge pull request #397 from sharelatex/ja-modify-threads ... Allow editing/deleting of comments and threads	2017-01-25 15:50:00 +01:00
Shane Kilkelly	e2f4fc3653	Merge branch 'master' into sk-rate-limit-cluster	2017-01-25 10:52:34 +00:00
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
Shane Kilkelly	239164fe26	Merge branch 'master' into sk-rate-limit-cluster	2017-01-25 09:56:08 +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
James Allen	f9ba7392e9	Allow editing/deleting of comments and threads	2017-01-24 16:21:14 +01:00
Henry Oswald	2341a8481a	Merge branch 'master' into ho-promote-case-study	2017-01-24 14:49:35 +00:00
Shane Kilkelly	a148eb1f43	Merge branch 'master' into sk-rate-limit-cluster	2017-01-24 09:24:47 +00:00
Shane Kilkelly	0add3ed66e	Merge branch 'master' into sk-upgrade-uuid	2017-01-23 10:04:31 +00:00
Shane Kilkelly	abbffb8e4b	Remove deprecated node-uuid package, replace with uuid.	2017-01-23 10:03:16 +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	57cd54bf55	WIP: migrate from jade to pug	2017-01-20 12:03:02 +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
Shane Kilkelly	635b935acc	Add an acceptance test for login rate limits, cleanup	2017-01-16 11:46:59 +00:00
Henry Oswald	fed88504f8	rate limit emails sent sharing projects by users	2017-01-14 14:52:32 +00:00
Shane Kilkelly	25956d4c62	Fix up tests	2017-01-13 16:04:26 +00:00
Shane Kilkelly	525e871d55	Merge branch 'master' into sk-rate-limit-cluster	2017-01-13 14:17:18 +00:00
James Allen	aab4dea8ae	Merge branch 'master' into ja-track-changes	2017-01-13 13:46:01 +01:00
Shane Kilkelly	d17483fd47	Merge branch 'sk-top-menu-rework'	2017-01-12 13:24:47 +00: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
James Allen	e7ab92b7c9	Only show users controls they have permission to use	2017-01-12 11:52:39 +01:00