github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
8478 commits 3 branches 7 tags 199 MiB
Commit graph

8478 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
James Allen
9b3bf78f2d Merge pull request #952 from sharelatex/as-fix-500-favicon 
Ensure brand prefixed favicon is used on 500 page
 2018-09-21 17:41:36 +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
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