Commit graph

7657 commits

Author SHA1 Message Date
Simon Detheridge
56dcbefb5b Check for safe paths in all ProjectEntityHandler methods
Some import mechanisms (for example, Github project import) call methods such as 'upsert*' directly, bypassing existing filename checks.

Added checks to all methods in ProjectEntityHandler that can create or rename a file.

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-08 15:31:04 +01:00
Jessica Lawshe
d9c98aa45e Add default Twitter and OG images 2018-10-08 15:18:18 +01:00
Simon Detheridge
e66210d2af Add method to sanitize full paths
For convenience, add a method to SafePath to break a path into components and verify the status of each one.

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-08 14:48:17 +01:00
Simon Detheridge
50993f59c0 Merge pull request #926 from sharelatex/dcl-i850
Display password change form in Account Settings
2018-10-08 13:59:04 +01:00
Simon Detheridge
9c189303c1 Merge pull request #1002 from sharelatex/spd-email-cta-links
Add additional CTA link to emails
2018-10-08 13:56:21 +01:00
Simon Detheridge
af9c9517f3 Merge pull request #999 from sharelatex/as-validate-password-length
Validate password length
2018-10-08 13:55:25 +01:00
hugh-obrien
f6307f9086 store reversedHostname property and update test accordingly 2018-10-08 13:37:12 +01:00
hugh-obrien
3919acad46 store reversed hostname and review fixes for v2 university domain confirmation 2018-10-08 12:08:29 +01:00
Jessica Lawshe
b78f362c53 Merge pull request #1000 from sharelatex/jel-meta-img-src
Handle image_src in metadata layout
2018-10-08 11:44:10 +01:00
Jessica Lawshe
97cf4886ee Merge pull request #994 from sharelatex/jel-templates-clickable-margins
Styling to increase margins for clickable items on templates pages
2018-10-08 11:43:54 +01:00
Jessica Lawshe
f04212c96f Merge pull request #995 from sharelatex/ta-remove-confirmed-field
remove unused confirmed field from user model
2018-10-08 11:43:42 +01:00
Alasdair Smith
e129172553 Fix ordering of boolean check to be more readable 2018-10-08 11:25:24 +01:00
Jessica Lawshe
8ef7f6c26d Adjust margins to separate clickable items on templates 2018-10-08 11:09:06 +01:00
Alasdair Smith
f26f30e677 Fix spaces instead of tabs 2018-10-08 10:44:26 +01:00
Alasdair Smith
04572f61bb Fix copy/paste error 2018-10-08 10:44:26 +01:00
Alasdair Smith
e37a54e254 Make error message match other styles 2018-10-08 10:44:26 +01:00
Alasdair Smith
8777b0f5f8 Style error message after moving it above inputs 2018-10-08 10:44:26 +01:00
Alasdair Smith
af499e4539 Style error message on register form 2018-10-08 10:44:26 +01:00
Alasdair Smith
2edca417b1 Reduce padding 2018-10-08 10:44:25 +01:00
Alasdair Smith
1ef947b1fe Fix tests after refactoring register validation 2018-10-08 10:44:25 +01:00
Alasdair Smith
676557a051 Refactor to validate in AuthenticationManager 2018-10-08 10:44:25 +01:00
Alasdair Smith
44c86b3769 Refactor to use password strength options 2018-10-08 10:44:25 +01:00
Alasdair Smith
1fe8aebf5b Add error handling for 400 responses 2018-10-08 10:44:25 +01:00
Alasdair Smith
bf60fe7f6c Add error handling for InvalidError 2018-10-08 10:44:25 +01:00
Alasdair Smith
e99165b475 Validate password length when registering 2018-10-08 10:44:25 +01:00
Hugh O'Brien
cc962c3e6f Merge pull request #978 from sharelatex/hb-use-exports-for-pdf-from-publish-modal
Generic Zip or Pdf Exports endpoint
2018-10-08 10:13:18 +01:00
hugh-obrien
65ecdf84f4 cleanup and tests for v2 affiliations confirmation 2018-10-07 16:40:26 +01:00
hugh-obrien
af3cc01496 Lookup users by email hostname using new field 2018-10-06 17:22:39 +01:00
hugh-obrien
026f7eebcd Setting up hostname field and institution domain confirmation endpoint 2018-10-06 15:57:25 +01:00
Tim Alby
c00a0a435d remove console.log in tests 2018-10-05 16:24:28 +01:00
Tim Alby
7b4b75b51a fix incorrect or missing test mocks 2018-10-05 16:24:05 +01:00
Simon Detheridge
286f25529a Remove secondary CTA link from account merge confirmation email
bug: sharelatex/web-sharelatex-internal#987
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-05 13:19:05 +01:00
Simon Detheridge
d316a76106 Revert "add plain text link to email address confirmation emails"
This reverts commit 48cd7e604dcc5f3b7ae8eb699f14b44bc073f107.
2018-10-05 13:16:42 +01:00
Simon Detheridge
a2ef0e1ae5 Add additional CTA link to emails
Some mail clients don't show the CTA button correctly, or at all. Add an additional, smaller link to the bottom of the email for people who can't see the button.

