33 commits

Author	SHA1	Message	Date
Tim Alby	48e5c6b523	add UserMembership logic	2018-10-09 12:09:11 +01:00
Alberto Fernández Capel	46a1cdc510	Use the admin_ids array to query for subscriptions	2018-07-13 09:38:58 +01:00
Alberto Fernández Capel	4e8185d369	Use the id in methods that modify a subscription ... This will make it easier to allow a user to manage multiple groups.	2018-07-11 09:56:36 +01:00
James Allen	f7532e5854	Merge pull request #619 from sharelatex/afc-email-tokens ... Use emails with tokens for team invites	2018-06-12 08:30:23 +01:00
James Allen	b716f59442	Remove deprecated removeEmailInviteFromGroup	2018-06-11 14:19:47 +01:00
Tim Alby	5438a565b9	use multiple emails when relevant	2018-06-08 17:53:45 +02:00
Alberto Fernández Capel	59688efb56	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-08 12:21:17 +01:00
Alberto Fernández Capel	57775e60b1	Merge remote-tracking branch 'origin/master' into afc-update-user-references	2018-06-08 11:28:58 +01:00
Timothée Alby	7cdcd725fd	Revert "Use Multiple Emails"	2018-06-07 18:44:59 +02:00
Alberto Fernández Capel	a3bb99d755	Honour invited_emails for the team being ... We'll remove them soon, but we want to keep them for a while so recent invites can join their teams.	2018-06-07 16:22:38 +01:00
Alberto Fernández Capel	670f24ef6f	Simplify method name	2018-06-07 16:12:02 +01:00
Alberto Fernández Capel	5e70825c94	Rename view variable to invite ... Makes the meaning more explicit	2018-06-07 16:12:02 +01:00
Tim Alby	813289f5de	use multiple emails when relevant	2018-06-06 11:45:01 +02:00
Alberto Fernández Capel	25d7196570	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-01 16:49:47 +01:00
Alberto Fernández Capel	7fcdf68296	Remove dead code	2018-06-01 16:05:44 +01:00
Alberto Fernández Capel	385fec1914	Clean up code that uses invited_emails	2018-06-01 11:23:25 +01:00
Alberto Fernández Capel	11edfde153	Accept & revoke team invites	2018-05-31 11:54:50 +01:00
Alberto Fernández Capel	7e09c0e0b1	First stab at email token invites (WIP)	2018-05-30 11:29:21 +01:00
Alberto Fernández Capel	b52fbdbfa4	Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups	2018-05-29 15:37:04 +01:00
Alberto Fernández Capel	259d690f7c	Add method to update user references	2018-05-29 12:00:22 +01:00
Tim Alby	5fbe5c5537	remove UserLocator ... Use UserGetter instead	2018-05-28 14:11:13 +02:00
Tim Alby	bbaca91e57	add UserGetter#getUserByMainEmail ... Use only that method to find users by email.	2018-05-28 14:11:09 +02:00
James Allen	4cecbae6b6	Use an email based invite system for groups, not holding accounts	2017-06-08 12:12:08 +01:00
Henry Oswald	a33b480c67	added more logging to subscription group handler	2016-03-09 11:20:17 +00:00
Henry Oswald	b504732733	fixed calls to addUserToGroup and added more logging	2016-02-22 16:50:41 +00:00
Henry Oswald	103bb1c88f	add more error logging to group handler	2016-02-22 16:01:26 +00:00
Henry Oswald	29e4b324fd	improve calls for invite notifications and auto mark as read	2016-02-18 11:43:43 +00:00
Henry Oswald	33aa5c732f	if a domain licence link has expired render a nice message explaining they need to retry	2015-06-01 12:43:42 +01:00
Henry Oswald	cb48242b74	changed email expire to 1 day for verifying account	2015-06-01 12:22:46 +01:00
Henry Oswald	4773d6d22f	added tests around new endpoints for joining groups	2015-05-27 20:50:16 +01:00
Henry Oswald	f27c072ae1	pull logic checking if user is already part of a group out of controller into handler	2015-05-27 16:33:47 +01:00
Henry Oswald	ba1371744b	deal with users who may have been deleted but are still inside a subscription group	2014-03-25 16:19:30 +00:00
James Allen	8715690ce9	Intial open source comment	2014-02-12 10:23:40 +00:00