summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added new error message when trying to add a channel that was previously dele...Reed Garmsen2015-07-062-2/+23
* 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
| * | | fixing timming test=Corey Hulen2015-07-051-0/+7
| * | | Fixing unit test=Corey Hulen2015-07-051-4/+4
| * | | Fixing unit test=Corey Hulen2015-07-051-3/+3
| * | | fixing unit tests=Corey Hulen2015-07-052-2/+2
| * | | fixing race condition in unit tests=Corey Hulen2015-07-059-70/+70
| * | | Merge branch 'master' into mm-1391=Corey Hulen2015-07-0577-394/+940
| |\ \ \
| * | | | adding mysql 5.6.17=Corey Hulen2015-07-051-2/+2
| * | | | adding mysql 5.6=Corey Hulen2015-07-051-2/+14
| * | | | adding sql 5.6=Corey Hulen2015-07-051-5/+3
| * | | | adding sql 5.6=Corey Hulen2015-07-051-0/+1
| * | | | adding more unit tests=Corey Hulen2015-07-051-0/+6
| * | | | adding mysql 5.6=Corey Hulen2015-06-251-12/+1
| * | | | adding mysql 5.6=Corey Hulen2015-06-251-1/+15
| * | | | adding api unit tests=Corey Hulen2015-06-253-2/+7
| * | | | adding servies=Corey Hulen2015-06-251-2/+3
| * | | | updating build script=Corey Hulen2015-06-251-2/+2
| * | | | updating services=Corey Hulen2015-06-251-1/+1
| * | | | adding services to build=Corey Hulen2015-06-251-1/+11
| * | | | updating build=Corey Hulen2015-06-251-0/+7
| * | | | updating build=Corey Hulen2015-06-251-2/+1
| * | | | adding the missing package=Corey Hulen2015-06-254-0/+531
| * | | | updating make=Corey Hulen2015-06-2517-4856/+10
| * | | | inital travis file=Corey Hulen2015-06-251-0/+5
* | | | | Merge pull request #128 from rgarmsen2295/mm-832Christopher Speller2015-07-061-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed copy-paste error in codeReed Garmsen2015-07-061-1/+1
| * | | | Fixed not being able to open channel notifications settings menu in IE10Reed Garmsen2015-07-061-2/+2
|/ / / /
* | | | Merge pull request #127 from rgarmsen2295/mm-1047Joram Wilander2015-07-061-3/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Added comment for later referenceReed Garmsen2015-07-021-1/+1
| * | | Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) e...Reed Garmsen2015-07-021-4/+6