Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1178 from mattermost/update-web-socket-help | Corey Hulen | 2015-10-26 | 2 | -2/+2 |
|\ | | | | | Update web socket help | ||||
| * | Update help | it33 | 2015-10-25 | 1 | -1/+1 |
| | | |||||
| * | Update websocket error | it33 | 2015-10-25 | 1 | -1/+1 |
| | | | | | | Getting this error when websockets is properly configured and connection is just slow | ||||
* | | Merge pull request #1193 from hmhealey/plt798 | Corey Hulen | 2015-10-26 | 2 | -3/+9 |
|\ \ | | | | | | | PLT-798 Prevent image files larger than 4k resolution from being uploaded | ||||
| * | | Fixed file upload and profile picture upload error display to work for ↵ | hmhealey | 2015-10-26 | 2 | -3/+9 |
| | | | | | | | | | | | | serverside errors | ||||
* | | | Merge pull request #1191 from mattermost/PLT-564 | Joram Wilander | 2015-10-26 | 1 | -12/+0 |
|\ \ \ | | | | | | | | | PLT-564 removing auto-hide from error bar | ||||
| * | | | PLT-564 removing auto-hide from error bar | =Corey Hulen | 2015-10-26 | 1 | -12/+0 |
| | | | | |||||
* | | | | Merge pull request #1189 from mattermost/plt-762 | Joram Wilander | 2015-10-26 | 3 | -3/+4 |
|\ \ \ \ | | | | | | | | | | | PLT-762 Fix error message on leaving channel | ||||
| * | | | | Fix error message on leaving channel | JoramWilander | 2015-10-26 | 3 | -3/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1173 from florianorben/PLT-642 | Corey Hulen | 2015-10-26 | 1 | -13/+51 |
|\ \ \ \ | |_|/ / |/| | | | PLT-642: Browser tab alerts | ||||
| * | | | rename methods and varibles to a more meaningful name | Florian Orben | 2015-10-26 | 1 | -12/+13 |
| | | | | |||||
| * | | | PLT-642: Browser tab alerts | Florian Orben | 2015-10-26 | 1 | -12/+49 |
| |/ / | |||||
* | | | rename getTypingText to updateTypingText and set component's state in it | Florian Orben | 2015-10-26 | 1 | -10/+16 |
| | | | |||||
* | | | use constant value to check if to send a typing event for comments | Florian Orben | 2015-10-26 | 1 | -1/+1 |
| | | | |||||
* | | | PLT-703: Support multiple users being shown as typing underneath input boxes. | Florian Orben | 2015-10-26 | 3 | -17/+35 |
|/ / | |||||
* | | Merge pull request #1171 from ↵ | Harrison Healey | 2015-10-26 | 1 | -14/+48 |
|\ \ | | | | | | | | | | | | | trashcan/github-1130-handle-trailing-characters-after-user Handle trailing characters after user | ||||
| * | | Fix highlighting of trailing punctuation for own username | Pat Lathem | 2015-10-25 | 1 | -4/+4 |
| | | | |||||
| * | | Fix off by one error | Pat Lathem | 2015-10-24 | 1 | -7/+7 |
| | | | |||||
| * | | Remove trailing punctuation when parsing @username references | Pat Lathem | 2015-10-24 | 1 | -13/+47 |
| | | | |||||
* | | | Merge pull request #1170 from florianorben/PLT-395 | Harrison Healey | 2015-10-26 | 6 | -1/+201 |
|\ \ \ | | | | | | | | | PLT-395: Add syntax highlighting to Markdown code blocks | ||||
| * | | | Add java and ini language | Florian Orben | 2015-10-24 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | Forgot to add those altough they are quite common | ||||
| * | | | fix markup if code is of unknown language | Florian Orben | 2015-10-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | code style theme chooser | Florian Orben | 2015-10-24 | 4 | -1/+110 |
| | | | | |||||
| * | | | highlight code in markdown blocks | Florian Orben | 2015-10-24 | 3 | -0/+85 |
| | |/ | |/| | |||||
* | | | Merge pull request #1183 from girishso/strip-extra-s | Harrison Healey | 2015-10-26 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | strip extra hyphens from urls | ||||
| * | | | strips extra hiphens from channel url | Girish S | 2015-10-26 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #1181 from girishso/star-search2 | Christopher Speller | 2015-10-26 | 2 | -3/+10 |
|\ \ \ | | | | | | | | | PLT-747: Allow search results to match portions of words | ||||
| * | | | made eslint happy | Girish S | 2015-10-26 | 2 | -6/+8 |
| | | | | |||||
| * | | | append * to search query if not present and highlight partial matches | Girish S | 2015-10-26 | 2 | -2/+7 |
| |/ / | |||||
* / / | Mattermost can not send message start with slash | Florian Orben | 2015-10-25 | 1 | -51/+64 |
|/ / | | | | | | | resolves #827 | ||||
* | | Merge pull request #1168 from rgarmsen2295/plt-816 | Corey Hulen | 2015-10-24 | 3 | -16/+13 |
|\ \ | | | | | | | PLT-816 Fixed various React warnings during the team signup process | ||||
| * | | Fixed various React warnings during the team signup process | Reed Garmsen | 2015-10-23 | 3 | -16/+13 |
| | | | |||||
* | | | Fixed react warning in more_direct_channels.jsx | Reed Garmsen | 2015-10-23 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed react warnings in channel_notifications.jsx | Reed Garmsen | 2015-10-23 | 1 | -15/+9 |
| | | | |||||
* | | | Fixed react warning for the search bar tooltip | Reed Garmsen | 2015-10-23 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #1133 from hmhealey/plt718 | Corey Hulen | 2015-10-23 | 4 | -6/+304 |
|\ \ | | | | | | | PLT-718 Add an autocomplete when searching with in:, channel:, or from: | ||||
| * | | Added keyboard selection to search autocomplete | hmhealey | 2015-10-23 | 4 | -46/+156 |
| | | | |||||
| * | | Added styling to search autocomplete | hmhealey | 2015-10-23 | 1 | -1/+11 |
| | | | |||||
| * | | Added an autocomplete dropdown to the search bar | hmhealey | 2015-10-23 | 3 | -0/+178 |
| | | | |||||
* | | | Updating indentation for settings | Asaad Mahmood | 2015-10-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-23 | 3 | -5/+5 |
|\| | | | | | | | | | | | ui-improvements | ||||
| * | | Merge pull request #1160 from mattermost/force-last-viewed | Christopher Speller | 2015-10-23 | 2 | -3/+3 |
| |\ \ | | | | | | | | | Force updating last viewed at for new posts | ||||
| | * | | Force updating last viewed at for new posts | JoramWilander | 2015-10-23 | 2 | -3/+3 |
| | | | | |||||
| * | | | Fixing issue with saving/getting drafts | =Corey Hulen | 2015-10-23 | 1 | -2/+2 |
| |/ / | |||||
* | | | Updating nav active bg and Send invitation button | Asaad Mahmood | 2015-10-23 | 2 | -1/+8 |
| | | | |||||
* | | | Updating bot styling | Asaad Mahmood | 2015-10-23 | 1 | -1/+1 |
| | | | |||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-23 | 6 | -78/+94 |
|/ / | |||||
* | | Merge pull request #1140 from mattermost/plt-787 | Harrison Healey | 2015-10-23 | 3 | -5/+71 |
|\ \ | | | | | | | PLT-787 Auto-embed gifs from .gif links | ||||
| * | | Make sure gif only loads once | JoramWilander | 2015-10-23 | 1 | -0/+7 |
| | | | |||||
| * | | Auto-embed gifs from .gif links | JoramWilander | 2015-10-23 | 3 | -5/+64 |
| | | |