summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-0419-360/+580
|\ \ \ \ | |/ / / |/| | |
| * | | Changed sendNotificationsAndForget to be synchronous and called as a go funchmhealey2016-02-041-228/+225
| * | | Added helper methods to send ephemeral messages to specific usershmhealey2016-02-043-21/+54
| * | | Changed how posts are marked ephemeralhmhealey2016-02-046-15/+17
| * | | Reworked the code for sending notifications and checking for out of channel m...hmhealey2016-02-044-280/+278
| * | | Changed PostStore to not clear a deleted post's messagehmhealey2016-02-045-22/+27
| * | | Changed out of channel mention tests to use proper email addresseshmhealey2016-02-041-6/+7
| * | | Removed untranslated phrases from es.jsonhmhealey2016-02-041-12/+0
| * | | Added ephemeral messages sent when a user mentions someone not in the channelhmhealey2016-02-048-13/+72
| * | | Changed deleted posts to be more general ephemeral postshmhealey2016-02-046-72/+64
| * | | Added serverside check for a post that @mentions someone who isn't in the cha...hmhealey2016-02-044-0/+145
* | | | Merge pull request #2072 from ZBoxApp/command-locCorey Hulen2016-02-042-108/+312
|\ \ \ \
| * | | | Add spanish translations for commandsElias Nahum2016-02-042-108/+312
|/ / / /
* | | | Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-0444-979/+3453
|\ \ \ \
| * | | | PLT-1429 Fixing code review comments=Corey Hulen2016-02-045-8/+6
| * | | | Fixing build=Corey Hulen2016-02-031-2/+2
| * | | | Fixing based on feedback=Corey Hulen2016-02-032-3/+3
| * | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0328-329/+798
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0374-864/+2922
| |\ \ \ \
| * | | | | Fixing version=Corey Hulen2016-02-021-1/+1
| * | | | | Fixing console=Corey Hulen2016-02-022-6/+6
| * | | | | Adding props to admin console=Corey Hulen2016-02-023-12/+108
| * | | | | Fixing unit test=Corey Hulen2016-02-021-1/+1
| * | | | | Adding loc to front-end=Corey Hulen2016-02-024-57/+308
| * | | | | Switching defaults=Corey Hulen2016-02-012-2/+2
| * | | | | Adding loc to new command backend=Corey Hulen2016-02-0112-259/+280
| * | | | | Fixing merge=Corey Hulen2016-02-01201-2301/+12602
| |\ \ \ \ \
| * \ \ \ \ \ merging=Corey Hulen2016-01-2591-708/+3640
| |\ \ \ \ \ \
| * | | | | | | Merging=Corey Hulen2016-01-222-3/+4
| * | | | | | | merging=Corey Hulen2016-01-221772-517/+1556760
| |\ \ \ \ \ \ \
| * | | | | | | | Adding test command=Corey Hulen2016-01-152-16/+201
| * | | | | | | | merging=Corey Hulen2016-01-154-31/+15
| |\ \ \ \ \ \ \ \
| * | | | | | | | | finishing up commands UI=Corey Hulen2016-01-144-70/+310
| * | | | | | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-14104-847/+1940
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adding UI=Corey Hulen2016-01-112-0/+295
| * | | | | | | | | | Chaning webhooks to be team wide=Corey Hulen2016-01-114-59/+9
| * | | | | | | | | | Switching to enable integrations for testing=Corey Hulen2016-01-112-8/+73
| * | | | | | | | | | Adding loading testing commands=Corey Hulen2016-01-105-395/+578
| * | | | | | | | | | Fixing unit tests=Corey Hulen2016-01-094-12/+8
| * | | | | | | | | | adding different commands=Corey Hulen2016-01-0912-439/+347
| * | | | | | | | | | Fixing unit tests=Corey Hulen2016-01-081-0/+4
| * | | | | | | | | | Fixing unit tests=Corey Hulen2016-01-081-0/+28
| * | | | | | | | | | Adding web service methods=Corey Hulen2016-01-086-18/+303
| * | | | | | | | | | partial fix for UI=Corey Hulen2016-01-0817-79/+579
| * | | | | | | | | | PLT-1429 adding sql storage for slash commands=Corey Hulen2016-01-068-859/+1359
* | | | | | | | | | | Merge pull request #2070 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-041-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Fixing center channel icon position in IEAsaad Mahmood2016-02-041-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2068 from hmhealey/plt1767Corey Hulen2016-02-041-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed editing your last comment in the RHShmhealey2016-02-041-3/+2
* | | | | | | | | | | Merge pull request #2069 from hmhealey/localizationCorey Hulen2016-02-041-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |