 Shane Kilkelly
|
158afbb157
|
Merge branch 'master' into pr-email-tokens
Conflicts:
app/coffee/Features/Notifications/NotificationsBuilder.coffee
public/coffee/ide/share/controllers/ShareController.coffee
|
2016-08-15 10:29:21 +01:00 |
|
|
Shane Kilkelly
|
f92767f7b5
|
Address feedback, add ? checks where appropriate
|
2016-08-12 15:26:20 +01:00 |
|
|
Shane Kilkelly
|
e53394919f
|
Rework how invite expiry functions.
|
2016-08-12 14:40:59 +01:00 |
|
|
Shane Kilkelly
|
a7bc8bffe0
|
Update markAsReadByKeyOnly url.
|
2016-08-12 09:59:25 +01:00 |
|
|
Shane Kilkelly
|
276241495b
|
Fix tests
|
2016-08-11 14:23:25 +01:00 |
|
|
Shane Kilkelly
|
ce039f8cd3
|
Remove the email when user id is added to project
|
2016-08-11 14:17:01 +01:00 |
|
|
Paulo Reis
|
228de5332e
|
Unit test tracking code.
|
2016-08-11 14:09:57 +01:00 |
|
|
Shane Kilkelly
|
826295167f
|
Mark Notification as read by key alone
|
2016-08-11 14:04:11 +01:00 |
|
|
Brian Gough
|
abcfb2dd16
|
Merge pull request #290 from sharelatex/enable-chktex
Enable chktex
|
2016-08-10 11:49:31 +01:00 |
|
|
Shane Kilkelly
|
0e0ccb41ff
|
cancel notification when accepting invite
|
2016-08-08 13:57:33 +01:00 |
|
|
Shane Kilkelly
|
110082390e
|
Test the _trySendInviteNotfification helper
|
2016-08-08 10:34:54 +01:00 |
|
|
Shane Kilkelly
|
eafd61a90e
|
Refresh members and invites in client when status changes
|
2016-08-05 14:01:08 +01:00 |
|
|
Shane Kilkelly
|
8f7603c324
|
Add an endpoint to access project members
|
2016-08-04 16:47:48 +01:00 |
|
|
Shane Kilkelly
|
a5ddcc3df7
|
Allow resending of invites
|
2016-08-03 15:42:19 +01:00 |
|
|
Shane Kilkelly
|
6ea690225f
|
Refactor view-invite to not use model calls.
|
2016-08-03 10:23:34 +01:00 |
|
|
Shane Kilkelly
|
5f8952450e
|
Test getInviteCount
|
2016-08-02 16:08:05 +01:00 |
|
|
Shane Kilkelly
|
3a3688d3d0
|
Include invites count in canAddXCollaborators
|
2016-08-02 15:42:50 +01:00 |
|
|
Henry Oswald
|
2ad0bab976
|
use underscore.each so it doesn’t blow up on non array.
|
2016-08-02 15:33:41 +01:00 |
|
|
Shane Kilkelly
|
abbd059eae
|
Refactor to existing addUserIdToProject function
|
2016-08-02 13:51:00 +01:00 |
|
|
Shane Kilkelly
|
63f8fe453a
|
Use UserGetter rather than User model
|
2016-08-02 09:48:09 +01:00 |
|
|
Shane Kilkelly
|
dca1c9be5d
|
Load invites on project load, rather than asynchronously.
|
2016-08-01 17:05:37 +01:00 |
|
|
Brian Gough
|
e99176c0d0
|
fix tests
|
2016-07-29 14:59:48 +01:00 |
|
|
Shane Kilkelly
|
7b18f88145
|
Merge branch 'master' into pr-email-tokens
|
2016-07-28 14:53:36 +01:00 |
|
|
Shane Kilkelly
|
ed65e16e54
|
If user is member of project, redirect to project.
Leave invite in place to expire naturally.
|
2016-07-28 11:15:11 +01:00 |
|
|
Shane Kilkelly
|
62d544ccfc
|
Redirect to project if user is already member.
If invite is missing, and current user is already a member
of the project, then just redirect to the project page
|
2016-07-27 15:28:22 +01:00 |
|
|
Shane Kilkelly
|
e46901a21b
|
Send an empty keys array when there is no data
|
2016-07-26 14:23:00 +01:00 |
|
|
Shane Kilkelly
|
855cc28483
|
Finish adding project and owner details to the accept-invite page
|
2016-07-26 14:14:14 +01:00 |
|
|
Shane Kilkelly
|
367b138cae
|
fix failing tests
|
2016-07-26 12:09:58 +01:00 |
|
|
Shane Kilkelly
|
16dcbe2cd4
|
WIP: wire up share-modal frontend to invite system
|
2016-07-25 15:07:14 +01:00 |
|
|
Shane Kilkelly
|
73fed8b0bf
|
Add a getAllInvites api endpoint
|
2016-07-25 11:17:47 +01:00 |
|
|
Shane Kilkelly
|
ccf684cf07
|
test acceptInvite
|
2016-07-25 10:19:20 +01:00 |
|
|
Shane Kilkelly
|
5438f39f9e
|
Start testing acceptInvite
|
2016-07-25 09:58:08 +01:00 |
|
|
Shane Kilkelly
|
78570817d5
|
Render a separate template if the invite is not found.
|
2016-07-22 16:28:00 +01:00 |
|
|
Shane Kilkelly
|
9e0c44573a
|
Remove expiresAt, use mongo TTL instead.
|
2016-07-22 16:08:56 +01:00 |
|
|
Shane Kilkelly
|
b201f1a37a
|
Test getInviteByToken.
|
2016-07-22 14:21:34 +01:00 |
|
|
Shane Kilkelly
|
e34b124c73
|
Test revokeInvite
|
2016-07-22 13:33:21 +01:00 |
|
|
Shane Kilkelly
|
c9cfcddbe9
|
test error case for inviteToProject
|
2016-07-22 11:54:16 +01:00 |
|
|
Shane Kilkelly
|
f866bd03bc
|
Spy on the randomBytes function
|
2016-07-22 11:53:55 +01:00 |
|
|
Shane Kilkelly
|
9fba98cd45
|
Accept invite, and start testing the invite handler.
|
2016-07-22 11:38:00 +01:00 |
|
|
Shane Kilkelly
|
1139444790
|
add token to body of acceptInvite action.
|
2016-07-22 09:27:00 +01:00 |
|
|
Shane Kilkelly
|
4db9d5a466
|
remove whatespace and comment
|
2016-07-21 13:34:20 +01:00 |
|
|
Shane Kilkelly
|
3311b43644
|
more tests for invite controller
|
2016-07-21 13:31:54 +01:00 |
|
|
Shane Kilkelly
|
23a9aadba5
|
start tests for invite controller
|
2016-07-21 10:08:22 +01:00 |
|
|
Shane Kilkelly
|
effc3727be
|
Don’t show upgrade prompts for users with custom subscription accounts.
Set `hasValidSubscription` to true if user subscription is custom.
|
2016-07-19 10:15:45 +01:00 |
|
|
Shane Kilkelly
|
dda0841af3
|
Return early if there are no keys to delete
|
2016-07-06 15:39:03 +01:00 |
|
|
Shane Kilkelly
|
fc6cf75ad5
|
Merge branch 'master' into sk-session-revocation
|
2016-07-06 13:19:15 +01:00 |
|
|
Shane Kilkelly
|
0362fee60f
|
test the retain option to revokeAllUserSessions.
|
2016-07-05 15:32:32 +01:00 |
|
|
Shane Kilkelly
|
464866847f
|
Fix name of UserSessionsManager test module.
|
2016-07-05 15:14:29 +01:00 |
|
|
Shane Kilkelly
|
5b9903551a
|
add an array of session ids to retain.
|
2016-07-05 14:20:47 +01:00 |
|
|
Shane Kilkelly
|
6e282ab308
|
clear sessions on password reset
|
2016-07-05 14:19:59 +01:00 |
|