Commit Graph

6049 Commits

Author SHA1 Message Date
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
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
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
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 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 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
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
Brian Gough 418bc10a18 allow getting doc paths by project id 2018-09-24 16:04:23 +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
Alasdair Smith b6c794f627 Ensure brand prefixed favicon is used 2018-09-21 15:44:36 +01:00
Alasdair Smith 945894e89e Reset showNavItem bool if fails check 2018-09-21 12:53:57 +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 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
Jessica Lawshe bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -05: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 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