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
8445 commits 3 branches 7 tags 199 MiB
Commit graph

145 commits

Author SHA1 Message Date
Simon Detheridge
ab5b1b6dc4 Merge pull request #1870 from overleaf/spd-invalid-intent-sso 
Fix invalid intent errors when logging in with OAuth

GitOrigin-RevId: 20f88a24080b41256bd31b9fb55b68a872ded56b
 2019-06-18 15:48:29 +00:00
Simon Detheridge
82672269c4 Merge pull request #1862 from overleaf/em-json-stringify 
Globally apply StringHelper.stringifyJsonForScript()

GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2
 2019-06-17 15:14:25 +00:00
nate stemen
642081dd17 Merge pull request #1802 from overleaf/jel-oauth-hide-when-not-linked 
OAuth provider check and capitalize button text

GitOrigin-RevId: afa2e8301d5141da178d88304932c5736d8632c4
 2019-06-03 18:32:13 +00:00
Hugh O'Brien
d4eb71b525 Merge pull request #1788 from overleaf/ta-ensure-can-delete-account 
Prevent Subscription Owner from Deleting their Account

GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0
 2019-05-28 15:51:27 +00:00
Jessica Lawshe
e03b5ae691 Merge pull request #1741 from overleaf/jel-manage-linked-accounts 
Manage linked accounts via v2

GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06
 2019-05-20 16:10:46 +00:00
Simon Detheridge
5517adcbd1 Merge pull request #1726 from sharelatex/hb-sso-password-setting 
Check for password from v1 before showing password change form

GitOrigin-RevId: 58ef0f9d3c8ce3ab7ca51d3538f1be13f05d4658
 2019-04-25 14:37:38 +00:00
Timothée Alby
54186d9db1 Add linked accounts section to user settings page (#1705) 
Add linked accounts section to user settings page

GitOrigin-RevId: d2bb26a3bfb3946144a05b98f58d50a2c57f3040
 2019-04-23 14:34:55 +00:00
Jessica Lawshe
f455a11aa8 Merge pull request #1655 from sharelatex/jel-user-must-reconfirm 
Reconfirm user accounts

GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8
 2019-04-17 14:14:19 +00:00
Shane Kilkelly
0773311805 Merge pull request #1674 from sharelatex/sk-email-make-primary-tooltip 
Change the wording on emails from 'default' to 'primary'

GitOrigin-RevId: e09792f6fba73b626c09d8f1bf4298b6e9780d15
 2019-04-13 01:57:15 +00:00
Simon Detheridge
d2e053f456 Merge pull request #1610 from sharelatex/cmg-reintroduce-beta 
Revive the beta program in the settings area

GitOrigin-RevId: 40024210cba08de96805d58147b6a0fe166a7d43
 2019-03-22 12:28:36 +00:00
Alasdair Smith
41f75b5936 Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss 
Fix potential Angular XSS issues

GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842
 2019-03-18 10:37:15 +00:00
Ersun Warncke
330f878085 Merge pull request #1378 from sharelatex/ew-post-logout 
POST logout instead of GET

GitOrigin-RevId: b502a6ed945acd336d1a921e5c4c5433d8b7c7b7
 2019-01-15 16:48:00 +00:00
James Allen
1bddd03335 Merge pull request #1319 from sharelatex/ja-account-deletion-message 
Change account deletion message when v1 access is removed

GitOrigin-RevId: c81cc85042b30fcff998283cf1ffea0503d0ed40
 2019-01-07 11:33:30 +00:00
Jessica Lawshe
7666c8a481 Merge pull request #1236 from sharelatex/jel-password-reset 
Reset password via API request to v1

GitOrigin-RevId: 00b0306ca77df650595a762382a8a63b05a945f6
 2018-12-14 16:02:14 +00:00
Shane Kilkelly
a72b29efd8 Merge pull request #1259 from sharelatex/ja-sso-settings-link 
Add link from v2 settings page to manage linked accounts in v1

GitOrigin-RevId: 2aabd0669349023d6b0da520c55587feb19b5201
 2018-12-13 15:09:59 +00:00
Brian Gough
8bf9d79d2f Merge pull request #1157 from sharelatex/jel-aria-hidden-fix 
Add value to aria-hidden attribute

GitOrigin-RevId: 09b17a269b8d91c5f4b4e231877db0431b0308a9
 2018-11-19 09:57:35 +00:00
Jessica Lawshe
d97fe4e39d Merge pull request #1142 from sharelatex/jel-img-alt-and-icon-alt-a11y 
Image alt tags and accessible icons

GitOrigin-RevId: 58f0609682c0dbeec95cad4e234e3f94b7b3c004
 2018-11-15 17:41:22 +00: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
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
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
Douglas Lovell
98be2c2bf5 Update wording and endpoint for change password form 2018-09-19 07:58:04 -03:00
Douglas Lovell
4abbc5d569 Password change form conditioned on installation 2018-09-18 09:10:33 -03: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
Douglas Lovell
0ecda4e093 Display password change from in Account Settings 2018-09-10 14:53:33 -03: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
Shane Kilkelly
680654f7e7 Account-delete, clarify what happens to v1 account and projects 2018-09-04 13:31:22 +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
Shane Kilkelly
27a2e06d7b Revert "Move the new logic to the externalAuthenticationSystemUsed function" 
This reverts commit 34009fbf59cc6597b08e9262ea274ce266baa8fe.
 2018-09-03 10:21:45 +01:00
Shane Kilkelly
40a500648c Move the new logic to the externalAuthenticationSystemUsed function 2018-09-03 10:21:45 +01:00
Shane Kilkelly
be6720d805 Add a janky warning that this action will delete the account on v1 also. 2018-09-03 10:21:45 +01:00
Shane Kilkelly
9141f678b1 Show the account delete option on v2 2018-09-03 10:21:45 +01:00
Paulo Reis
79f1e7b0ee Update ui-select value as the user types. 2018-08-29 17:31:47 +01:00
Tim Alby
204423696d increase spacing between buttons 2018-08-28 17:34:49 +02:00
Timothée Alby
8057f4e74d Merge pull request #849 from sharelatex/pr-fix-add-new-university 
Correctly invoke the function to add unknown universities.
 2018-08-28 14:03:35 +02:00
Tim Alby
e19882455a improve affiliation endorsement button 
- design as button instead of link
- disable unless role and department are set
 2018-08-27 11:32:48 +02:00
Tim Alby
7863561bff display university licence in affiliations UI 2018-08-27 11:26:13 +02:00
Paulo Reis
4f6f459bfe Remove debug code. 2018-08-24 15:35:52 +01:00
Paulo Reis
920c24cacb Correctly invoke the function to add unknown universities. 2018-08-24 15:29:48 +01:00
Alasdair Smith
3b31125a62 Add message about deleting account affecting v2 
Only show on SL and if the user has linked accounts
 2018-08-16 14:11:43 +01:00
Tim Alby
bfb2f636cd enable affiliations UI 2018-08-13 14:59:39 +02:00
James Allen
4435eab423 Update affiliations UI to show specific errors for conflicting emails 2018-07-17 11:12:47 +01:00
James Allen
a238c74440 Remove inline style 2018-07-13 11:19:49 +01:00
James Allen
452d698a47 ng-show -> ng-if 2018-07-13 11:17:05 +01:00
James Allen
d7e0b8c369 Show unconfirmed email status in UI and add link to resend confirmation 2018-07-12 17:13:26 +01:00
Paulo Reis
a759828ece Update feature flag for affiliations; use it in the router; minor style adjustments. 2018-07-12 16:37:09 +01:00