Shane Kilkelly 72ca1d6316 Merge branch 'master' into sk-passport ...

# Conflicts:
#	app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee

2016-09-23 10:01:11 +01:00

..

CollaboratorsController.coffee

Refresh members and invites in client when status changes

2016-08-05 14:01:08 +01:00

CollaboratorsEmailHandler.coffee

Remove referal id from invite email link

2016-08-01 15:56:07 +01:00

CollaboratorsHandler.coffee

Remove the email when user id is added to project

2016-08-11 14:17:01 +01:00

CollaboratorsInviteController.coffee

Merge branch 'master' into sk-passport

2016-09-23 10:01:11 +01:00

CollaboratorsInviteHandler.coffee

Use token in URL to force its precense when invite and allow easy dynamic notifications

2016-09-22 17:24:06 +01:00

CollaboratorsRouter.coffee

Use token in URL to force its precense when invite and allow easy dynamic notifications

2016-09-22 17:24:06 +01:00