Commit graph

7684 commits

Author SHA1 Message Date
Shane Kilkelly
f0d17c1db7 Merge pull request #894 from sharelatex/as-fix-homepage-cta
Fix height issue on homepage for smaller screens
2018-09-05 11:47:02 +01:00
Shane Kilkelly
9b37b0e66f Merge pull request #895 from sharelatex/ta-add-method-alias
add userHasSubscriptionOrIsGroupMember alias
2018-09-05 11:43:49 +01: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
de83df2703 adding tests for ip matching notifications 2018-09-05 11:22:25 +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
Alasdair Smith
455e682fac Fix height issue on small screens 2018-09-05 11:00:30 +01:00
Shane Kilkelly
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 Kilkelly
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
Henry Oswald
fe723d9ed2 Merge pull request #892 from sharelatex/csh-v2-out-of-beta
Remove 'beta' from v2 welcome text
2018-09-04 16:41:55 +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
Douglas Lovell
15a54d8228 Style for label alignment on text area 2018-09-04 08:53:29 -03:00
Douglas Lovell
fa7f8ebfed Styling tweaks to Gallery publish dialog 2018-09-04 07:22:58 -03:00
Ersun Warncke
b6241fec9a Merge pull request #886 from sharelatex/ew-tag-import
add new tag methods
2018-09-03 10:49:40 -04: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 Allen
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
Douglas Lovell
1965967361 Use less vertical space in gallery publish modal 2018-09-03 06:51:15 -03:00
Shane Kilkelly
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
Paulo Jorge Reis
d3aad256e3 Merge pull request #884 from sharelatex/pr-pre-launch-ui-fixes
Pre-launch UI fixes
2018-09-03 10:29:14 +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
07f884df70 Fix spell-checker menu going offscreen. 2018-09-03 09:42:37 +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
Douglas Lovell
91e653dafc Limit width and margin publish model form controls to the enclosing box 2018-08-31 18:36:53 -03:00
Douglas Lovell
c570daf03b Remove unneeded include from ol-style 2018-08-31 18:36:19 -03:00
Douglas Lovell
1e31f5dc1c Move new publish-model styles into existing style file 2018-08-31 15:35:24 -03:00
Douglas Lovell
92548be044 Use hyphen for underscore in publish-modal style 2018-08-31 14:16:43 -03:00
Douglas Lovell
404e768d24 Merge branch 'master' into dcl-olsl760b 2018-08-31 14:04:00 -03:00
Douglas Lovell
2b9e978379 Repair syntax and additional publish-modal style 2018-08-31 13:59:47 -03:00
Douglas Lovell
135d7e75a5 Merge branch 'master' into dcl-olsl760b 2018-08-31 13:24:22 -03:00
Paulo Reis
4ff7410391 Disable the review button when history is open. 2018-08-31 17:10:15 +01:00
Paulo Reis
b8f14873d2 Style buttons inside alerts (previously had the same colours for backgrounds). 2018-08-31 16:29:49 +01:00
Paulo Reis
f88a3815c6 Add loading spinner when cloning a project. 2018-08-31 16:14:20 +01:00
Paulo Reis
8ad9db3f02 Forcefully set trackchanges textareas background to white. 2018-08-31 15:45:33 +01:00