Jessica Lawshe
|
30763043d1
|
Merge pull request #2663 from overleaf/jel-sso-missing-email-error
Institution SSO error handling when missing session data
GitOrigin-RevId: c455ef97eb17b98ffbd03eb5f623ceb27678deed
|
2020-03-12 04:18:52 +00:00 |
|
Eric Mc Sween
|
e80870f453
|
Merge pull request #2629 from overleaf/cmg-updateon-typo
Fix typo in user settings
GitOrigin-RevId: 066ee8047d807e9ac077eb687a93f12d9db6bf55
|
2020-02-28 04:18:21 +00:00 |
|
Timothée Alby
|
98f031e9aa
|
Merge pull request #2619 from overleaf/ta-licence-attribute-fix
Read Licence Attribute from Affiliation Instead of Institution
GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
|
2020-02-21 04:20:59 +00:00 |
|
Jessica Lawshe
|
827fb7119c
|
Merge pull request #2444 from overleaf/jel-beta-test-saml
Refactor account setttings SSO UI checks and allow beta testing
GitOrigin-RevId: 882c6aed107a2facfb0941bc49ef6cbd86473efb
|
2019-12-09 15:24:15 +00:00 |
|
Eric Mc Sween
|
b5d7887dfb
|
Merge pull request #2337 from overleaf/jel-saml-already-linked
Institution linking and unlinking
GitOrigin-RevId: 1c3665fc66513c3e88a62ed477800c17759459ff
|
2019-11-12 14:18:13 +00:00 |
|
Eric Mc Sween
|
bf5df0f235
|
Merge pull request #2285 from overleaf/jel-institution-information-link
Add institution information link
GitOrigin-RevId: 72116311dfaddae145b4cbdbadbf039b30857890
|
2019-10-28 14:29:23 +00:00 |
|
Eric Mc Sween
|
44ba0895fe
|
Merge pull request #2286 from overleaf/jel-institution-email-primary-tooltip
Tooltip for "Make Primary" for SSO emails
GitOrigin-RevId: 443cd032d4275ba486a632e92104299997c71bbc
|
2019-10-28 14:28:59 +00:00 |
|
Timothée Alby
|
61243338be
|
Merge pull request #2284 from overleaf/jel-user-settings
Add type="button" to prevent form submission
GitOrigin-RevId: 747d389ea52f5f32762f98bab3e647b14572c50d
|
2019-10-25 08:38:50 +00:00 |
|
Jessica Lawshe
|
28a4be296f
|
Merge pull request #2251 from overleaf/jel-dashboard-institution-notifications
Institution SSO dashboard notifications
GitOrigin-RevId: c80117c2732fafdc9d09eed69db06a26ad28a663
|
2019-10-21 16:23:19 +00:00 |
|
Jessica Lawshe
|
34c04660a6
|
Merge pull request #2250 from overleaf/jel-saml-session-email
Non canonical institution email in session
GitOrigin-RevId: b70971f6f42391391a42ba6ff214c14a275461d3
|
2019-10-17 16:29:13 +00:00 |
|
Alasdair Smith
|
9cf73f965c
|
Merge pull request #1440 from overleaf/as-amd-webpack
Bundle all frontend code with webpack
GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
|
2019-10-16 10:36:21 +00:00 |
|
Jessica Lawshe
|
625b4c9339
|
Merge pull request #2216 from overleaf/jel-saml-beta-account-settings
Allow SAML beta testing on Account Settings
GitOrigin-RevId: 6a2c60a3cbab3d9d0cdcc72e23f5d75f7702f89c
|
2019-10-09 13:13:40 +00:00 |
|
Jessica Lawshe
|
5c918bed94
|
Adding an institution email that must be linked
GitOrigin-RevId: 9ba42a07fb386275cf6d81a7d4b91a7f974faf15
|
2019-10-08 13:29:17 +00:00 |
|
Jessica Lawshe
|
ae423b5800
|
SAML feature by special link
Allows for testing SAML linking before release
GitOrigin-RevId: 8a8c01aa15f04ba1749e93f4feadb7bf1643c783
|
2019-10-08 10:52:30 +00:00 |
|
Jessica Lawshe
|
86d844baf2
|
Merge pull request #2193 from overleaf/jel-account-settings-processing
Add processing message to affiliation UI
GitOrigin-RevId: 2ceb9c7815da778f832715cac5c00bac3a32c127
|
2019-10-02 14:22:20 +00:00 |
|
Jessica Lawshe
|
962c5cc273
|
Merge pull request #2192 from overleaf/jel-account-settings-ui
Remove processing message in account settings UI
GitOrigin-RevId: 6938e386819ca0d2923f56c8a1ea50e2faa20121
|
2019-09-30 16:48:39 +00:00 |
|
Eric Mc Sween
|
039b5eaba0
|
Merge pull request #2167 from overleaf/jel-saml-account-settings-layout
Account settings layout for institution SSO
GitOrigin-RevId: d9c9e5eeb3b4a215456b0f5294139c1b8d4968c3
|
2019-09-30 13:36:41 +00:00 |
|
Eric Mc Sween
|
869fcf7952
|
Merge pull request #2089 from overleaf/em-mailchimp-unsubscribe
Handle error on Mailchimp unsubscribe when deleting users
GitOrigin-RevId: 8923480e6d50de45003fd7741610f995753a412b
|
2019-09-03 15:25:01 +00:00 |
|
Timothée Alby
|
ef9b487a60
|
Merge pull request #2019 from overleaf/jel-remove-oauth-migration
Remove unused OAuth link/unlink migration
GitOrigin-RevId: 20fce5a714f5897a1b5a93a65156f5368f2d1c65
|
2019-07-31 08:33:37 +00:00 |
|
Jessica Lawshe
|
0a2a32120f
|
Use v2 data for OAuth providers
GitOrigin-RevId: 09df3253c283b3196bc48a0440e9ea5f1eb20c9c
|
2019-07-23 10:59:53 +00:00 |
|
Simon Detheridge
|
4cf480a448
|
Merge pull request #1965 from overleaf/jel-remove-v1-login
Remove login to v1 via v2
GitOrigin-RevId: e5ba86786d14c5a2be87aff6b38cfd807b5cd053
|
2019-07-22 15:31:24 +00:00 |
|
Simon Detheridge
|
748a21d74c
|
Merge pull request #1975 from overleaf/em-one-time-login-landing-page
Landing page for one-time login
GitOrigin-RevId: d7453e7f3dbf12062cc45108e4cb2ebb7b042a76
|
2019-07-18 14:34:37 +00:00 |
|
Ersun Warncke
|
d624c29b6f
|
remove v1 deps for password change/reset
GitOrigin-RevId: be25f19ae589c50bfde0b170860127fa8d6f63b7
|
2019-07-17 15:09:24 +00:00 |
|
Jessica Lawshe
|
6e09af6fbe
|
Merge pull request #1971 from overleaf/jel-settings-add-aria-label
Update label to match input ID
GitOrigin-RevId: 849c9d49d861cf3b5645496b5e4eed1dc6d7392a
|
2019-07-11 17:07:51 +00:00 |
|
Jessica Lawshe
|
ed6891e66d
|
Merge pull request #1961 from overleaf/jel-remove-force-import-feature-check
Remove checks for `force-import-to-v2`
GitOrigin-RevId: f94e8b0fb2f7f4416759583d5ca02babec345120
|
2019-07-11 15:35:36 +00:00 |
|
Jessica Lawshe
|
d4a8f38736
|
Merge pull request #1942 from overleaf/jel-user-settings-form-msg
Move user settings form message next to submit button and add ID attributes
GitOrigin-RevId: 3d87242e5a7211f9fa58b07f38a278fb94019046
|
2019-07-11 15:35:31 +00:00 |
|
Timothée Alby
|
e029616ed4
|
Merge pull request #1914 from overleaf/jel-no-pw-message
Check for password on delete modal
GitOrigin-RevId: a2ec40b9c73e92490a9dfd0377b10f9d1831f56f
|
2019-07-01 14:06:42 +00:00 |
|
Simon Detheridge
|
bd3f59c22a
|
Merge pull request #1895 from overleaf/jel-oauth-db-flip
Add setting var for OAuth data source
GitOrigin-RevId: e8a2ce588c7b5c8a9cf2c782d0434b421df7b356
|
2019-06-25 11:22:17 +00:00 |
|
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 |
|
