2120 commits

Author	SHA1	Message	Date
Hugh O'Brien	29253c5a93	Merge branch 'master' into hb-fetch-licences-graph	2018-08-23 16:11:43 +01:00
hugh-obrien	bd721d52f4	review fixes and moving licences endpoint to module	2018-08-23 14:39:48 +01:00
Tim Alby	753fb02c05	always return an array when getting affiliations	2018-08-23 15:15:53 +02:00
hugh-obrien	8d72fc78fc	send licences graph request to v1 for data instead of analytics	2018-08-22 18:31:29 +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
Henry Oswald	473063cf3d	set rclient.expire for server ttl even when there is no server id	2018-08-21 10:36:18 +01:00
Alasdair Smith	d99a42e678	Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login ... Allow for redirection of unlinked SL account to /user/login_to_ol_v2	2018-08-21 10:13:52 +01:00
Tim Alby	8d6505b518	log institutions API errors	2018-08-17 17:48:00 +02:00
Tim Alby	f5513f36ca	add param to skip affiliation creation on user create	2018-08-17 17:48:00 +02:00
Alasdair Smith	9bc3fa2df0	Pass req to preDoPassportLogin module hook	2018-08-17 12:04:05 +01: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
Henry Oswald	1e1f26b350	Merge pull request #818 from sharelatex/ho-backendgroup-config ... configure backend group name via config files	2018-08-16 10:37:14 +01:00
Henry Oswald	af6e7758d3	configure backend group name via config files	2018-08-15 15:26:22 +01:00
Timothée Alby	5e488dcab7	Merge pull request #813 from sharelatex/ta-enable-affiliations-ui ... Enable Affiliations UI	2018-08-14 16:40:35 +02:00
Tim Alby	bfb2f636cd	enable affiliations UI	2018-08-13 14:59:39 +02:00
Brian Gough	19dfe5fc8b	intial version of user setting for texlive imageName	2018-08-13 10:53:43 +01:00
Alasdair Smith	d7a341f59b	Merge pull request #808 from sharelatex/ta-import-affiliations ... Allow confirmed_at date to be specified	2018-08-13 09:47:10 +01:00
James Allen	0f8fe53bc9	Allow confirmed_at date to be specified	2018-08-10 17:48:43 +02:00
Tim Alby	197e7ce8ab	refactor institutions getter	2018-08-10 13:40:25 +02:00
Hugh O'Brien	0af23718ba	Merge pull request #749 from sharelatex/hb-activate-submit-modal ... Activate publish modal	2018-08-09 09:44:41 +01:00
James Allen	9cbb51bbbc	Merge pull request #793 from sharelatex/sk-sl-login-v2 ... If we're creating v1 accounts, don't allow login for users already linked up	2018-08-08 15:51:25 +01:00
Henry Oswald	df161d3ece	change newsletter log to info on process boot	2018-08-08 14:32:36 +01: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
Brian Gough	efcd3577ce	avoid clobbering imported image names	2018-08-06 16:56:44 +01:00
Henry Oswald	fa37caef58	remove null check on mailchimp at top of file ... I didn't like the if statment being after the require, mailchimp could also be null and called elsewhere by acident	2018-08-06 12:37:18 +01:00
Henry Oswald	17a63258c6	changed newsletter to use mailchimp	2018-08-04 17:52:12 +01:00
Shane Kilkelly	d8c9a96619	If we're creating v1 accounts, don't allow login for users already linked up	2018-08-03 14:58:29 +01:00
Hugh O'Brien	22b664da1a	Merge pull request #792 from sharelatex/hb-fetch-export-zips ... Fetch export zips	2018-08-02 13:50:11 +01:00
James Allen	b1228b7eb2	Merge pull request #789 from sharelatex/mm-exports-specify-clsi-image ... Add compiler and imageName to export API request	2018-08-01 11:43:20 +01:00
Henry Oswald	89efa7e83e	add null check on response	2018-07-31 13:07:57 +01:00
Henry Oswald	5bb3acc1eb	fix metrics sending to clsi	2018-07-31 12:56:35 +01:00
hugh-obrien	8792e600d2	authenticate publish menu zip downloads	2018-07-31 12:43:39 +01:00
hugh-obrien	3532a29d50	allow fetching of export zips	2018-07-30 19:14:59 +01:00
Henry Oswald	b04c7d2ffe	send clsi response codes to graphite	2018-07-30 18:16:52 +01:00
Michael Mazour	ddbe1a5b22	Add compiler and imageName to export API request	2018-07-27 15:42:37 +01:00
Henry Oswald	3cf060dbac	Merge branch 'master' of github.com:sharelatex/web-sharelatex-internal	2018-07-26 16:04:23 +01:00
Henry Oswald	d484c36c6d	improve clsi logging	2018-07-26 16:04:14 +01:00
Tim Alby	66bcdbcac9	institution upgrade	2018-07-26 13:01:44 +02: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	faf36f0265	Merge pull request #775 from sharelatex/revert-774-revert-750-hof-labels ... Add v2 history labels endpoints	2018-07-24 10:04:13 +01:00
James Allen	5b989f0a8e	Merge pull request #759 from sharelatex/sk-login-with-v1-credentials ... Login with v1 credentials	2018-07-24 10:04:02 +01:00
Alberto Fernández-Capel	8fb9554c3f	Revert "Revert "add v2 history labels endpoints""	2018-07-20 15:36:03 +01:00
Alberto Fernández-Capel	f260f42466	Revert "add v2 history labels endpoints"	2018-07-20 12:39:01 +01:00