Commit graph

10360 commits

Author SHA1 Message Date
James Allen
52381c8fb7 Merge pull request #851 from sharelatex/jel-remove-a-b-test
Remove Plans and Pricing A/B Test
2018-08-30 15:19:56 +01:00
Douglas Lovell
229626a368 Merge branch 'master' into dcl-olsl760b 2018-08-30 08:04:40 -03:00
Paulo Jorge Reis
cf075b0c42 Merge pull request #878 from sharelatex/ja-hide-bonus-in-v2
Don't suggest bonus page to v2 users
2018-08-30 11:29:41 +01:00
Paulo Jorge Reis
8b64f46807 Merge pull request #861 from sharelatex/ho-mailchimp-change-email
catch newsletter email change error if user already exists on mailing list
2018-08-30 11:29:01 +01:00
Paulo Jorge Reis
10981f0b4e Merge pull request #860 from sharelatex/ta-front-end-email-regex
Change Email Regex in Affiliations Front-End
2018-08-30 11:28:38 +01:00
Paulo Jorge Reis
85ce1d1a11 Merge pull request #867 from sharelatex/pr-fix-togglers-with-v2-history
Set a unique name attribute for the toggle switch directive.
2018-08-30 11:26:32 +01:00
Paulo Jorge Reis
4be364cd93 Merge pull request #864 from sharelatex/pr-history-restore-placeholder
Add a placeholder "restore" button, showing a tooltip.
2018-08-30 11:25:25 +01:00
Paulo Jorge Reis
cb4d4145a1 Merge pull request #855 from sharelatex/pr-v2-light-theme
v2 light theme
2018-08-30 11:24:52 +01:00
Paulo Jorge Reis
8b9397f80c Merge pull request #863 from sharelatex/as-update-v1-import-modal
Update project import modal to be more friendly near the launch
2018-08-30 11:24:44 +01:00
Douglas Lovell
cbb01ef7ad Merge branch 'dcl-olsl760b' of github.com:sharelatex/web-sharelatex-internal into dcl-olsl760b 2018-08-30 07:18:19 -03:00
James Allen
b86ac31c63 Don't suggest bonus page to v2 users 2018-08-30 10:56:31 +01:00
Alasdair Smith
bc1f10a710 Merge pull request #868 from sharelatex/ho-mongo-health-checks
added a /health_check/mongo endpoint
2018-08-30 09:52:20 +01:00
Jessica Lawshe
3a2400b212 Merge pull request #841 from sharelatex/ns-remove-wufoo-log-links
remove wufoo latex error response logging
2018-08-29 12:24:22 -05:00
Jessica Lawshe
ad55842c0a Merge pull request #847 from sharelatex/ns-bye-typeform
move typeform survey to google forms
2018-08-29 12:24:12 -05:00
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
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