Commit Graph

  • 5481ceefdd Copy static assets from v1 Alasdair Smith 2018-09-21 14:59:47 +01:00
  • 1c1d5065a2 Move to publi/img dir Alasdair Smith 2018-09-21 14:59:25 +01:00
  • 11fd4f9a66 Copy overleaf partner files Alasdair Smith 2018-09-21 14:17:39 +01:00
  • a2ed46a394 Add atlassian & google verification files Alasdair Smith 2018-09-21 14:01:26 +01:00
  • 035109177a Merge pull request #950 from sharelatex/as-fix-navbar-logic James Allen 2018-09-21 13:07:49 +01:00
  • 945894e89e Reset showNavItem bool if fails check Alasdair Smith 2018-09-21 12:53:57 +01:00
  • 91ee445277 Merge pull request #936 from sharelatex/cmg-gallery-styling James Allen 2018-09-21 11:06:25 +01:00
  • af0d67d379 Change styles to accommodate masonry changes Chrystal Griffiths 2018-09-21 10:50:46 +01:00
  • 772ac42005 Fix messed up rebase James Allen 2018-09-21 10:42:20 +01:00
  • 525aa9fd3a Merge pull request #946 from sharelatex/as-chrome-redirect James Allen 2018-09-21 10:36:09 +01:00
  • 3462b8042e Add /chrome redirect to match v1 behaviour Alasdair Smith 2018-09-20 16:30:20 +01:00
  • c0dee4508e Merge pull request #949 from sharelatex/jel-blog-style-tag-figure James Allen 2018-09-21 10:34:00 +01:00
  • 4b9038ed50 Don't let caption titles overflow Alasdair Smith 2018-09-19 18:10:36 +01:00
  • 5f665252d5 Add margin-bottom to tags Chrystal Griffiths 2018-09-18 10:13:55 +01:00
  • 2d9cadb487 Merge pull request #935 from sharelatex/as-teams-redirect James Allen 2018-09-21 08:37:10 +01:00
  • 4d00227924 Merge pull request #945 from sharelatex/sk-disable-public-registration James Allen 2018-09-21 08:37:02 +01:00
  • 51ed62851c Style <figures> on blog Jessica Lawshe 2018-09-20 19:50:31 -05:00
  • 87b047e368 Add padding-bottom to blog tags Jessica Lawshe 2018-09-20 19:36:14 -05:00
  • 987451aba9 Content pages link color Jessica Lawshe 2018-09-20 17:30:50 -05:00
  • 3c3525fae5 Merge pull request #943 from sharelatex/jel-nav-content-pages Jessica Lawshe 2018-09-20 11:17:38 -05:00
  • bfcb91e60f Hide content page links in nav when on dash Jessica Lawshe 2018-09-19 15:37:57 -05:00
  • 46b14064a0 Merge pull request #898 from sharelatex/cmg-portal-templates Jessica Lawshe 2018-09-20 11:15:38 -05:00
  • 6f794c32e1 Fix tab link hover styles applying to all children Alasdair Smith 2018-09-20 14:53:23 +01:00
  • bc1a8953a1 Remove fixed heights, moving to masonry layout Alasdair Smith 2018-09-20 14:53:07 +01:00
  • 89c381086b Remove fixed height and add masonry-based layout Jessica Lawshe 2018-09-18 16:07:47 -05:00
  • 6cbab69444 Remove style covered by autoprefixer Chrystal Griffiths 2018-09-13 16:14:13 +01:00
  • ed7c5f32b0 Move styles on element to class Alasdair Smith 2018-09-13 11:28:48 +01:00
  • 630f15e8ea Fix flex links not overflowing correctly and refactor Alasdair Smith 2018-09-13 11:15:31 +01:00
  • 6576d95e27 Don't stretch images Chrystal Griffiths 2018-09-12 11:48:49 +01:00
  • 82cd857e83 Set fixed height for portal titles Chrystal Griffiths 2018-09-06 15:53:34 +01:00
  • eff7b4d59e Add the enableLegacyRegistration option to acceptance test settings Shane Kilkelly 2018-09-20 15:34:14 +01:00
  • 488886c1d2 Merge pull request #929 from sharelatex/jel-homepage Jessica Lawshe 2018-09-20 09:01:13 -05:00
  • d2af2fb630 Merge pull request #927 from sharelatex/jel-plans-updates Jessica Lawshe 2018-09-20 09:00:58 -05:00
  • 50e53a57a3 Add advocate image Jessica Lawshe 2018-09-19 15:07:16 -05:00
  • c408b14bc5 Homepage images Jessica Lawshe 2018-09-17 18:47:30 -05:00
  • d023150b0f Add v2 homepage Jessica Lawshe 2018-09-17 18:08:34 -05:00
  • 4640756fb8 Add .btn-xl styling Jessica Lawshe 2018-09-17 18:08:11 -05:00
  • f60f48e396 Add .alert-alt styling Jessica Lawshe 2018-09-17 18:07:57 -05:00
  • ffe09f7349 Merge pull request #930 from sharelatex/ew-sso James Allen 2018-09-20 07:44:58 +01:00
  • 256e374af0 update shrinkwrap Ersun Warncke 2018-09-19 12:13:14 -04:00
  • 48eb49a763 add sso passport modules Ersun Warncke 2018-09-18 03:43:02 -04:00
  • 5c69b6d12c temporarily disable syntax checking Brian Gough 2018-09-19 10:51:35 +01:00
  • 7781181ab9 Merge pull request #941 from sharelatex/sk-fix-removed-js-module Shane Kilkelly 2018-09-19 14:11:23 +01:00
  • eb128e6d1b This module has been removed. Remove from the main frontend bundle too Shane Kilkelly 2018-09-19 14:01:06 +01:00
  • 3fb9abed7f Merge pull request #940 from sharelatex/revert-917-hb-confirm-email-notification Hugh O'Brien 2018-09-19 12:34:30 +01:00
  • 8805447bb9 Revert "Add notification to confirm unconfirmed emails" Hugh O'Brien 2018-09-19 12:28:39 +01:00
  • 98be2c2bf5 Update wording and endpoint for change password form Douglas Lovell 2018-09-19 07:58:04 -03:00
  • b377b89447 Merge pull request #933 from sharelatex/bg-avoid-exception-for-no-emails Hugh O'Brien 2018-09-19 11:33:03 +01:00
  • 78ad6e7e5c Merge pull request #915 from sharelatex/hb-affiliation-cta Hugh O'Brien 2018-09-19 11:32:55 +01:00
  • 18e706c4b2 Merge pull request #917 from sharelatex/hb-confirm-email-notification Hugh O'Brien 2018-09-19 11:32:44 +01:00
  • 9852a916da Merge pull request #907 from sharelatex/sk-email-based-account-merge Shane Kilkelly 2018-09-19 09:39:23 +01:00
  • e1c3689aec Update the email-merge email template Shane Kilkelly 2018-09-18 13:50:25 +01:00
  • 2ec7747b60 Add a help link to the account-merge email in case of error Shane Kilkelly 2018-09-14 15:44:38 +01:00
  • c95d925d56 When regenerating session, don't copy the __tmp key Shane Kilkelly 2018-09-13 12:31:59 +01:00
  • c9e3418049 Working overleaf-side of account-merge Shane Kilkelly 2018-09-13 11:45:31 +01:00
  • fcfcbdb4c5 Remove dead code Shane Kilkelly 2018-09-14 09:54:14 +01:00
  • fc0a4298f1 Move scripts related to account-merge checker to relevant modules Shane Kilkelly 2018-09-13 16:16:22 +01:00
  • d0be98e89c Move the account-merge-finish page to the integration module Shane Kilkelly 2018-09-13 15:42:25 +01:00
  • 677b3c759d Remove old controller Shane Kilkelly 2018-09-13 09:33:44 +01:00
  • 843f1c6b35 Move AccountMergeEmailController to integration module Shane Kilkelly 2018-09-13 09:26:16 +01:00
  • 54a5c563fb Address feedback Shane Kilkelly 2018-09-12 11:08:48 +01:00
  • b0e4b12714 Finish off the copy of the account-merge-finish page Shane Kilkelly 2018-09-11 11:32:04 +01:00
  • 5e17dfd1cb Also add the final email to the array of emails on the account Shane Kilkelly 2018-09-11 10:31:40 +01:00
  • efb6018246 Add a rate-limit to the email-confirm endpoint Shane Kilkelly 2018-09-11 10:31:27 +01:00
  • 6cfe68db26 Roughly working account-merge-by-email callback endpoint Shane Kilkelly 2018-09-11 09:54:13 +01:00
  • 958c7a19b6 Add a skeleton of a callback endpoint for merging accounts via email Shane Kilkelly 2018-09-10 11:41:03 +01:00
  • ba221a1135 WIP: add email-based account merge flow to ShareLaTeX Shane Kilkelly 2018-09-10 10:58:50 +01:00
  • bdcc25805e Add route to handle /teams similar to v1 Alasdair Smith 2018-09-18 17:14:37 +01:00
  • 02854274a7 Brian Gough 2018-09-18 13:57:11 +01:00
  • 4abbc5d569 Password change form conditioned on installation Douglas Lovell 2018-09-18 09:10:33 -03:00
  • 277225d8de use existing left sidebar controller for affiliation cta hugh-obrien 2018-09-18 13:06:26 +01:00
  • b16cffe587 Merge pull request #932 from sharelatex/as-redirect-query-string Timothée Alby 2018-09-18 12:35:21 +01:00
  • b6925647ef Merge pull request #922 from sharelatex/ta-forbid-null-query Timothée Alby 2018-09-18 12:24:19 +01:00
  • 7981d867e8 Merge pull request #924 from sharelatex/ta-sign-in-v1 Timothée Alby 2018-09-18 12:24:08 +01:00
  • 7e358ab318 Support passing through query params Alasdair Smith 2018-09-18 11:32:31 +01:00
  • a32762bba1 Merge pull request #931 from sharelatex/hb-s1-ui-form Hugh O'Brien 2018-09-18 11:21:14 +01:00
  • 2d40c3d21a Use existing notification styling hugh-obrien 2018-09-18 10:54:13 +01:00
  • f76ff55b6f email alert styling hugh-obrien 2018-09-14 11:10:25 +01:00
  • e343c04423 add notification to confirm unconfirmed emails hugh-obrien 2018-09-13 14:44:28 +01:00
  • 39f580d6ba fixing broken exports test hugh-obrien 2018-09-18 10:13:33 +01:00
  • 6f00d1f45a send required export fields for s1 submission hugh-obrien 2018-09-18 10:05:35 +01:00
  • 203c005f26 Merge pull request #928 from sharelatex/jel-content-updates Jessica Lawshe 2018-09-17 13:16:52 -05:00
  • 6fc7468b02 Thousands of templates Jessica Lawshe 2018-09-17 08:56:19 -05:00
  • 4f5c12e9ac More specific group contact controller name and email subject Jessica Lawshe 2018-09-17 08:55:13 -05:00
  • 08a9534f8c Vertically align universities list items Jessica Lawshe 2018-09-17 10:45:59 -05:00
  • fee2a1f401 Merge pull request #912 from sharelatex/ja-improve-redirect-logic James Allen 2018-09-17 16:41:58 +01:00
  • 66bfbce45f Correct link mixin paths Jessica Lawshe 2018-09-17 09:43:02 -05:00
  • 15103ac894 Support the same URL with multiple methods in redirects James Allen 2018-09-17 15:34:35 +01:00
  • 83a1039b7e Add acceptance tests for RedirectManager James Allen 2018-09-12 15:35:30 +01:00
  • 40f08d1592 Add additional functionality to RedirectManager James Allen 2018-09-12 15:25:17 +01:00
  • 784984dd78 Merge pull request #923 from sharelatex/cmg-share-modal Chrystal Maria Griffiths 2018-09-17 15:19:44 +01:00
  • 42cef8e393 Merge pull request #920 from sharelatex/mm-gallery-exports Alasdair Smith 2018-09-17 09:42:26 +01:00
  • e1e7091f30 Merge pull request #905 from sharelatex/as-project-intelligent-redirect Alasdair Smith 2018-09-17 09:40:52 +01:00
  • 7d10e64840 Alter endpoint for account settings, change password form submission. Douglas Lovell 2018-09-14 16:19:02 -03:00
  • aacb54d54c Merge branch 'master' into ho-docker Henry Oswald 2018-09-14 16:49:12 +01:00
  • 3b729c7b9c Merge pull request #925 from sharelatex/jel-sanitize-videos Jessica Lawshe 2018-09-14 11:11:37 -05:00
  • c8b803681e Set max-width for <video> on CMS pages Jessica Lawshe 2018-09-14 10:48:56 -05:00
  • bcd465a35d Allow <video> and <source> in sanitized HTML Jessica Lawshe 2018-09-14 10:24:06 -05:00
  • 09c92c0b69 don't encode / Tim Alby 2018-09-14 16:09:24 +01:00
  • 2e4d3d7aab change links to v1 to sign user in first Tim Alby 2018-09-14 14:09:43 +01:00