 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
|
ce039f8cd3
|
Remove the email when user id is added to project
|
2016-08-11 14:17:01 +01:00 |
|
|
Paulo Reis
|
9bf9df9a4a
|
Track login events.
|
2016-08-11 14:09:45 +01:00 |
|
|
Shane Kilkelly
|
826295167f
|
Mark Notification as read by key alone
|
2016-08-11 14:04:11 +01:00 |
|
|
Paulo Reis
|
6a210978fe
|
Track registration events.
|
2016-08-11 12:29:58 +01:00 |
|
|
James Allen
|
0270d34d0f
|
Use JSONB not JSON column type
|
2016-08-11 10:19:07 +01:00 |
|
|
James Allen
|
4886e8ba0e
|
Rename metadata -> segmentation in Events table to play well with metabase
|
2016-08-10 17:22:35 +01:00 |
|
|
James Allen
|
056bb6b0f4
|
Use a JSON column for metadata
|
2016-08-10 17:17:59 +01:00 |
|
|
James Allen
|
93cd511211
|
Send events to custom DB backend
|
2016-08-10 16:42:56 +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
|
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
|
6ea690225f
|
Refactor view-invite to not use model calls.
|
2016-08-03 10:23:34 +01:00 |
|
|
Henry Oswald
|
892511820e
|
fix logging on groupPlan invite notification
|
2016-08-02 17:09:42 +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 |
|
|
Henry Oswald
|
418d1c56da
|
nullcheck qqfile on upload files
|
2016-08-02 15:36:59 +01:00 |
|
|
Henry Oswald
|
928777b61c
|
add null check to redis return value for getValueFromTokenAndExpire
|
2016-08-02 15:34:44 +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
|
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 |
|
|
Brian Gough
|
5da1b90418
|
use validate as keyword for syntax checks
|
2016-07-29 14:59:48 +01:00 |
|
|
Brian Gough
|
e0d5075fdb
|
include check option when compiling
|
2016-07-29 14:59:48 +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
|
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
|
827629a74a
|
Invalid-invite page, and re-jigg the share modal
|
2016-07-27 10:10:44 +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 |
|
|
Shane Kilkelly
|
2dede5f793
|
WIP: Working "accept invite" page
|
2016-07-26 11:46:41 +01:00 |
|
|
Henry Oswald
|
81744e4301
|
use cdn for blog
|
2016-07-26 11:11:28 +01:00 |
|
|
Shane Kilkelly
|
b898c62e91
|
Add appropriate query strings to the end of invite link
|
2016-07-25 16:14:41 +01:00 |
|