169 commits

Author	SHA1	Message	Date
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
Tim Alby	31827ae6b5	add emails attribute on user creation	2018-06-08 17:53:45 +02:00
Timothée Alby	7cdcd725fd	Revert "Use Multiple Emails"	2018-06-07 18:44:59 +02:00
Timothée Alby	f422b7242d	Merge pull request #603 from sharelatex/ta-use-multi-emails ... Use Multiple Emails	2018-06-07 15:40:43 +02:00
Alberto Fernández Capel	566c41cafd	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-07 11:40:03 +01:00
Alberto Fernández Capel	e753ef3af5	Invite users in the invited_emails array ... We'll remove that attribute soon, but for the time being we want users to still be able to join the team.	2018-06-06 15:36:53 +01:00
Tim Alby	3cb499a3c2	add comment	2018-06-06 15:46:41 +02:00
Tim Alby	e4da748257	add filter to query on emails attribute	2018-06-06 14:52:09 +02:00
Tim Alby	c5530163f5	add emails attribute on user creation	2018-06-06 11:45:01 +02:00
Tim Alby	613c9193e3	implement multi emails logic	2018-06-05 16:42:12 +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	89735f4b8e	Keep method name for compatibility	2018-06-01 15:36:00 +01:00
Alberto Fernández Capel	9b18e58b68	Choose a better method name ... This method is now only notifying users about a potential domain licence	2018-06-01 11:28:06 +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
Tim Alby	5a590aa021	remove getUserOrCreateHoldingAccount function ... The function is deprecated	2018-05-28 14:09:13 +02:00
James Allen	dee96920b0	Allow font family and line height to be user configurable	2018-05-10 18:03:54 +01:00
James Allen	311ebf89c4	Refactor to always use req.externalAuthenticationSystemUsed	2017-11-20 10:10:23 +00:00
Hayden Faulds	4adf88ca01	handle OL or SL ids in UserInfoController.getPersonalInfo	2017-09-26 11:40:05 +01:00
James Allen	9c4dc40abf	Merge pull request #583 from sharelatex/ja-import-projects ... Add in UserStub model and support in collaborators view	2017-08-29 16:06:00 +02:00
James Allen	a58a715fad	Merge pull request #570 from sharelatex/ho-null-check-redis-sessions ... Ho null check redis sessions	2017-08-29 15:44:22 +02:00
James Allen	d5839437fd	Add in UserStub model and support in collaborators view	2017-08-24 17:48:47 +02:00
James Allen	eac0ce8353	Initial spike of Overleaf based logins	2017-08-08 14:00:21 +02:00
Henry Oswald	33fe252a15	null check user during logout	2017-08-03 13:26:14 +01:00
Henry Oswald	35f31d5a3c	null check the user correctly	2017-08-03 13:17:39 +01:00
Shane Kilkelly	ba3550759d	Persist autoPairDelimiters setting.	2017-07-31 08:36:13 +01:00
James Allen	4cecbae6b6	Use an email based invite system for groups, not holding accounts	2017-06-08 12:12:08 +01:00
Shane Kilkelly	c864288c4e	On logout, clear sudo mode	2017-05-15 11:53:52 +01:00
James Allen	8449b0417c	Move all redis end points to be cluster compatible	2017-05-04 15:22:54 +01:00
Shane Kilkelly	043520fc28	Remove the Metrics module, use metrics-sharelatex	2017-04-03 16:18:30 +01:00
Shane Kilkelly	a64f890ed0	Upgrade metrics api	2017-03-17 14:55:41 +00:00
Shane Kilkelly	f2b5901776	wip: use new metrics.timeAsyncMethod	2017-03-16 10:59:18 +00:00
Shane Kilkelly	a148eb1f43	Merge branch 'master' into sk-rate-limit-cluster	2017-01-24 09:24:47 +00:00
James Allen	64b9fe52dd	Handle deleted users in comments gracefully	2017-01-12 12:31:01 +01:00
James Allen	3a5d45fa32	Get user info via web, not chat	2017-01-06 13:41:58 +01:00
Shane Kilkelly	9f787943b6	Remove stray redis imports.	2016-12-19 12:17:23 +00:00
Shane Kilkelly	a03ac8fe72	More robust session destruction after deleting user account.	2016-11-28 12:37:53 +00:00
Shane Kilkelly	52462d7020	Merge branch 'sk-sync-details-from-sso'	2016-11-28 10:11:59 +00:00
Shane Kilkelly	2ab5ad4230	If we're updating details from a SSO source, don't allow editing on settings page.	2016-11-25 14:38:00 +00:00
Shane Kilkelly	22101d0305	If user is sent to login page with explicit redirect, obey	2016-11-24 11:38:13 +00:00
Shane Kilkelly	8089bb55a4	use session for the post-login redirect, remove redir query string.	2016-11-22 14:24:36 +00:00
Shane Kilkelly	fa146a1558	Remove redundant !!	2016-11-17 14:48:15 +00:00
Shane Kilkelly	3b8fbe8249	If using external auth, show non-editable email field. ... Also defend server-side against setting email when using external auth.	2016-11-17 14:34:02 +00:00
James Allen	593e59450b	Use different UserSessions keys for cluster vs normal redis session store	2016-11-10 14:31:48 +00:00
Shane Kilkelly	c3860dd7a7	Remove stray commented-out code, use mapSeries instead of map.	2016-11-09 14:36:25 +00:00
Shane Kilkelly	5f3098df38	Replace multi-ops with Async.series, tests passing	2016-11-09 11:03:03 +00:00
Shane Kilkelly	bfa0e7cf89	WIP: start moving web sessions to cluster	2016-11-08 15:32:36 +00:00
Paulo Reis	840d52ef1a	Remove default value from user model, but add it upon creation (i.e. affecting new users).	2016-11-01 16:36:26 +00:00
Shane Kilkelly	5c8cdd22cc	Merge branch 'sk-account-delete-pass'	2016-10-28 11:02:41 +01:00
Shane Kilkelly	dc62b1a86e	Remove deprecated endpoint for old delete-user	2016-10-26 11:18:36 +01:00