Robin Ward 5dd56a41d9 Merge branch 'master' into master

2017-07-24 12:01:48 -04:00

..

assets

Merge branch 'master' into master

2017-07-24 12:01:48 -04:00

controllers

Merge pull request #4983 from tgxworld/group_owners_can_invite_users_to_groups

2017-07-24 16:21:19 +09:00

helpers

FIX: Show emoji in inline oneboxes

2017-07-21 14:24:48 -04:00

jobs

FEATURE: Whitelists for inline oneboxing

2017-07-21 15:41:47 -04:00

mailers

FIX: Show emoji in inline oneboxes

2017-07-21 14:24:48 -04:00

models

Validate uniquness of api_key.

2017-07-24 21:46:08 +09:00

serializers

Merge pull request #4983 from tgxworld/group_owners_can_invite_users_to_groups

2017-07-24 16:21:19 +09:00

services

add DiscourseEvent triggers necessary to update a user's permissions before they're notified

2017-07-21 11:03:54 -04:00

views

Feature: Change markdown engine to markdown it

2017-07-17 11:41:34 -04:00