bug: sharelatex/web-sharelatex-internal#987
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-05 12:04:00 +01:00
Chrystal Griffiths
d51549c4f0 Use ng-if to switch between pdf and editor 2018-10-05 11:19:20 +01:00
Jessica Lawshe
6692d06e5f Handle image_src in metadata layout
The CMS is already using `image`, which is an object based on data from the API.
2018-10-05 11:06:21 +01:00
Shane Kilkelly
4c2a90966a Merge pull request #918 from sharelatex/sk-enable-sudo-mode-in-v2
Enable sudo-mode for v2
2018-10-05 10:05:24 +01:00
Simon Detheridge
2b8ce379f8 Lookup correct compiler when importing v1 templates
bug: overleaf/sharelatex#981
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-04 16:42:03 +01:00
Shane Kilkelly
2c47da553b Add an error log if activating sudo-mode on login fails 2018-10-04 15:05:40 +01:00
Shane Kilkelly
778abaff6e Remove stray log 2018-10-04 15:05:40 +01:00
Shane Kilkelly
70b56d0362 Fix up acceptance tests 2018-10-04 15:05:40 +01:00
Shane Kilkelly
2ef23194df WIP: trying to get acceptance tests to pass 2018-10-04 15:05:40 +01:00
Shane Kilkelly
f9ed367148 Move the auth mechanism for sudo-mode into SudoModeHandler 2018-10-04 15:05:40 +01:00
Shane Kilkelly
254d74899b WIP: enable sudo-mode for v2 2018-10-04 15:05:40 +01:00
Chrystal Maria Griffiths
6b8eb0ac23 Merge pull request #996 from sharelatex/jel-meta-img
Update default meta images
2018-10-04 15:01:19 +01:00
Chrystal Maria Griffiths
e932eb074b Merge pull request #992 from sharelatex/as-fix-mathjax
Fix mathjax incorrectly loading config
2018-10-04 15:01:05 +01:00
Chrystal Griffiths
13843f82a0 Use settings appName 2018-10-04 09:57:51 +01:00
Jessica Lawshe
bbe847c16d Update default meta images
Favicons are not picked up by social sites.
2018-10-03 17:34:40 +01:00
Tim Alby
5ff66187a0 remove unused confirmed field from user model 2018-10-03 16:01:30 +01:00
Ersun Warncke
752658f773 Merge pull request #990 from sharelatex/ew-use-v1-doc-info-api
Use v1 Doc Info API for Token Access
2018-10-03 09:22:41 -04:00
Timothée Alby
e3cfa36b56 Merge pull request #984 from sharelatex/ta-email-cta-link
add plain text link to email address confirmation emails
2018-10-03 14:20:05 +01:00
Timothée Alby
c74c782cee Merge pull request #961 from sharelatex/ta-account-sync-affiliations
Add getInstitutionsPlan Function
2018-10-03 14:19:56 +01:00
Alasdair Smith
fb8ed890f9 Correctly load Safe mathjax extention using provided config 2018-10-03 11:52:33 +01:00
Brian Gough
ecdd00ecb9 Merge pull request #980 from sharelatex/jel-viewport-metatag
Add viewport metatag
2018-10-03 10:10:22 +01:00
Brian Gough
2b738907aa Merge pull request #989 from sharelatex/bg-clean-up-broken-project-on-error
clean up broken project on error in ProjectDuplicator
2018-10-03 10:04:30 +01:00
Ersun Warncke
642b45d0d6 use v1 doc info api 2018-10-02 11:16:46 -04:00
Douglas Lovell
4a846e4d87 Merge branch 'master' into dcl-i850 2018-10-02 16:04:39 +01:00
Alasdair Smith
10571b09f3 Merge pull request #979 from sharelatex/jel-content-links
Content pages link colors
2018-10-02 14:07:10 +01:00
Alasdair Smith
f90dd1b49a Merge pull request #986 from sharelatex/as-sign-in-from-v2-post
Remove POST /docs custom handler, now handled by redirects
2018-10-02 14:06:57 +01:00
Brian Gough
4621234220 clean up broken project on error in ProjectDuplicator 2018-10-02 12:14:22 +01:00
Jessica Lawshe
96b4f7edb3 Use viewport metatag on SL pw reset 2018-09-28 15:22:24 -05:00
Jessica Lawshe
40bc5564b6 Use viewport metatag on SL login 2018-09-28 15:14:05 -05:00
Jessica Lawshe
297f61da04 Add viewport metatag 2018-09-28 14:16:32 -05:00
Alasdair Smith
062f26dda3 Remove POST /docs custom handler, now handled by redirects
Implementing a system for signing into v1 via v2 using POSTs so the
unauthenticated route is no longer necessary
2018-09-28 14:11:38 +01:00
Tim Alby
4e9737bf71 add plain text link to email address confirmation emails 2018-09-28 13:36:31 +01:00
Alasdair Smith
1330c8da73 Also check if v1 project exported if not found for read-only tokens 2018-09-28 11:47:14 +01:00
Alasdair Smith
435fe11115 Check if v1 project was exported if not found
This prevents a redirect loop for projects which were exported but then
deleted on v2. v2 would not find the project, redirect to v1, which
would find that it was exported and redirect back to v2.
2018-09-28 11:47:14 +01:00
Brian Gough
6d5908f2f4 Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email
Don't include the license name twice in invite emails
2018-09-28 11:15:40 +01:00
Brian Gough
1f6abd4e69 fix invalid project names when opening templates 2018-09-28 10:38:25 +01:00
Brian Gough
8f8694ad94 iterate over owned projects in a more robust way 2018-09-28 09:48:15 +01:00
Brian Gough
6b80d3563d add support for creating unique project names 2018-09-28 09:48:15 +01:00
Alasdair Smith
45bd46bc01 Merge pull request #977 from sharelatex/as-encode-auth-with-v1-query-strings
Encode redirects which will auth with v1 first
2018-09-28 09:45:54 +01:00
Jessica Lawshe
0ff6ef0748 Ensure Wiki search link color property set on hover 2018-09-27 11:52:38 -05:00
Jessica Lawshe
23c9c719af Update hover color for tabs 2018-09-27 11:52:30 -05:00
Jessica Lawshe
69421cb7b7 Add hover color for content page links 2018-09-27 11:52:09 -05:00
hugh-obrien
52859cdfaa make the zip fetching endpoint for exports generic to either zips or pdfs 2018-09-27 16:11:11 +01:00
Alasdair Smith
4f2c91a59a Add new redirect option to auth with v1, which will urlencode the query string
This is necessary for the GET /docs endpoint, which can be used to send
urls as part of query parameters. If these are not encoded before
redirecting, they can become corrupted.
2018-09-27 12:19:16 +01:00
James Allen
0cb563816d Don't enable legacy blog in v2 2018-09-27 10:56:14 +01:00
Jessica Lawshe
aaac1fabfd Set width for iframes on blog posts 2018-09-26 12:45:50 -05:00
Alasdair Smith
c2ecccfa02 Use correct setting 2018-09-26 17:35:55 +01:00
Alasdair Smith
f2fa83a218 Fix /teams redirect using wrong setting 2018-09-26 17:04:40 +01:00
Alasdair Smith
9c0a888d11 Add custom redirect for /docs
We want to redirect POST and GET to different locations, but this is
unsupported by RedirectManager. Therefore we redirect GETs with
RedirectManager and POSTs with this custom route.
2018-09-26 17:04:40 +01:00
James Allen
8ebfd7882d Add logos for homepage 2018-09-26 10:34:50 +01:00
Jessica Lawshe
208ed3cec8 Merge pull request #967 from sharelatex/jel-content-pages-styling
Content pages styling
2018-09-25 13:42:06 -05:00
Ersun Warncke
a23f0a3d15 fix test failure from merge 2018-09-25 08:54:01 -04:00
Ersun Warncke
7b90fcb186 Merge pull request #969 from sharelatex/ew-check-doc-token-access
check access for doc on read only token
2018-09-25 08:35:56 -04:00
Ersun Warncke
eeed857dd9 change api path 2018-09-25 06:45:27 -04:00
Ersun Warncke
f0c0834b0f only do v1 access check when api config present 2018-09-25 05:42:04 -04:00
Paulo Reis
b8baf1a6f4 Hide front chat widget via code. 2018-09-25 10:30:13 +01:00
James Allen
1d657e1700 Merge pull request #968 from sharelatex/ja-show-register-button
Show register button on OL v2
2018-09-25 10:25:38 +01:00
James Allen
e2f90ba01a Merge pull request #966 from sharelatex/as-no-project-token-based
Redirect logged out users to v1 if project is not found from token based url
2018-09-25 10:25:30 +01:00
Alasdair Smith
298ee2dbb4 Fix v1 return to path 2018-09-25 10:06:24 +01:00
Alasdair Smith
da16e8d01f Add acceptance test for unimported read only token 2018-09-25 09:43:39 +01:00
Alasdair Smith
ca895ae1b1 Redirect to v1 via sign in link 2018-09-25 09:37:22 +01:00
Brian Gough
89ba3912c0 Merge pull request #964 from sharelatex/csh-issue-963-MultipleProjectDownloads
Replace ShareLaTeX with Overleaf in name of multiple project download file
2018-09-25 09:33:53 +01:00
Brian Gough
5947294016 Merge branch 'bg-support-main-file-for-templates' 2018-09-25 09:32:14 +01:00
Brian Gough
a524f99fbf Merge pull request #957 from sharelatex/hb-force-v1-image-templates
Force gallery items to use legacy OL v1 texlive image
2018-09-25 09:27:54 +01:00
Brian Gough
fee9358a45 Merge pull request #939 from sharelatex/bg-temporarily-disable-chktex
temporarily disable syntax checking
2018-09-25 09:27:33 +01:00
Brian Gough
0d4143205d strip quotes from mainFile 2018-09-25 09:05:49 +01:00
James Allen
19b97e953f Show register button on OL v2 2018-09-25 08:29:34 +01:00
Ersun Warncke
f89e85231a check access for doc on read only token 2018-09-24 18:03:28 -04:00
Jessica Lawshe
670129049f Fix text wrapping on quotes 2018-09-24 16:12:13 -05:00
Jessica Lawshe
7fddf58916 Green tab links 2018-09-24 16:05:28 -05:00
Jessica Lawshe
d6126719bc Alternate <hr> color for content pages 2018-09-24 15:59:44 -05:00
Jessica Lawshe
dc9e317f8f Merge pull request #962 from sharelatex/jel-tab-lists
Tab header styling
2018-09-24 14:23:25 -05:00
Jessica Lawshe
16d1c13566 Merge pull request #956 from sharelatex/jel-margins
Margins on content pages
2018-09-24 14:23:10 -05:00
Alasdair Smith
d6350c963e Remove projectExists flag from higher access check
Now that find project by read and read/write token methods check whether
the project exists, it is not neccessary to check whether the project
exists in the higher access check. Therefore it has been removed
2018-09-24 19:00:10 +01:00
Alasdair Smith
99dec02266 If no project found for read/write token, redirect to v1 2018-09-24 19:00:10 +01:00
Alasdair Smith
237810509a If no project found for read token, redirect to v1 2018-09-24 19:00:10 +01:00
Christopher Hoskin
5c35cc9593 Replace ShareLaTeX with Overleaf in name of multiple project download file (Closes: #963) 2018-09-24 16:33:54 +01:00
Jessica Lawshe
530a3b0d44 Tab header styling
li styling was being applied to nested lists in the tab, but this was only meant for the tab headers list
2018-09-24 10:22:22 -05:00
Brian Gough
418bc10a18 allow getting doc paths by project id 2018-09-24 16:04:23 +01:00
Brian Gough
5954e45016 add missing require 2018-09-24 15:44:09 +01:00
Brian Gough
586e3814fe add missing require 2018-09-24 15:27:16 +01:00
Brian Gough
2692090f3f support a mainFile parameter for templates 2018-09-24 15:27:16 +01:00
Tim Alby
51c5228288 add getInstitutionsPlan function 2018-09-24 13:16:31 +01:00
Douglas Lovell
bfb369fab0 Merge branch 'master' into dcl-i850
Conflicts repaired:
app/views/user/settings.pug

modified:   app/coffee/Features/Authentication/AuthenticationController.coffee
modified:   app/coffee/Features/Editor/EditorHttpController.coffee
modified:   app/coffee/Features/Email/EmailBuilder.coffee
modified:   app/coffee/Features/Errors/Errors.coffee
modified:   app/coffee/Features/Exports/ExportsController.coffee
modified:   app/coffee/Features/Exports/ExportsHandler.coffee
modified:   app/coffee/Features/Notifications/NotificationsBuilder.coffee
modified:   app/coffee/Features/Notifications/NotificationsHandler.coffee
modified:   app/coffee/Features/Project/ProjectController.coffee
modified:   app/coffee/Features/StaticPages/HomeController.coffee
modified:   app/coffee/Features/Subscription/planFeatures.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessController.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessHandler.coffee
modified:   app/coffee/Features/User/UserGetter.coffee
modified:   app/coffee/infrastructure/RedirectManager.coffee
modified:   app/coffee/infrastructure/Server.coffee
modified:   app/coffee/models/User.coffee
modified:   app/coffee/router.coffee
modified:   app/views/_mixins/links.pug
modified:   app/views/general/500.pug
modified:   app/views/layout/navbar.pug
modified:   app/views/project/editor/header.pug
modified:   app/views/project/editor/share.pug
modified:   app/views/project/list.pug
modified:   app/views/project/list/modals.pug
modified:   app/views/project/list/notifications.pug
modified:   app/views/project/list/side-bar.pug
modified:   app/views/project/list/v1-item.pug
modified:   app/views/subscriptions/_modal_group_inquiry.pug
modified:   app/views/subscriptions/dashboard.pug
modified:   app/views/user/settings.pug
modified:   config/settings.defaults.coffee
modified:   npm-shrinkwrap.json
modified:   package.json
new file:   public/apple-touch-icon.png
new file:   public/atlassian-domain-verification.html
modified:   public/coffee/ide/editor/directives/aceEditor.coffee
modified:   public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
modified:   public/coffee/ide/share/controllers/ShareController.coffee
modified:   public/coffee/main.coffee
deleted:    public/coffee/main/account-merge-checker.coffee
modified:   public/coffee/main/contact-us.coffee
modified:   public/coffee/main/project-list/left-hand-menu-promo-controller.coffee
new file:   public/google4f15e48c48709a75.html
new file:   public/googleef256f97939bd9b7.html
new file:   public/img/advocates/friend.jpeg
new file:   public/img/grid.png
new file:   public/img/homepage.png
new file:   public/img/homepage@2x.png
new file:   public/img/other-brands/logo_google.svg
new file:   public/img/other-brands/logo_google_alt.svg
new file:   public/img/other-brands/logo_ieee.svg
new file:   public/img/other-brands/logo_orcid.svg
new file:   public/img/other-brands/logo_orcid_alt.svg
new file:   public/img/other-brands/logo_sharelatex.svg
new file:   public/img/other-brands/logo_twitter.svg
new file:   public/img/overleaf-partner/overleaf-greygreen-410.png
new file:   public/img/overleaf-partner/overleaf-white-410.png
new file:   public/static/brochures/Overleaf-Information-v8.pdf
new file:   public/static/brochures/Overleaf-Institutional-Solutions-v1.pdf
new file:   public/static/brochures/Overleaf-Tri-Fold-leaflet.pdf
new file:   public/static/brochures/Overleaf-request-for-service.pdf
new file:   public/static/brochures/Overleaf_Institutional.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-poster.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-poster.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-1.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-2.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-3.pdf
new file:   public/static/partners/caltech-library.gif
new file:   public/static/partners/stanford-building.jpg
modified:   public/stylesheets/_ol_style_includes.less
modified:   public/stylesheets/app/blog-posts.less
modified:   public/stylesheets/app/cms-page.less
new file:   public/stylesheets/app/content_page.less
modified:   public/stylesheets/app/editor/share.less
modified:   public/stylesheets/app/editor/toolbar.less
modified:   public/stylesheets/app/features.less
modified:   public/stylesheets/app/homepage.less
new file:   public/stylesheets/app/login-register.less
modified:   public/stylesheets/app/plans.less
modified:   public/stylesheets/app/portals.less
modified:   public/stylesheets/app/templates-v2.less
modified:   public/stylesheets/app/wiki.less
modified:   public/stylesheets/components/alerts.less
modified:   public/stylesheets/components/buttons.less
modified:   public/stylesheets/components/icons.less
new file:   public/stylesheets/components/images.less
new file:   public/stylesheets/components/tabs.less
modified:   public/stylesheets/core/_common-variables.less
modified:   public/stylesheets/core/ol-variables.less
modified:   public/stylesheets/ol-style.less
modified:   test/acceptance/coffee/ExportsTests.coffee
new file:   test/acceptance/coffee/RedirectUrlsTests.coffee
modified:   test/acceptance/coffee/TokenAccessTests.coffee
modified:   test/acceptance/coffee/helpers/User.coffee
modified:   test/acceptance/config/settings.test.coffee
modified:   test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
modified:   test/unit/coffee/Editor/EditorHttpControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsHandlerTests.coffee
new file:   test/unit/coffee/Notifications/NotificationsBuilderTests.coffee
modified:   test/unit/coffee/Project/ProjectControllerTests.coffee
modified:   test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee
modified:   test/unit/coffee/User/UserGetterTests.coffee
deleted:    test/unit/coffee/infrastructure/RedirectManagerTests.coffee
2018-09-24 09:11:48 -03:00
hugh-obrien
5f4a36ca26 remove debug line 2018-09-24 10:49:01 +01:00
hugh-obrien
c0b32f031e force gallery items to use legacy OL v1 texlive image 2018-09-24 10:49:01 +01:00
Paulo Reis
1bf09e3928 Adjust checkbox padding. 2018-09-24 10:38:18 +01:00
Paulo Reis
6c3c51c44e Use less padding in the login and register forms. 2018-09-24 10:24:12 +01:00
Paulo Reis
69771257ff Adapt styles to get a nicer responsive behaviour. 2018-09-24 08:34:50 +01:00
Shane Kilkelly
7d5bd74c43 Enable legacy login for tests 2018-09-24 08:34:50 +01:00
Jessica Lawshe
1e4e22c472 Add margin to register button 2018-09-24 08:34:50 +01:00
Paulo Reis
be9045c7ed Add styles for homepage too; add alternative versions of the register buttons. 2018-09-24 08:34:50 +01:00
Paulo Reis
70e99d4001 Add styles for the newsletter checkbox. 2018-09-24 08:34:50 +01:00
Paulo Reis
b008d163e7 Add login and register styles. 2018-09-24 08:34:50 +01:00
Paulo Reis
062bf0cd87 Add brand assets for login and register. 2018-09-24 08:34:50 +01:00
Jessica Lawshe
b8fb750c16 Bottom margin for tab nav only on portals 2018-09-21 17:11:47 -05:00
Jessica Lawshe
7fc0ab36b3 CMS pages margin 2018-09-21 17:09:08 -05:00
Jessica Lawshe
b85fd183a1 Merge pull request #955 from sharelatex/jel-tabs-active
Keep border on hover for active tab
2018-09-21 13:38:33 -05:00
Jessica Lawshe
55fb33c2c1 Merge pull request #948 from sharelatex/jel-content-pages-link-color
Content pages link color
2018-09-21 13:38:18 -05:00
Jessica Lawshe
e1dd35e759 Keep border on hover for active tab 2018-09-21 12:26:49 -05:00
James Allen
9e827be3ed Merge pull request #951 from sharelatex/as-copy-v1-assets
Copy assets from v1
2018-09-21 17:41:55 +01:00
James Allen
ea9f788fc1 Merge pull request #954 from sharelatex/cmg-better-buttons
Improve gallery detail
2018-09-21 17:41:43 +01:00
Chrystal Griffiths
e3b47047ab Buttons on left 2018-09-21 16:28:04 +01:00
Alasdair Smith
c1195cadcf Add renamed apple-touch-icon for v1 url interop 2018-09-21 15:49:04 +01:00
Alasdair Smith
b6c794f627 Ensure brand prefixed favicon is used 2018-09-21 15:44:36 +01:00
Alasdair Smith
5481ceefdd Copy static assets from v1 2018-09-21 14:59:47 +01:00
Alasdair Smith
1c1d5065a2 Move to publi/img dir 2018-09-21 14:59:25 +01:00
Alasdair Smith
11fd4f9a66 Copy overleaf partner files 2018-09-21 14:17:39 +01:00
Alasdair Smith
a2ed46a394 Add atlassian & google verification files 2018-09-21 14:01:26 +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
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
987451aba9 Content pages link color 2018-09-20 17:30:50 -05:00
Jessica Lawshe
bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -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
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
Brian Gough
5c69b6d12c temporarily disable syntax checking 2018-09-19 14:30:30 +01: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
8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01:00
Douglas Lovell
98be2c2bf5 Update wording and endpoint for change password form 2018-09-19 07:58:04 -03: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
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
Shane Kilkelly
fc0a4298f1 Move scripts related to account-merge checker to relevant modules 2018-09-19 09:28:59 +01:00
Shane Kilkelly
d0be98e89c Move the account-merge-finish page to the integration module 2018-09-19 09:28:59 +01:00
Shane Kilkelly
677b3c759d Remove old controller 2018-09-19 09:28:59 +01:00
Shane Kilkelly
843f1c6b35 Move AccountMergeEmailController to integration module 2018-09-19 09:28:59 +01:00
Shane Kilkelly
54a5c563fb Address feedback 2018-09-19 09:28:59 +01:00
Shane Kilkelly
b0e4b12714 Finish off the copy of the account-merge-finish page 2018-09-19 09:28:59 +01:00
Shane Kilkelly
5e17dfd1cb Also add the final email to the array of emails on the account 2018-09-19 09:28:59 +01:00
Shane Kilkelly
efb6018246 Add a rate-limit to the email-confirm endpoint 2018-09-19 09:28:59 +01:00
Shane Kilkelly
6cfe68db26 Roughly working account-merge-by-email callback endpoint 2018-09-19 09:28:59 +01:00
Shane Kilkelly
958c7a19b6 Add a skeleton of a callback endpoint for merging accounts via email 2018-09-19 09:28:59 +01:00
Shane Kilkelly
ba221a1135 WIP: add email-based account merge flow to ShareLaTeX 2018-09-19 09:28:59 +01:00
Alasdair Smith
bdcc25805e Add route to handle /teams similar to v1 2018-09-18 17:14:37 +01:00
Brian Gough
02854274a7 2018-09-18 14:09:05 +01:00