201 commits

Author	SHA1	Message	Date
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
Alberto Fernández Capel	c45b4463bb	Fix unit test	2018-06-08 10:05:26 +01:00
Alberto Fernández Capel	5159f6f33d	Check the subscription is in a group plan before adding new members	2018-06-08 09:58:51 +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
Hugh O'Brien	6f5c777163	Merge pull request #622 from sharelatex/hb-take-emis-names-as-input ... Take user entered first and last names for EMIS	2018-06-07 15:52:33 +01: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
James Allen	c2ef93b212	Merge pull request #610 from sharelatex/ja-sync-from-v2 ... Tell v1 when refreshing features in v2	2018-06-07 13:30:34 +01:00
Alberto Fernández Capel	959db80177	Check all emails to prevent invite duplicates	2018-06-07 12:49:46 +01: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	1fc047d08e	Fix invitation resend	2018-06-06 17:11:25 +01:00
Alberto Fernández Capel	553878064b	Resend email if the user has already been invited	2018-06-06 15:36:53 +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	7726314e7c	add test to explicitely check filter	2018-06-06 15:45:12 +02:00
Tim Alby	e4da748257	add filter to query on emails attribute	2018-06-06 14:52:09 +02:00
Tim Alby	813289f5de	use multiple emails when relevant	2018-06-06 11:45:01 +02:00
Tim Alby	c5530163f5	add emails attribute on user creation	2018-06-06 11:45:01 +02:00
Alberto Fernández Capel	6fb6119ca8	Merge remote-tracking branch 'origin' into afc-email-tokens	2018-06-05 15:42:17 +01:00
Tim Alby	613c9193e3	implement multi emails logic	2018-06-05 16:42:12 +02:00
Jessica Lawshe	b63384cbf1	Merge pull request #537 from sharelatex/jel-pricing-plans ... Plans and pricing variant	2018-06-05 09:30:43 -05:00
Hayden Faulds	0bb37d4991	move tk call to before sandboxed module call	2018-06-05 13:42:26 +01:00
Jessica Lawshe	8b672dea0d	Add unit tests	2018-06-04 14:42:26 -05:00
hugh-obrien	54ce196500	test custom first and last name for exports	2018-06-04 13:16:21 +01:00
hugh-obrien	b02eea1e7e	update tests for exports name options	2018-06-04 13:16:21 +01:00
Alberto Fernández Capel	58c4e72b2a	Update references to UserLocator ... UserLocator was refactored in another branch: UserLocator -> UserGetter	2018-06-01 16:53:16 +01: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	3bd18715db	Add some tests	2018-06-01 15:37:09 +01:00
Hugh O'Brien	a79c9b94a8	Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web ... Extract v1 templates code to web	2018-06-01 11:29:36 +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
Alberto Fernández Capel	385fec1914	Clean up code that uses invited_emails	2018-06-01 11:23:25 +01:00
hugh-obrien	d47e845367	add v1 template tests	2018-05-31 13:26:54 +01:00
Shane Kilkelly	d3ae276091	Merge pull request #579 from sharelatex/sk-linked-files-from-project ... Linked Files from Project	2018-05-31 11:08:08 +01:00
James Allen	c5b553d4a6	Notify v1 by default	2018-05-29 17:31:15 +01:00
James Allen	301ae80f99	Allow refreshFeatures to notify v1 to update its features	2018-05-29 17:21:42 +01:00
Alberto Fernández Capel	b52fbdbfa4	Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups	2018-05-29 15:37:04 +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
Shane Kilkelly	0cb5beb689	Merge branch 'master' into sk-linked-files-from-project	2018-05-24 13:47:28 +01:00
Alasdair Smith	81fdca91c1	Fix failing test	2018-05-24 10:27:36 +01:00
Shane Kilkelly	3181f624a7	Remove obsolete auth check	2018-05-24 10:22:17 +01:00
Shane Kilkelly	4daf062be9	Add unit test for ProjectController.projectEntitiesJson	2018-05-22 16:40:39 +01:00
Shane Kilkelly	b1c1cdecef	Add unit test for ProjectController.userProjectsJson	2018-05-22 16:17:59 +01:00
Shane Kilkelly	bc5769cd73	Stub out the ProjectEntityHandler in ProjectController tests	2018-05-22 15:56:01 +01:00
James Allen	1d0be569a6	Fix SubscriptionUpdater -> FeaturesUpdater miscall	2018-05-22 10:05:08 +01:00
James Allen	50bd60dd51	Split FeaturesUpdater out of SubscriptionUpdater	2018-05-22 10:05:08 +01:00
James Allen	0830c473ad	Update unit tests and refactor to make more testable	2018-05-22 10:05:08 +01:00