summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1178 from mattermost/update-web-socket-helpCorey Hulen2015-10-262-2/+2
|\
| * Update helpit332015-10-251-1/+1
| * Update websocket errorit332015-10-251-1/+1
* | Update Troubleshooting.mdit332015-10-261-0/+8
* | Update README.mdit332015-10-261-0/+6
* | Merge pull request #1192 from mattermost/PLT-828Christopher Speller2015-10-264-8/+12
|\ \
| * | PLT-828 fixing db upgrade code=Corey Hulen2015-10-264-8/+12
* | | Merge pull request #1164 from hmhealey/plt778Corey Hulen2015-10-267-87/+195
|\ \ \
| * | | Moved logic for searching for posts by multiple users/channels into the sql q...hmhealey2015-10-263-49/+73
| * | | Changed post searching to allow searching by multiple users/channelshmhealey2015-10-236-75/+159
* | | | Merge pull request #1193 from hmhealey/plt798Corey Hulen2015-10-264-8/+38
|\ \ \ \
| * | | | Prevented image files larger than 4k resolution from being uploadedhmhealey2015-10-262-5/+29
| * | | | Fixed file upload and profile picture upload error display to work for server...hmhealey2015-10-262-3/+9
* | | | | Merge pull request #1191 from mattermost/PLT-564Joram Wilander2015-10-261-12/+0
|\ \ \ \ \
| * | | | | PLT-564 removing auto-hide from error bar=Corey Hulen2015-10-261-12/+0
* | | | | | Merge pull request #1189 from mattermost/plt-762Joram Wilander2015-10-263-3/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix error message on leaving channelJoramWilander2015-10-263-3/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #1173 from florianorben/PLT-642Corey Hulen2015-10-261-13/+51
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | rename methods and varibles to a more meaningful nameFlorian Orben2015-10-261-12/+13
| * | | | PLT-642: Browser tab alertsFlorian Orben2015-10-261-12/+49
* | | | | Merge pull request #1172 from florianorben/PLT-703Joram Wilander2015-10-264-18/+42
|\ \ \ \ \
| * | | | | rename getTypingText to updateTypingText and set component's state in itFlorian Orben2015-10-261-10/+16
| * | | | | use constant value to check if to send a typing event for commentsFlorian Orben2015-10-261-1/+1
| * | | | | PLT-703: Support multiple users being shown as typing underneath input boxes.Florian Orben2015-10-263-17/+35
| |/ / / /
* | | | | Merge pull request #1186 from mattermost/nginx-improvementCorey Hulen2015-10-261-5/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adding more secure nginx instructionsChristopher Speller2015-10-261-5/+6
* | | | | Adding linkit332015-10-261-1/+1
* | | | | Adding more GitLab 8.1 instructionsit332015-10-261-3/+18
| |/ / / |/| | |
* | | | Merge pull request #1171 from trashcan/github-1130-handle-trailing-characters...Harrison Healey2015-10-261-14/+48
|\ \ \ \ | |/ / / |/| | |
| * | | Fix highlighting of trailing punctuation for own usernamePat Lathem2015-10-251-4/+4
| * | | Fix off by one errorPat Lathem2015-10-241-7/+7
| * | | Remove trailing punctuation when parsing @username referencesPat Lathem2015-10-241-13/+47
* | | | Merge pull request #1170 from florianorben/PLT-395Harrison Healey2015-10-2613-1/+219
|\ \ \ \
| * | | | Add java and ini languageFlorian Orben2015-10-242-1/+7
| * | | | fix markup if code is of unknown languageFlorian Orben2015-10-241-1/+1
| * | | | code style theme chooserFlorian Orben2015-10-249-2/+111
| * | | | highlight code in markdown blocksFlorian Orben2015-10-246-0/+103
| | |_|/ | |/| |
* | | | Update README.mdit332015-10-261-1/+1
* | | | Update README.mdit332015-10-261-1/+1
* | | | Merge pull request #1183 from girishso/strip-extra-sHarrison Healey2015-10-261-0/+1
|\ \ \ \
| * | | | strips extra hiphens from channel urlGirish S2015-10-261-0/+1
* | | | | Adding request for testing helpit332015-10-261-1/+4
* | | | | Merge pull request #1134 from mcmillhj/docs/debian-jessie-systemd-installatio...it332015-10-261-0/+299
|\ \ \ \ \
| * | | | | Production installation instructions for Debian Jessie with SystemdHunter McMillen2015-10-211-0/+299
* | | | | | Merge pull request #1181 from girishso/star-search2Christopher Speller2015-10-262-3/+10
|\ \ \ \ \ \
| * | | | | | made eslint happyGirish S2015-10-262-6/+8
| * | | | | | append * to search query if not present and highlight partial matchesGirish S2015-10-262-2/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1179 from florianorben/issue-827Christopher Speller2015-10-263-73/+120
|\ \ \ \ \ \
| * | | | | | Mattermost can not send message start with slashFlorian Orben2015-10-253-73/+120
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #1177 from lindy65/patch-4Christopher Speller2015-10-261-2/+2
|\ \ \ \ \ \