Commit Graph

9302 Commits

Author SHA1 Message Date
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
Alasdair Smith f5e34630f8 Merge pull request #806 from sharelatex/as-deprecated-sl-homepage
Update homepage to deprecate SL
2018-08-28 11:02:03 +01:00
Alasdair Smith bccdb70452 Merge pull request #845 from sharelatex/as-update-sl-onboarding-copy
Basic controller for account merge checker
2018-08-28 11:01:48 +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
Paulo Reis 2fbcaebac7 More adjustments; style the dashboard. 2018-08-27 12:39:53 +01: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 e88b840da7 Update gitignore with the light theme generated CSS file. 2018-08-24 12:07:14 +01:00
Paulo Reis d527249833 Style the editor. 2018-08-24 12:06:56 +01:00
Paulo Reis 7c95de29cd Avoid breaking the page if isnt set. 2018-08-24 12:06:26 +01:00
Paulo Reis 128c825bbf Create flag for light theme. 2018-08-24 12:05:37 +01:00
Alasdair Smith 1fb0471327 Don't default to having OL account in account checker 2018-08-24 10:57:03 +01:00
Alasdair Smith 59910320fe Basic controller for account merge checker 2018-08-24 10:57:03 +01:00
Alasdair Smith 066d7293eb Add margin above card on mobile view 2018-08-24 10:39:30 +01:00
Alasdair Smith 17ab35ab37 Increase margin between CTA and message 2018-08-24 10:23:47 +01:00
Alasdair Smith f6cae39dcb Adjust styling for updated copy 2018-08-24 10:23:47 +01:00
Alasdair Smith 6547c40c34 Style CTAs in new container and remove hr 2018-08-24 10:23:47 +01:00
Alasdair Smith 882ea46277 Add divider between deprecated text and features 2018-08-24 10:23:47 +01:00
Alasdair Smith f60d565d2e Updated styles for rearranged homepage 2018-08-24 10:23:47 +01:00
Alasdair Smith 0b507a541d First pass at redoing the homepage for deprecating SL 2018-08-24 10:23:47 +01:00
Nate Stemen c646c3e1ec rename selector for learn more footer 2018-08-23 13:02:42 -04: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
Timothée Alby 740571475c Merge pull request #839 from sharelatex/hb-fetch-licences-graph
Fetch licences graph data from v1
2018-08-23 17:13:25 +02:00
Hugh O'Brien 29253c5a93 Merge branch 'master' into hb-fetch-licences-graph 2018-08-23 16:11:43 +01:00
Timothée Alby ed1dd85663 Merge pull request #829 from sharelatex/ta-affiliation-empty
Always return an Array when Getting Affiliations
2018-08-23 17:04:48 +02: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
Jessica Lawshe 68deee1073 More specific CSS selection and style <pre>
More specific CSS selection r educes margin on other list items

Better distinguish <pre> content on blog
2018-08-22 13:13:16 -05:00
Ersun Warncke 8f21ab7f10 add overleaf method 2018-08-22 13:44:40 -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 cfaa8444db null check path when building a pdf download url
if there is an error just the domain is currently returned, empty string
is better for us
2018-08-22 16:45:59 +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