summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #136 from mattermost/code-reviewJoram Wilander2015-07-084-8/+10
|\
| * team code review=Corey Hulen2015-07-064-8/+10
* | Merge pull request #148 from hmhealey/mm1488Christopher Speller2015-07-081-2/+3
|\ \
| * | Changed code to dismiss mention list to not trigger when you click on the lis...hmhealey2015-07-071-2/+3
* | | Merge pull request #147 from rgarmsen2295/mm-934Corey Hulen2015-07-073-3/+3
|\ \ \
| * | | Changed textarea resizeability from being a blanket statement to everything t...Reed Garmsen2015-07-074-4/+3
| * | | Prevent text areas from being resizeableReed Garmsen2015-07-071-0/+1
* | | | Merge pull request #143 from rgarmsen2295/mm-1416Corey Hulen2015-07-072-2/+23
|\ \ \ \
| * | | | Added new error message when trying to add a channel that was previously dele...Reed Garmsen2015-07-062-2/+23
* | | | | Merge pull request #137 from nickago/MM-1417Corey Hulen2015-07-071-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | redirected channel name 404's to town squarenickago2015-07-061-1/+4
* | | | | Merge pull request #142 from asaadmahmoodspin/masterJoram Wilander2015-07-074-31/+23
|\ \ \ \ \
| * | | | | MM-1221 - Fixing scrolling issue in the RHSAsaad Mahmood2015-07-071-1/+2
| * | | | | Updating backgroundAsaad Mahmood2015-07-072-24/+12
| * | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-073-8/+15
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-072-1/+9
| |\ \ \ \ \
| * | | | | | Fixing code error in cssAsaad Mahmood2015-07-071-1/+0
| * | | | | | Fixing before after hover for date/new separatorAsaad Mahmood2015-07-071-2/+6
| * | | | | | Files img filesAsaad Mahmood2015-07-071-2/+5
| * | | | | | Fixing background hoversAsaad Mahmood2015-07-072-11/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #139 from hmhealey/makefilegodepsJoram Wilander2015-07-071-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Change Makefile to look for godep in GOPATH instead of using a relative pathhmhealey2015-07-061-1/+1
* | | | | | Merge pull request #138 from hmhealey/mm756Christopher Speller2015-07-073-8/+15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add a post type for user joined/left messages and don't flag a channel as unr...hmhealey2015-07-073-8/+15
| |/ / / /
* | | | | Merge pull request #141 from hmhealey/profilepicture32bitChristopher Speller2015-07-071-1/+1
|\ \ \ \ \
| * | | | | Explicitly cast to an int64 when selecting a random profile picture colour to...hmhealey2015-07-061-1/+1
| |/ / / /
* | | | | Merge pull request #134 from nickago/MM-1313Christopher Speller2015-07-071-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Changed socket event to a props based changenickago2015-07-062-20/+9
| * | | | Typing notification disappears when message is sentnickago2015-07-062-3/+4
| * | | | Typing notifier resets on channel changenickago2015-07-062-4/+22
* | | | | Merge pull request #140 from mattermost/fix-buildCorey Hulen2015-07-061-0/+3
|\ \ \ \ \
| * | | | | fixing build=Corey Hulen2015-07-061-0/+3
|/ / / / /
* | | | | Merge pull request #135 from asaadmahmoodspin/masterCorey Hulen2015-07-067-43/+92
|\ \ \ \ \
| * | | | | MM-1461 - Updating Mattermost UIAsaad Mahmood2015-07-067-43/+92
| | |_|_|/ | |/| | |
* | | | | Merge pull request #133 from nickago/MM-794Corey Hulen2015-07-061-0/+7
|\ \ \ \ \
| * | | | | Force the extra info to update asychnickago2015-07-061-0/+7
| | |/ / / | |/| | |
* | | | | Merge pull request #132 from mattermost/mm-1250Corey Hulen2015-07-062-2/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fixes mm-1250 mention highlights should now align in textboxJoramWilander2015-06-172-2/+6
* | | | | Merge pull request #131 from mattermost/mm-1391Corey Hulen2015-07-0642-5017/+794
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixing unit tests=Corey Hulen2015-07-0618-154/+173
| * | | | adding debugging=Corey Hulen2015-07-061-2/+4
| * | | | adding debugging=Corey Hulen2015-07-051-7/+8
| * | | | adding debugging=Corey Hulen2015-07-051-6/+7
| * | | | adding debugging=Corey Hulen2015-07-051-1/+1
| * | | | adding debugging=Corey Hulen2015-07-051-1/+1
| * | | | fixing unit test=Corey Hulen2015-07-051-2/+2
| * | | | fixing unit test=Corey Hulen2015-07-051-0/+3
| * | | | fixing unit test=Corey Hulen2015-07-051-0/+3
| * | | | fixing unit test=Corey Hulen2015-07-052-2/+7
| * | | | fixing unit tests=Corey Hulen2015-07-052-0/+4