Commit Graph

7488 Commits

Author SHA1 Message Date
Douglas Lovell 91e653dafc Limit width and margin publish model form controls to the enclosing box 2018-08-31 18:36:53 -03:00
Douglas Lovell c570daf03b Remove unneeded include from ol-style 2018-08-31 18:36:19 -03:00
Douglas Lovell 1e31f5dc1c Move new publish-model styles into existing style file 2018-08-31 15:35:24 -03:00
Douglas Lovell 92548be044 Use hyphen for underscore in publish-modal style 2018-08-31 14:16:43 -03:00
Douglas Lovell 404e768d24 Merge branch 'master' into dcl-olsl760b 2018-08-31 14:04:00 -03:00
Douglas Lovell 2b9e978379 Repair syntax and additional publish-modal style 2018-08-31 13:59:47 -03:00
Douglas Lovell 135d7e75a5 Merge branch 'master' into dcl-olsl760b 2018-08-31 13:24:22 -03:00
Timothée Alby 855840d89a Merge pull request #883 from sharelatex/ta-domain-licence-join-fix
Fix id Accessor in Domain Licence Join Page
2018-08-31 13:15:23 +02:00
Timothée Alby 012d341df6 Merge pull request #881 from sharelatex/ho-change-email-fire-forget
change email: catch invalid emails and don't pass the error back on invalid requests
2018-08-31 13:15:16 +02:00
Timothée Alby 59b137e303 Merge pull request #877 from sharelatex/pr-fill-university-model-as-you-type
Update university, role and department value as the user types.
2018-08-31 13:15:01 +02:00
Henry Oswald 245ad2a2a8 call changeEmail before the callback in setDefaultEmailAddress 2018-08-31 11:49:45 +01:00
Tim Alby 195ae49052 fix id accessor in domain licence join page 2018-08-31 11:41:28 +01:00
Henry Oswald bab334aa44 fire and forget changeEmail in setDefaultEmailAddress
prevents blocking/erroring the change email workflow
2018-08-31 11:16:28 +01:00
Henry Oswald 038b18a209 change email: catch invalid emails and don't pass the error back on invalid requests 2018-08-31 11:06:55 +01:00
Jessica Lawshe e7b3d31acb Merge pull request #852 from sharelatex/jel-plans-pricing-v2
Add v2 Plans and Pricing
2018-08-30 14:37:29 -05:00
Jessica Lawshe dff29637b7 Move quotes to partial 2018-08-30 09:52:55 -05:00
Jessica Lawshe bac90c0976 Move v2 plans redirect to router 2018-08-30 09:52:55 -05:00
Jessica Lawshe ec710d0b1e Add switch button styling 2018-08-30 09:52:55 -05:00
Jessica Lawshe a87b5a629a v2 plans style overrides and capitalize "Best Value" 2018-08-30 09:52:55 -05:00
Jessica Lawshe eb8e279ac7 Add border styling 2018-08-30 09:52:55 -05:00
Jessica Lawshe 7d249f513b Remove Positive SSL badge for v2 2018-08-30 09:52:55 -05:00
Jessica Lawshe 3a2c9a3830 Plans features table styling for v2 2018-08-30 09:52:55 -05:00
Jessica Lawshe c1d37a712c Update translations to use appName 2018-08-30 09:52:55 -05:00
Jessica Lawshe bc89d8fb11 Add .nav-pills styling for v2 2018-08-30 09:52:55 -05:00
Jessica Lawshe a2a98e0be1 Add @brand-secondary color 2018-08-30 09:52:55 -05:00
Jessica Lawshe c920dc37d2 Update button classes for v2
Use `.btn-default` instead of `.btn-info`
2018-08-30 09:52:55 -05:00
Jessica Lawshe 26f2ff3d6f Unlink instapages for v2 FAQ and add group contact modal
group contact link: v2 opens contact portal and SL opens instapage
2018-08-30 09:52:50 -05:00
Jessica Lawshe fe9709e5c7 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-30 09:36:35 -05:00
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