Commit graph

7408 commits

Author SHA1 Message Date
Jessica Lawshe
cf8376f213 Merge pull request #840 from sharelatex/jel-blog-style
Blog style
2018-08-29 12:24:04 -05:00
Jessica Lawshe
a5d84ecc0a Merge pull request #842 from sharelatex/jel-portals-user-affiliation
Add dashboard link mixin
2018-08-29 12:23:50 -05:00
Jessica Lawshe
1230750961 Merge pull request #865 from sharelatex/jel-sanitize-html
Add default sanitize HTML options
2018-08-29 12:23:32 -05:00
Ersun Warncke
9feb8ef39f Revert "Merge pull request #843 from sharelatex/ew-collabratec"
This reverts commit 223beab491d2f8dcf4c7285267fda355cfce3f05, reversing
changes made to a726537c4372641bfca0eb37fc130ca3a932d433.
2018-08-29 12:00:53 -04:00
Ersun Warncke
afc22dc5c2 Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy"
This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing
changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.
2018-08-29 12:00:20 -04:00
Ersun Warncke
e7eefc0474 Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy
set options and method for request, pass cookies and form body
2018-08-29 10:17:21 -04:00
Ersun Warncke
c1859f3e80 Merge pull request #843 from sharelatex/ew-collabratec 2018-08-29 10:17:02 -04:00
James Allen
6a04800f70 Merge pull request #810 from sharelatex/ja-v2-templates
Split out feature flags into publish and view templates
2018-08-29 10:27:23 +01:00
Shane Kilkelly
1848befcb7 Merge branch 'sk-flush-when-refreshing-linked-file' 2018-08-29 09:27:05 +01:00
Shane Kilkelly
6ee2a83885 Merge pull request #856 from sharelatex/ns-use-regex-test
Use regex test instead of string match
2018-08-29 09:21:40 +01:00
Shane Kilkelly
b8ff6ae9a2 Merge pull request #862 from sharelatex/ta-increase-space
Increase Spacing Between Buttons
2018-08-29 09:21:31 +01:00
Shane Kilkelly
2c782fee67 Merge pull request #858 from sharelatex/sk-update-v2-migration-banner
Update the color and wording of the warning message shown on SL
2018-08-29 09:21:19 +01:00
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
Jessica Lawshe
98f98483ef Add default sanitize options 2018-08-28 17:23:55 -05:00
Tim Alby
204423696d increase spacing between buttons 2018-08-28 17:34:49 +02: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
Timothée Alby
c696ec2688 Merge pull request #854 from sharelatex/ta-affiliations-ui-improvements
Affiliations UI Improvements
2018-08-28 14:03:08 +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
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
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
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
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
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