github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-30 06:05:30 -05:00
Code Issues Projects Releases Packages Wiki Activity
7645 commits 3 branches 7 tags 206 MiB
Commit graph

7645 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Douglas Lovell
f38c637f31 Stylesheet for publish modal 2018-08-29 13:56:16 -03:00
Douglas Lovell
7e86e21107 Stylesheet for publish modal 2018-08-29 13:43:42 -03:00
Paulo Reis
79f1e7b0ee Update ui-select value as the user types. 2018-08-29 17:31:47 +01: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
Henry Oswald
360618a7d3 added a /health_check/mongo endpoint 2018-08-29 11:24:01 +01:00
Alasdair Smith
4174b8edee Update image and adjust size 2018-08-29 10:50:07 +01:00
Alasdair Smith
3dc437d932 More copy updates 2018-08-29 10:50:07 +01:00
Alasdair Smith
ff275e3425 Replace image and improve copy 2018-08-29 10:50:07 +01:00
Alasdair Smith
2e0d6ab305 Remove 2 step modal and make copy more friendly 2018-08-29 10:50:07 +01: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
Paulo Reis
82aa7c30a6 Make sure each pair of radio buttons gets a unique name attribute in the toggle switch directive. 2018-08-29 10:20:40 +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
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