Commit Graph

7684 Commits

Author SHA1 Message Date
Alasdair Smith a2ed46a394 Add atlassian & google verification files 2018-09-21 14:01:26 +01:00
James Allen 035109177a Merge pull request #950 from sharelatex/as-fix-navbar-logic
Fix plans & pricing showing for logged in users
2018-09-21 13:07:49 +01:00
Alasdair Smith 945894e89e Reset showNavItem bool if fails check 2018-09-21 12:53:57 +01:00
James Allen 91ee445277 Merge pull request #936 from sharelatex/cmg-gallery-styling
Extra v2 gallery styling
2018-09-21 11:06:25 +01:00
Chrystal Griffiths af0d67d379 Change styles to accommodate masonry changes 2018-09-21 10:50:46 +01:00
James Allen 772ac42005 Fix messed up rebase 2018-09-21 10:42:20 +01:00
James Allen 525aa9fd3a Merge pull request #946 from sharelatex/as-chrome-redirect
Add /chrome redirect to match v1 behaviour
2018-09-21 10:36:09 +01:00
Alasdair Smith 3462b8042e Add /chrome redirect to match v1 behaviour 2018-09-21 10:35:43 +01:00
James Allen c0dee4508e Merge pull request #949 from sharelatex/jel-blog-style-tag-figure
Blog tag and <figure> styling
2018-09-21 10:34:00 +01:00
Alasdair Smith 4b9038ed50 Don't let caption titles overflow 2018-09-21 10:19:40 +01:00
Chrystal Griffiths 5f665252d5 Add margin-bottom to tags 2018-09-21 10:16:03 +01:00
James Allen 2d9cadb487 Merge pull request #935 from sharelatex/as-teams-redirect
Add route to handle /teams similar to v1
2018-09-21 08:37:10 +01:00
James Allen 4d00227924 Merge pull request #945 from sharelatex/sk-disable-public-registration
Add the enableLegacyRegistration option to acceptance test settings
2018-09-21 08:37:02 +01:00
Jessica Lawshe 51ed62851c Style <figures> on blog
Mimic v1 styling
2018-09-20 19:50:31 -05:00
Jessica Lawshe 87b047e368 Add padding-bottom to blog tags 2018-09-20 19:36:14 -05:00
Jessica Lawshe 3c3525fae5 Merge pull request #943 from sharelatex/jel-nav-content-pages
Hide content page links in nav when on dash
2018-09-20 11:17:38 -05:00
Jessica Lawshe bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -05:00
Jessica Lawshe 46b14064a0 Merge pull request #898 from sharelatex/cmg-portal-templates
Set fixed height for portal titles
2018-09-20 11:15:38 -05:00
Alasdair Smith 6f794c32e1 Fix tab link hover styles applying to all children 2018-09-20 15:41:41 +01:00
Alasdair Smith bc1a8953a1 Remove fixed heights, moving to masonry layout 2018-09-20 15:41:41 +01:00
Jessica Lawshe 89c381086b Remove fixed height and add masonry-based layout 2018-09-20 15:41:41 +01:00
Chrystal Griffiths 6cbab69444 Remove style covered by autoprefixer 2018-09-20 15:41:41 +01:00
Alasdair Smith ed7c5f32b0 Move styles on element to class 2018-09-20 15:41:41 +01:00
Alasdair Smith 630f15e8ea Fix flex links not overflowing correctly and refactor 2018-09-20 15:41:41 +01:00
Chrystal Griffiths 6576d95e27 Don't stretch images 2018-09-20 15:41:41 +01:00
Chrystal Griffiths 82cd857e83 Set fixed height for portal titles 2018-09-20 15:41:41 +01:00
Shane Kilkelly eff7b4d59e Add the enableLegacyRegistration option to acceptance test settings 2018-09-20 15:34:14 +01:00
Jessica Lawshe 488886c1d2 Merge pull request #929 from sharelatex/jel-homepage
Add Homepage
2018-09-20 09:01:13 -05:00
Jessica Lawshe d2af2fb630 Merge pull request #927 from sharelatex/jel-plans-updates
Plans page updates
2018-09-20 09:00:58 -05:00
Jessica Lawshe 50e53a57a3 Add advocate image 2018-09-20 08:57:07 -05:00
Jessica Lawshe c408b14bc5 Homepage images 2018-09-20 08:57:07 -05:00
Jessica Lawshe d023150b0f Add v2 homepage
Specific homepage filenames and redirect to login when not found

Move variables to shared file

Move circle image styling to shared file

Leaving float on plans page because of some layout differences
2018-09-20 08:57:07 -05:00
Jessica Lawshe 4640756fb8 Add .btn-xl styling 2018-09-20 08:57:06 -05:00
Jessica Lawshe f60f48e396 Add .alert-alt styling 2018-09-20 08:57:06 -05:00
James Allen ffe09f7349 Merge pull request #930 from sharelatex/ew-sso
NPM modules for google, orcid, and twitter SSO
2018-09-20 07:44:58 +01:00
Ersun Warncke 256e374af0 update shrinkwrap 2018-09-19 12:13:14 -04:00
Ersun Warncke 48eb49a763 add sso passport modules 2018-09-19 10:20:27 -04:00
Shane Kilkelly 7781181ab9 Merge pull request #941 from sharelatex/sk-fix-removed-js-module
This module has been removed. Remove from the main frontend bundle too
2018-09-19 14:11:23 +01:00
Shane Kilkelly eb128e6d1b This module has been removed. Remove from the main frontend bundle too 2018-09-19 14:01:06 +01:00
Hugh O'Brien 3fb9abed7f Merge pull request #940 from sharelatex/revert-917-hb-confirm-email-notification
Revert "Add notification to confirm unconfirmed emails"
2018-09-19 12:34:30 +01:00
Hugh O'Brien 8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01:00
Hugh O'Brien b377b89447 Merge pull request #933 from sharelatex/bg-avoid-exception-for-no-emails
fix exception when user has no emails field
2018-09-19 11:33:03 +01:00
Hugh O'Brien 78ad6e7e5c Merge pull request #915 from sharelatex/hb-affiliation-cta
Replace profile completion CTA with affiliations CTA
2018-09-19 11:32:55 +01:00
Hugh O'Brien 18e706c4b2 Merge pull request #917 from sharelatex/hb-confirm-email-notification
Add notification to confirm unconfirmed emails
2018-09-19 11:32:44 +01:00
Shane Kilkelly 9852a916da Merge pull request #907 from sharelatex/sk-email-based-account-merge
Email based account merge
2018-09-19 09:39:23 +01:00
Shane Kilkelly e1c3689aec Update the email-merge email template 2018-09-19 09:28:59 +01:00
Shane Kilkelly 2ec7747b60 Add a help link to the account-merge email in case of error 2018-09-19 09:28:59 +01:00
Shane Kilkelly c95d925d56 When regenerating session, don't copy the __tmp key 2018-09-19 09:28:59 +01:00
Shane Kilkelly c9e3418049 Working overleaf-side of account-merge 2018-09-19 09:28:59 +01:00
Shane Kilkelly fcfcbdb4c5 Remove dead code 2018-09-19 09:28:59 +01:00