4219 commits

Author	SHA1	Message	Date
Shane Kilkelly	6157db1964	Merge pull request #835 from sharelatex/sk-sanitize-system-messages ... Sanitize display of system messages.	2018-08-29 09:21:07 +01:00
Timothée Alby	107e8ce633	Merge pull request #859 from sharelatex/ho-mailchimp-change-email ... always set status_if_new	2018-08-28 14:44:59 +02:00
Henry Oswald	60b3e6777f	always set status_if_new	2018-08-28 13:34:53 +01:00
Timothée Alby	c2ef2326b9	Merge pull request #857 from sharelatex/ho-mailchimp-change-email ... add error handling for changing email in newsletter of user who has not subscribed	2018-08-28 14:03:44 +02:00
Timothée Alby	8057f4e74d	Merge pull request #849 from sharelatex/pr-fix-add-new-university ... Correctly invoke the function to add unknown universities.	2018-08-28 14:03:35 +02:00
Timothée Alby	946726c898	Merge pull request #853 from sharelatex/ta-institution-features-fix ... Check Institution Confirmation Status	2018-08-28 14:03:22 +02:00
Henry Oswald	32749267b8	improve logging on change email in newsletter	2018-08-28 12:46:49 +01:00
Henry Oswald	423bc9312d	only set status and merge fields if required ... Not strictly nessaserry but it is a bit safer also improve error reporting for change email	2018-08-28 12:32:20 +01:00
Henry Oswald	75521a4c86	add error handling for changing email in newsletter of user who has not subscribed	2018-08-28 10:47:33 +01:00
Tim Alby	ef37902dfc	check institution confirmation status	2018-08-27 15:45:31 +02:00
Tim Alby	e19882455a	improve affiliation endorsement button ... - design as button instead of link - disable unless role and department are set	2018-08-27 11:32:48 +02:00
Tim Alby	7863561bff	display university licence in affiliations UI	2018-08-27 11:26:13 +02:00
Paulo Reis	4f6f459bfe	Remove debug code.	2018-08-24 15:35:52 +01:00
Paulo Reis	920c24cacb	Correctly invoke the function to add unknown universities.	2018-08-24 15:29:48 +01:00
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
Paulo Jorge Reis	d838f8778a	Merge pull request #832 from sharelatex/pr-change-free-history-limits ... Change history limits for free users	2018-08-23 14:02:08 +01:00
hugh-obrien	8d72fc78fc	send licences graph request to v1 for data instead of analytics	2018-08-22 18:31:29 +01:00
Henry Oswald	ab1848d0ae	Add a trusted filter for iframe downloads (#836) ... * add trusted helper to iframe downloads	2018-08-22 14:47:15 +01:00
Shane Kilkelly	7f7b10aa09	Sanitize display of system messages. ... When showing system-messages, use default Angular sanitizer, also, on the admin panel itself, show the verbatim text of the message. This solves a mild Stored-XSS vulnerability whereby a user could put `<script>` tags in a message. We don't want that, but we do want to be able to use basic html tags.	2018-08-22 10:15:50 +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
Jessica Lawshe	484d7acbc8	Merge pull request #817 from sharelatex/jel-mixins ... Add a mixin for FAQ search and move links mixin file	2018-08-21 11:44:30 -05:00
Jessica Lawshe	b145ca5d5c	Merge pull request #791 from sharelatex/jel-pagination ... Add pagination mixin and color variables	2018-08-21 11:44:15 -05:00
Paulo Reis	54e0a7cfd2	Merge branch 'master' into pr-change-free-history-limits	2018-08-21 11:23:28 +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
Jessica Lawshe	09efced352	Add pagination mixin and color variables	2018-08-20 09:25:33 -05:00
Paulo Jorge Reis	53a9a174a2	Merge pull request #821 from sharelatex/as-account-deletion-note ... Add message about deleting SL account affecting v2 account	2018-08-20 13:58:50 +01:00
Jessica Lawshe	45cc278acb	Add FAQ search mixin	2018-08-17 16:31:06 -05:00
Jessica Lawshe	f8b85cb848	Move link mixins to mixins folder	2018-08-17 16:12:24 -05:00
Timothée Alby	9d3e649710	Merge pull request #825 from sharelatex/ta-skip-affiliation-on-create ... Skip Affiliation on Create	2018-08-17 17:50:17 +02: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
Jessica Lawshe	5b5ece37a5	Handle sixpack timeouts and include variant in metabase segmentation ... Render default when sixpack timesout Only convert when variant exists Use Angular cookies module to add variant cookie, which is used on the new subscription page.	2018-08-17 10:29:45 -05:00
Paulo Reis	96aa418b94	Show upgrade prompts when the free history limit is hit.	2018-08-17 16:04:31 +01:00
Paulo Reis	fc424aee9e	Adapt styles to avoid layout breaking/showing options that do not make sense when no history entries are loaded.	2018-08-17 15:31:59 +01:00
Alasdair Smith	9bc3fa2df0	Pass req to preDoPassportLogin module hook	2018-08-17 12:04:05 +01:00
Alasdair Smith	b9e63421a8	Merge pull request #814 from sharelatex/as-fix-delete-modal-copy ... Fix delete wording on archive modal	2018-08-16 16:33:30 +01:00
Alasdair Smith	38689dbb1d	Merge pull request #802 from sharelatex/as-sl-redirect ... Add feature flag for redirecting SL to v2	2018-08-16 16:32:55 +01:00
Alasdair Smith	3b31125a62	Add message about deleting account affecting v2 ... Only show on SL and if the user has linked accounts	2018-08-16 14:11:43 +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
Paulo Reis	02701a996d	Merge branch 'master' into pr-history-labels-part-2	2018-08-16 11:56:36 +01:00
Paulo Reis	652be9efe6	Slightly adapt the markup for the generic history error.	2018-08-16 11:41:19 +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
Paulo Reis	23bb866988	Show an error message when history fails to load updates.	2018-08-16 11:26:34 +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
Alasdair Smith	985344c0d7	Use redirect setting instead of re-using setting that coincidentally would be flipped on the same day	2018-08-15 15:22:06 +01:00