Commit Graph
4333 Commits
Author SHA1 Message Date
Alasdair Smith 9d600afdf8 Fix failing tests for token access
If project was changed from token access to private, then we want to
404 on v2 (not redirect to v1). So the logic was changed to check if the
project exists and if it does then a 404 is returned. If it does not
then it redirects to v1.
2018-09-13 12:09:19 +01:00
Alasdair Smith 24495f3340 Also redirect not found read tokens to v1 2018-09-13 12:09:19 +01:00
Alasdair Smith e0ce988d32 Intelligently redirect to v1 if no v2 project found for token 2018-09-13 12:09:19 +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
Brian Gough 6d54e843e8 fix typo in Errors, only two underscores in __proto__ 2018-09-12 10:45:50 +01:00
Ersun Warncke 7d3e17651f set options and method for request, pass cookies and form body 2018-09-10 06:10:36 -04:00
hugh-obrien 1e04a09ec6 remove unnecessary error returns and ip fetching 2018-09-07 18:15:32 +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
hugh-obrien 8ef90a0dcb move call for creating ip matched notifcation to project controller 2018-09-05 15:40:59 +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
Jessica Lawshe a4956294c1 Remove plans redirect 2018-09-05 08:14:05 -05:00
Tim Alby 9ec60a128a add userHasSubscriptionOrIsGroupMember alias 2018-09-05 11:37:37 +01:00
hugh-obrien 5605e1c5c3 update copy for ip match notifications 2018-09-05 11:22:26 +01:00
hugh-obrien 23e6292fd7 updating tests for ip matcher logic 2018-09-05 11:22:26 +01:00
hugh-obrien f20d27986b create ip match notifications without forcing replacement 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 bf2ea4e7b3 test against ip matcher for notification on login if different from previous ip 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
hugh-obrien fa23ea75b8 Call university ip matcher api when checking notifications 2018-09-05 11:22:25 +01:00
Shane KilkellyandGitHub d432b6799f Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix
Don't Regard v1 Teams as Paid Subscriptions
2018-09-05 10:22:46 +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
Ersun Warncke e4e6a0fa1b add new tag methods 2018-09-03 10:40:28 -04:00
Tim Alby 3324796086 don't regard v1 teams as paid subscriptions
- use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember `
- remove `userHasV1SubscriptionOrTeam`
- rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription`
- rename some variables for clarity
2018-09-03 15:09:57 +01:00
James AllenandGitHub 5025b54c9c Merge pull request #887 from sharelatex/as-logout-of-v1
Extract logout to function, so different redirect can be called
2018-09-03 14:04:22 +01:00
Alasdair Smith 53bd2cfd33 Add error handling on logout 2018-09-03 11:46:36 +01:00
Alasdair Smith 6569e34873 Extract logout to function, so different redirect can be called 2018-09-03 11:01:14 +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
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 60cbc989e2 Add delete as an inline table action (only when viewing archived projects). 2018-09-02 15:14:45 +01:00
Paulo Reis af4094a88c Use CSS hashed paths when hot-swapping themes. 2018-09-02 14:44:15 +01:00
Paulo Reis fbf98d89f2 Improve the collapsing behaviour of 'change' entries in track-changes. 2018-09-01 15:36:02 +01:00
Paulo Reis 4ff7410391 Disable the review button when history is open. 2018-08-31 17:10:15 +01:00
Paulo Reis f88a3815c6 Add loading spinner when cloning a project. 2018-08-31 16:14:20 +01:00
Paulo Reis 7e5094f53d Avoid z-index issues with the new project dropdown. 2018-08-31 15:37:22 +01:00
Paulo Reis fc7b5bdd63 * Share button shown to all users, with a tooltip for non-admin; remove its id. 2018-08-31 15:33:56 +01:00
Timothée AlbyandGitHub 855840d89a Merge pull request #883 from sharelatex/ta-domain-licence-join-fix
Fix id Accessor in Domain Licence Join Page
2018-08-31 13:15:23 +02:00
Timothée AlbyandGitHub 012d341df6 Merge pull request #881 from sharelatex/ho-change-email-fire-forget
change email: catch invalid emails and don't pass the error back on invalid requests
2018-08-31 13:15:16 +02:00
Timothée AlbyandGitHub 59b137e303 Merge pull request #877 from sharelatex/pr-fill-university-model-as-you-type
Update university, role and department value as the user types.
2018-08-31 13:15:01 +02:00
Henry Oswald 245ad2a2a8 call changeEmail before the callback in setDefaultEmailAddress 2018-08-31 11:49:45 +01:00