summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2097 from mattermost/plt-1781Joram Wilander2016-02-081-1/+4
|\
| * Fixing slack import.Christopher Speller2016-02-081-1/+4
* | Merge pull request #2083 from mattermost/plt-1879Christopher Speller2016-02-084-5/+21
|\ \
| * | Make insecure TLS connections configurableJoramWilander2016-02-053-6/+12
| * | Accept unsigned TLS certs for SSO and outgoing hooks, also fix delete hooks bugJoramWilander2016-02-053-3/+13
| |/
* | Fixing slash commands=Corey Hulen2016-02-051-8/+46
* | Fixing slash commands=Corey Hulen2016-02-051-6/+9
|/
* Merge pull request #2073 from mattermost/ee-updatesCorey Hulen2016-02-041-6/+26
|\
| * Move license storage to databaseJoramWilander2016-02-041-6/+26
* | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-043-246/+432
|\ \ | |/ |/|
| * 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-041-19/+35
| * Changed how posts are marked ephemeralhmhealey2016-02-041-2/+1
| * Reworked the code for sending notifications and checking for out of channel m...hmhealey2016-02-042-248/+262
| * Changed out of channel mention tests to use proper email addresseshmhealey2016-02-041-6/+7
| * Added ephemeral messages sent when a user mentions someone not in the channelhmhealey2016-02-042-5/+43
| * Added serverside check for a post that @mentions someone who isn't in the cha...hmhealey2016-02-042-0/+121
* | Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-0417-666/+1689
|\ \ | |/ |/|
| * PLT-1429 Fixing code review comments=Corey Hulen2016-02-043-6/+6
| * Fixing build=Corey Hulen2016-02-031-2/+2
| * Fixing based on feedback=Corey Hulen2016-02-031-2/+2
| * Merge branch 'master' into PLT-1429=Corey Hulen2016-02-031-1/+1
| |\
| * \ Merge branch 'master' into PLT-1429=Corey Hulen2016-02-034-4/+263
| |\ \
| * | | Fixing unit test=Corey Hulen2016-02-021-1/+1
| * | | Adding loc to front-end=Corey Hulen2016-02-021-6/+6
| * | | Adding loc to new command backend=Corey Hulen2016-02-018-67/+117
| * | | Fixing merge=Corey Hulen2016-02-0121-149/+219
| |\ \ \
| * \ \ \ merging=Corey Hulen2016-01-2538-166/+298
| |\ \ \ \
| * | | | | Merging=Corey Hulen2016-01-222-3/+4
| * | | | | merging=Corey Hulen2016-01-2219-352/+410
| |\ \ \ \ \
| * | | | | | Adding test command=Corey Hulen2016-01-152-16/+201
| * | | | | | merging=Corey Hulen2016-01-151-3/+10
| |\ \ \ \ \ \
| * | | | | | | finishing up commands UI=Corey Hulen2016-01-142-2/+2
| * | | | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-1422-45/+221
| |\ \ \ \ \ \ \
| * | | | | | | | Chaning webhooks to be team wide=Corey Hulen2016-01-111-2/+2
| * | | | | | | | 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-093-11/+7
| * | | | | | | | adding different commands=Corey Hulen2016-01-0911-439/+346
| * | | | | | | | Fixing unit tests=Corey Hulen2016-01-081-0/+28
| * | | | | | | | Adding web service methods=Corey Hulen2016-01-083-16/+261
| * | | | | | | | partial fix for UI=Corey Hulen2016-01-085-36/+399
| * | | | | | | | PLT-1429 adding sql storage for slash commands=Corey Hulen2016-01-062-830/+830
* | | | | | | | | Merge pull request #2059 from mattermost/plt-1732Harrison Healey2016-02-041-2/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Update user email when switching to SSOJoramWilander2016-02-031-2/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-031-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #2049 from mattermost/plt-1856Christopher Speller2016-02-032-1/+58
|\ \ \ \ \ \ \
| * | | | | | | Add basic server audit tab to system console for EEJoramWilander2016-02-022-1/+58
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-032-1/+153
|\ \ \ \ \ \ \
| * | | | | | | Added extra system-wide statistics for EEJoramWilander2016-02-022-1/+153
| |/ / / / / /