Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1174 from florianorben/member-popover | Christopher Speller | 2015-10-27 | 4 | -67/+215 |
|\ | | | | | Add styling to channel member popover | ||||
| * | add helper method to initiate a direct channel chat | Florian Orben | 2015-10-26 | 3 | -87/+66 |
| | | |||||
| * | use 'Overlay' instead if 'OverlayTrigger' | Florian Orben | 2015-10-26 | 1 | -22/+28 |
| | | |||||
| * | Add some to channel member popover | Florian Orben | 2015-10-26 | 2 | -2/+165 |
| | | |||||
* | | Merge pull request #1154 from girishso/username_symbols | Christopher Speller | 2015-10-27 | 2 | -4/+15 |
|\ \ | | | | | | | auto-link mentions with user names having symbols | ||||
| * | | auto-link mentions with user names having symbols | Girish S | 2015-10-27 | 2 | -4/+15 |
|/ / | | | | | | | this also handles the case where user_name having '_' | ||||
* | | Merge pull request #1194 from mattermost/webhook-request | Corey Hulen | 2015-10-26 | 2 | -7/+25 |
|\ \ | | | | | | | Parse incoming webhook requests into model instead of string map | ||||
| * | | Remove unused iconemoji field | JoramWilander | 2015-10-26 | 1 | -1/+0 |
| | | | |||||
| * | | Parse incoming webhook requsets into model instead of string map | JoramWilander | 2015-10-26 | 2 | -7/+26 |
| | | | |||||
* | | | 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 | ||||
* | | | | Update Troubleshooting.md | it33 | 2015-10-26 | 1 | -0/+8 |
| | | | | |||||
* | | | | Update README.md | it33 | 2015-10-26 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #1192 from mattermost/PLT-828 | Christopher Speller | 2015-10-26 | 4 | -8/+12 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-828 fixing db upgrade code | ||||
| * | | | PLT-828 fixing db upgrade code | =Corey Hulen | 2015-10-26 | 4 | -8/+12 |
| | | | | |||||
* | | | | Merge pull request #1164 from hmhealey/plt778 | Corey Hulen | 2015-10-26 | 7 | -87/+195 |
|\ \ \ \ | | | | | | | | | | | PLT-778 Changed post searching to allow searching by multiple users/channels | ||||
| * | | | | Moved logic for searching for posts by multiple users/channels into the sql ↵ | hmhealey | 2015-10-26 | 3 | -49/+73 |
| | | | | | | | | | | | | | | | | | | | | query | ||||
| * | | | | Changed post searching to allow searching by multiple users/channels | hmhealey | 2015-10-23 | 6 | -75/+159 |
| | | | | | |||||
* | | | | | Merge pull request #1193 from hmhealey/plt798 | Corey Hulen | 2015-10-26 | 4 | -8/+38 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-798 Prevent image files larger than 4k resolution from being uploaded | ||||
| * | | | | Prevented image files larger than 4k resolution from being uploaded | hmhealey | 2015-10-26 | 2 | -5/+29 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | Merge pull request #1172 from florianorben/PLT-703 | Joram Wilander | 2015-10-26 | 4 | -18/+42 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-703: Support multiple users being shown as typing underneath input boxes. | ||||
| * | | | | | 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 #1186 from mattermost/nginx-improvement | Corey Hulen | 2015-10-26 | 1 | -5/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | Adding more secure nginx instructions | ||||
| * | | | | Adding more secure nginx instructions | Christopher Speller | 2015-10-26 | 1 | -5/+6 |
| | | | | | |||||
* | | | | | Adding link | it33 | 2015-10-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Adding more GitLab 8.1 instructions | it33 | 2015-10-26 | 1 | -3/+18 |
| |/ / / |/| | | | |||||
* | | | | 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 | 13 | -1/+219 |
|\ \ \ \ | | | | | | | | | | | 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 | 9 | -2/+111 |
| | | | | | |||||
| * | | | | highlight code in markdown blocks | Florian Orben | 2015-10-24 | 6 | -0/+103 |
| | |_|/ | |/| | | |||||
* | | | | Update README.md | it33 | 2015-10-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update README.md | it33 | 2015-10-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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 |
| | | | | |