224 commits

Author	SHA1	Message	Date
Tim Alby	41b92d4647	prevent calls to UserGetter.getUser with null query	2018-09-14 12:46:00 +01:00
James Allen	5025b54c9c	Merge pull request #887 from sharelatex/as-logout-of-v1 ... Extract logout to function, so different redirect can be called	2018-09-03 14:04:22 +01:00
Alasdair Smith	53bd2cfd33	Add error handling on logout	2018-09-03 11:46:36 +01:00
Alasdair Smith	6569e34873	Extract logout to function, so different redirect can be called	2018-09-03 11:01:14 +01:00
Henry Oswald	245ad2a2a8	call changeEmail before the callback in setDefaultEmailAddress	2018-08-31 11:49:45 +01:00
Henry Oswald	bab334aa44	fire and forget changeEmail in setDefaultEmailAddress ... prevents blocking/erroring the change email workflow	2018-08-31 11:16:28 +01:00
Paulo Jorge Reis	cb4d4145a1	Merge pull request #855 from sharelatex/pr-v2-light-theme ... v2 light theme	2018-08-30 11:24:52 +01:00
Paulo Reis	307a98851d	Nest the overall theme property under ace.	2018-08-28 10:10:16 +01:00
Nate Stemen	4d991aa176	Merge branch 'master' into ns-use-regex-test	2018-08-27 14:26:51 -04:00
Nate Stemen	ebea8a8633	use regex test instead of match when only bool needed	2018-08-27 14:25:01 -04:00
Paulo Reis	efc926ffc5	Load theme as a user setting; allow the user to change it; update tests.	2018-08-27 15:25:00 +01:00
Hugh O'Brien	eeadd1e9bb	Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms ... Tell v1 confirmation status of affiliation emails	2018-08-22 08:34:33 +01:00
Tim Alby	f5513f36ca	add param to skip affiliation creation on user create	2018-08-17 17:48:00 +02:00
hugh-obrien	96ffeef73d	send fixed confirmed date to v1 for affiliations	2018-08-16 13:50:34 +01:00
hugh-obrien	55597b9279	inform v1 when confirming affiliation emails	2018-08-16 13:50:34 +01:00
Henry Oswald	5ed95694da	Merge pull request #801 from sharelatex/ho-mailchimp ... Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.	2018-08-16 11:40:39 +01:00
Tim Alby	bfb2f636cd	enable affiliations UI	2018-08-13 14:59:39 +02:00
James Allen	0f8fe53bc9	Allow confirmed_at date to be specified	2018-08-10 17:48:43 +02:00
Henry Oswald	c68366155e	remove sanitize = require('sanitizer') not used anywhere	2018-08-08 14:14:56 +01:00
Henry Oswald	687637eec7	change email address in newsletter when changing default email ... put mongo_id into mailchimp merge fields	2018-08-08 13:50:03 +01:00
Henry Oswald	6208e9f2d0	add changeEmail function to newsletter manager ... not actually called	2018-08-07 21:38:31 +01:00
Henry Oswald	6cf1f71604	add newsletter checkbox to user register forms	2018-08-06 17:43:03 +01:00
Tim Alby	63c7f756ce	refactor into InstitutionsAPI	2018-07-26 13:01:42 +02:00
James Allen	7dc82597e1	Merge pull request #765 from sharelatex/ja-update-email-in-v1 ... Update email in v1 when setting as default in v2	2018-07-26 10:58:57 +01:00
James Allen	f99b6b6f0a	Merge pull request #746 from sharelatex/ta-refresh-features ... Refresh Features After Confirming Email	2018-07-24 10:04:48 +01:00
James Allen	2c25cbaf25	Update error handling on backend	2018-07-17 11:12:09 +01:00
James Allen	ca97698724	Handle v1 response when email is already in use	2018-07-16 17:27:01 +01:00
James Allen	d0f77abc70	Update email in v1 when setting default in v2	2018-07-16 13:26:52 +01:00
James Allen	476f4e55c3	Just generate a new token on resending confirmation email	2018-07-13 10:42:31 +01:00
James Allen	33b28db061	Add backend endpoint for resending confirmation email	2018-07-12 16:39:04 +01:00
Tim Alby	35cb3924e2	refresh features after confirming email	2018-07-11 14:57:35 +02:00
Tim Alby	cfd5c65be4	add affiliation before confirming email	2018-07-05 16:02:55 +02:00
Tim Alby	9d4df4271a	try adding affiliation on user creation	2018-07-05 16:01:15 +02:00
Tim Alby	3e1d61438f	add endpoint to endorse affiliation	2018-07-05 15:59:36 +02:00
Tim Alby	3a541307b4	parse email in UserUpdater	2018-07-03 20:59:38 +02:00
Douglas Lovell	260f927980	Merge pull request #719 from sharelatex/dcl-test-fix ... Small repair to SubscriptionController Test	2018-07-02 13:16:10 -03:00
Alasdair Smith	04a98c4d91	Merge pull request #697 from sharelatex/pr-user-affilitations ... User affiliations	2018-07-02 11:36:04 +01:00
Douglas Lovell	1df5b0b942	Fixup mixed indentation	2018-06-29 19:36:59 -03:00
Tim Alby	fe0fdd11bf	call v1 affiliation deletion endpoint with POST instead of DELETE	2018-06-28 13:48:28 +02:00
Tim Alby	1d80878bf8	delete affiliations on user deletion	2018-06-28 13:47:19 +02:00
Tim Alby	837f614df4	refactor affiliation requests	2018-06-28 13:47:16 +02:00
Tim Alby	60009c6346	fix delete endpoint	2018-06-26 19:50:12 +02:00
Paulo Reis	70b3df5a0e	Remove logs.	2018-06-25 17:32:39 +01:00
Paulo Reis	e7f819fbdd	Hide affiliations UI behind feature flag.	2018-06-25 17:06:23 +01:00
Paulo Reis	b92dc98b99	Merge branch 'master' into pr-user-affilitations	2018-06-25 14:13:26 +01:00
Tim Alby	7a3fcf6d2c	change error message on email update failure	2018-06-25 13:47:22 +02:00
Tim Alby	c6de896bb5	decorate emails list with affiliation data	2018-06-25 13:47:04 +02:00
Tim Alby	e41391fb4a	ignore affiliations if v1 is not configured	2018-06-25 13:45:46 +02:00
Tim Alby	d3b2a2650f	add/remove affiliations when adding/removing emails	2018-06-25 13:45:46 +02:00
Paulo Reis	b16ebc1843	Read user email from the URL in DELETE requests.	2018-06-21 17:16:42 +01:00