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
Paulo Reis
0df5c61c44
Add a placeholder restore button, showing a tooltip.
2018-08-28 21:35:35 +01:00
Jessica Lawshe
70b19b2584
Remove unused plans style
2018-08-28 12:42:09 -05: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
Tim Alby
5821ac7e54
change email regex used in affiliations front-end
...
Make it consistent with back-end regex
2018-08-28 15:37:20 +02: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
76fcee721e
Update unit tests.
2018-08-28 14:24:05 +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
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
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
