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
James Allen
f7acd448e7
Merge pull request #970 from sharelatex/pr-remove-front-chat
...
Hide front chat widget
2018-09-25 10:31:54 +01: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
Paulo Jorge Reis
ce6405d5b1
Merge pull request #958 from sharelatex/pr-adjust-login-form-padding
...
Use less padding in the login and register forms.
2018-09-24 11:53:18 +01: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
James Allen
a451a0b3f8
Merge pull request #937 from sharelatex/pr-login-signup-forms
...
Login and register forms styling
2018-09-24 08:48:56 +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
