Commit Graph

6049 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
Shane Kilkelly 33a4882bd3 Update the color and wording of the warning message shown on SL 2018-08-29 09:08:44 +01:00
Paulo Reis 0df5c61c44 Add a placeholder restore button, showing a tooltip. 2018-08-28 21:35:35 +01:00
Jessica Lawshe e1fbef6910 Move style from winning test variant to main class
`.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`.

Also alphabetize CSS classes.

Remove .more-details and extra .container from layout

CSS statements for .more-details were moved to .plans
2018-08-28 12:42:09 -05:00
Jessica Lawshe ae85bfafef Move FAQ to partial 2018-08-28 12:42:09 -05:00
Jessica Lawshe e5c3d72e1a Move winning variant layout to main layout 2018-08-28 12:42:09 -05:00
Jessica Lawshe 8889f2aed2 Remove Plans and Pricing A/B Test
Remove all layouts, analytics events, and scope related to the A/B test.

The group modal from the default layout of the A/B test should be maintained though for v2.
2018-08-28 12:42:09 -05:00
Paulo Reis f3a4c7f2ed Remove debug line. 2018-08-28 17:08:46 +01:00
Tim Alby 204423696d increase spacing between buttons 2018-08-28 17:34:49 +02:00
Paulo Reis 32ff66b0dd Add two more font-size options to the editor. 2018-08-28 14:52:25 +01:00
Henry Oswald 425017930a catch newsletter email change error if user already exists on mailing list 2018-08-28 14:26:51 +01:00
Paulo Reis 90b353298d Switch themes at runtime. 2018-08-28 14:12:00 +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
Paulo Reis 307a98851d Nest the overall theme property under ace. 2018-08-28 10:10:16 +01:00
Nate Stemen 465b9aefc5 use match in one case and remove and operator 2018-08-27 16:48:44 -04: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 64c29787c0 Add i18n; update the review icon image. 2018-08-27 15:57:51 +01: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
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
Nate Stemen c034b0654b Merge branch 'master' into ns-remove-wufoo-log-links 2018-08-24 09:18:48 -04:00
Paulo Reis 2491bee38e Merge branch 'master' into pr-v2-light-theme 2018-08-24 12:11:16 +01:00
Paulo Reis 7c95de29cd Avoid breaking the page if isnt set. 2018-08-24 12:06:26 +01:00
Nate Stemen 6d00f38a71 move typeform survey to google forms 2018-08-23 12:34:13 -04:00
Nate Stemen 80c74ce07b add back learn more link 2018-08-23 11:42:00 -04: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
Jessica Lawshe 787f0fe239 Add dashboard link mixin 2018-08-22 16:35:06 -05:00
Nate Stemen 6d3b7cbe7b remove wufoo latex log responses 2018-08-22 15:45:08 -04: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
Paulo Reis a15706ce24 Merge branch 'master' into pr-v2-light-theme 2018-08-22 11:19:01 +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