alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,713 Commits 8 Branches 11 Tags
bfb369fab01eddd4e223891c053d940fc3c67f3e
Commit Graph
2146 Commits
Author SHA1 Message Date
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
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
Jessica Lawshe bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -05:00
Jessica LawsheandGitHub d2af2fb630 Merge pull request #927 from sharelatex/jel-plans-updates 
Plans page updates
 2018-09-20 09:00:58 -05:00
Hugh O'BrienandGitHub 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'BrienandGitHub 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'BrienandGitHub 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
Douglas Lovell 4abbc5d569 Password change form conditioned on installation 2018-09-18 09:10:33 -03:00
hugh-obrien 277225d8de use existing left sidebar controller for affiliation cta 2018-09-18 13:06:26 +01:00
Timothée AlbyandGitHub 7981d867e8 Merge pull request #924 from sharelatex/ta-sign-in-v1 
Change Links to v1 to Sign User In
 2018-09-18 12:24:08 +01:00
hugh-obrien 2d40c3d21a Use existing notification styling 2018-09-18 11:01:10 +01:00
hugh-obrien f76ff55b6f email alert styling 2018-09-18 10:54:20 +01:00
hugh-obrien e343c04423 add notification to confirm unconfirmed emails 2018-09-18 10:54:20 +01:00
Jessica Lawshe 4f5c12e9ac More specific group contact controller name and email subject 
This form is only used on the group contact modal.
 2018-09-17 10:47:57 -05:00
Jessica Lawshe 66bfbce45f Correct link mixin paths 2018-09-17 09:46:34 -05:00
Douglas Lovell 7d10e64840 Alter endpoint for account settings, change password form submission. 2018-09-14 16:19:02 -03:00
Tim Alby 09c92c0b69 don't encode / 2018-09-14 16:09:24 +01:00
Tim Alby 2e4d3d7aab change links to v1 to sign user in first 2018-09-14 14:26:16 +01:00
Chrystal Griffiths 6334066d2d Merge branch 'master' into cmg-share-modal 2018-09-14 12:09:10 +01:00
Chrystal Griffiths 915bd18058 Read-only collaborators table 2018-09-14 11:47:18 +01:00
Chrystal Griffiths 3b43cf9075 Slight copy change 2018-09-13 17:57:11 +01:00
Chrystal Griffiths b51fc01bde Remove temporary solution 2018-09-13 17:17:18 +01:00
James AllenandGitHub ef11161ddb Revert "Record and show last modified by user for projects" 2018-09-13 14:00:30 +01:00
hugh-obrien 26defd0833 reword CTA 2018-09-13 13:54:43 +01:00
hugh-obrien 8697edc149 replace profile completion CTA with affiliationa adding CTA 2018-09-13 12:34:18 +01:00
Chrystal Griffiths 57ac858004 Style the notice 2018-09-13 12:19:44 +01:00
James Allen 5dbebc0693 Translate 'by' 2018-09-13 10:38:52 +01:00
James Allen dd4b85b809 Combine v1 and v2 projects into item.pug 2018-09-13 10:38:52 +01:00
James Allen 225d30ffd2 Add missed lines from rebase 2018-09-13 10:38:52 +01:00
James Allen c072961183 Update project-list list to a table and show last updated user 2018-09-13 10:38:52 +01:00
Hugh O'BrienandGitHub 24c479e984 Merge pull request #885 from sharelatex/hb-ip-matcher-notifications 
IP matcher affiliation CTA notifications
 2018-09-13 08:59:25 +01:00
Douglas Lovell 0ecda4e093 Display password change from in Account Settings 2018-09-10 14:53:33 -03:00
Chrystal Griffiths 46eadfada4 Conditionally show sharing bits 2018-09-07 17:23:03 +01:00
Jessica LawsheandGitHub aa2f6ad0dd Merge pull request #880 from sharelatex/jel-v2-launch-plans 
Launch v2 Plans Page
 2018-09-06 08:51:05 -05:00
Shane Kilkelly 3d369b725c Add another confirmation checkbox to account-delete. 
This confirms the user understands they will lose both their OL v2 and SL
accounts, and their projects.
 2018-09-06 11:35:28 +01:00
Jessica Lawshe c3c2e524f5 Add quotes 2018-09-05 08:14:32 -05:00
Jessica Lawshe 40a412b6b9 Remove plans message about v2 beta 2018-09-05 08:14:05 -05:00
Jessica Lawshe 65b2715e62 Remove unused layout for v2 plans 2018-09-05 08:14:05 -05:00
hugh-obrien 5605e1c5c3 update copy for ip match notifications 2018-09-05 11:22:26 +01:00
hugh-obrien d950e14b3f use new routes and params from v1 ip matcher endpoint 2018-09-05 11:22:26 +01:00
hugh-obrien 38faa5c25e correctly create and display ip matched affiliations 2018-09-05 11:22:25 +01:00
Shane KilkellyandGitHub 81c845850e Merge pull request #889 from sharelatex/sk-update-account-delete-wording-v1 
Account-delete, clarify what happens to v1 account and projects
 2018-09-05 10:22:32 +01:00
Christopher Hoskin c3e64b12cf Remove 'beta' from v2 welcome text 2018-09-04 15:11:27 +01:00
Shane Kilkelly 680654f7e7 Account-delete, clarify what happens to v1 account and projects 2018-09-04 13:31:22 +01:00
Shane KilkellyandGitHub 7be716e889 Merge pull request #879 from sharelatex/sk-handle-user-account-delete 
Sk handle user account delete
 2018-09-03 10:41:49 +01:00
Shane Kilkelly bafcf24cc9 Add missing column class to the change-password panel 2018-09-03 10:21:45 +01:00
Shane Kilkelly 1776482159 Update wording of the change-password instruction 2018-09-03 10:21:45 +01:00
Shane Kilkelly 0300ffbdc6 Bonus, add a link to the v1 settings page to change password 2018-09-03 10:21:45 +01:00