Commit graph

1872 commits

Author SHA1 Message Date
Shane Kilkelly
e0444cfc62 Make notification column layout explicit. 2016-08-05 16:41:11 +01:00
Shane Kilkelly
9b46c1b1f7 WIP: notification when user is sent an invite 2016-08-05 16:11:03 +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
092c036406 Rate-limit calls to invite api 2016-08-04 09:50:47 +01:00
Shane Kilkelly
721ea88bd0 If email is already invited, resend the invite 2016-08-03 16:30:34 +01:00
Shane Kilkelly
a5ddcc3df7 Allow resending of invites 2016-08-03 15:42:19 +01:00
Shane Kilkelly
e7251aab53 Small wording changes 2016-08-03 14:06:08 +01:00
Shane Kilkelly
8cb93511df Update UI of share modal 2016-08-03 11:55:24 +01:00
Shane Kilkelly
6ea690225f Refactor view-invite to not use model calls. 2016-08-03 10:23:34 +01:00
Shane Kilkelly
3a3688d3d0 Include invites count in canAddXCollaborators 2016-08-02 15:42:50 +01:00
Shane Kilkelly
2494026b85 Move Helpers/EmailHelpers to Helpers/EmailHelper 2016-08-02 15:42:26 +01:00
Shane Kilkelly
13fe000176 Move email parsing code to Helpers/EmailHelpers 2016-08-02 14:30:42 +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
Shane Kilkelly
291a26595c Remove referal id from invite email link 2016-08-01 15:56:07 +01:00
Shane Kilkelly
f3a1f32bb1 Test the invalid-invite page 2016-07-29 11:54:08 +01:00
Shane Kilkelly
563247044b Start testing the invite page 2016-07-29 09:52:55 +01:00
Shane Kilkelly
9c6195fbec Factor out link builder 2016-07-28 15:59:59 +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
1cb9c3582d Don't return early if user is already member. 2016-07-28 09:47:07 +01:00
Shane Kilkelly
e70f121461 Correct name of expireAfterSeconds index 2016-07-27 15:55:31 +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
Paulo Reis
f4d78a856c Disable page view and session tracking. 2016-07-27 14:20:39 +01:00
Shane Kilkelly
46ec17f2c4 Add redir query string to login link 2016-07-27 13:51:52 +01:00
Shane Kilkelly
e1af171534 Add a dot to end of sentence. 2016-07-27 11:07:26 +01:00
Shane Kilkelly
6f39813a56 Add translations 2016-07-27 10:56:22 +01:00
Shane Kilkelly
78948251a1 Change the Close button color 2016-07-27 10:28:01 +01:00
Shane Kilkelly
827629a74a Invalid-invite page, and re-jigg the share modal 2016-07-27 10:10:44 +01:00
Paulo Reis
6d0779b8f8 Add forgotten name attribute. 2016-07-26 14:47:48 +01:00
Paulo Reis
ab305ea07e Merge branch 'master' into pr-log-hints-negative-feedback 2016-07-26 14:27:15 +01:00
Shane Kilkelly
6162c5ec60 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-07-26 14:23:08 +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
Paulo Reis
a3ee3134b1 Support for i18n. 2016-07-26 11:56:15 +01:00
Shane Kilkelly
2dede5f793 WIP: Working "accept invite" page 2016-07-26 11:46:41 +01:00
Paulo Reis
bfe3e160c9 Integrate with UI. 2016-07-26 11:37:51 +01:00
Henry Oswald
81744e4301 use cdn for blog 2016-07-26 11:11:28 +01:00
Shane Kilkelly
41755212f0 Update the register page with new message 2016-07-26 09:06:21 +01:00
Shane Kilkelly
b898c62e91 Add appropriate query strings to the end of invite link 2016-07-25 16:14:41 +01:00
Paulo Reis
32b57f228c Integrate feedback UI with wufoo service. 2016-07-25 16:12:56 +01:00
Shane Kilkelly
16dcbe2cd4 WIP: wire up share-modal frontend to invite system 2016-07-25 15:07:14 +01:00
Shane Kilkelly
b3add65de1 Start integrating invites into share frontend 2016-07-25 14:27:02 +01:00
Shane Kilkelly
73fed8b0bf Add a getAllInvites api endpoint 2016-07-25 11:17:47 +01:00
Shane Kilkelly
5438f39f9e Start testing acceptInvite 2016-07-25 09:58:08 +01:00
Shane Kilkelly
78a410c39d Remove expiresAt logic from acceptInvite 2016-07-25 09:07:47 +01:00
Paulo Reis
37eb6252d2 Rewording + animation when shown the feedback panel. 2016-07-22 16:33:19 +01:00
Shane Kilkelly
78570817d5 Render a separate template if the invite is not found. 2016-07-22 16:28:00 +01:00