Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2015-10-27 | 65 | -395/+1881 |
|\ | |||||
| * | Added known issue for deleted channels | it33 | 2015-10-27 | 1 | -1/+2 |
| * | Merge pull request #1197 from rgarmsen2295/plt-166 | Christopher Speller | 2015-10-27 | 1 | -1/+6 |
| |\ | |||||
| | * | Fixed issue with missing help text for @all and @channel in mention list | Reed Garmsen | 2015-10-26 | 1 | -1/+6 |
| * | | Merge pull request #1184 from girishso/add-trailing-slash | Christopher Speller | 2015-10-27 | 1 | -0/+7 |
| |\ \ | |||||
| | * | | adds trailing slash if missing from Directory in config.json | Girish S | 2015-10-27 | 1 | -0/+7 |
| * | | | Merge pull request #1174 from florianorben/member-popover | Christopher Speller | 2015-10-27 | 4 | -67/+215 |
| |\ \ \ | |||||
| | * | | | 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 | Girish S | 2015-10-27 | 2 | -4/+15 |
| |/ / / | |||||
| * | | | Merge pull request #1194 from mattermost/webhook-request | Corey Hulen | 2015-10-26 | 2 | -7/+25 |
| |\ \ \ | |||||
| | * | | | 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 help | it33 | 2015-10-25 | 1 | -1/+1 |
| | * | | | | Update websocket error | it33 | 2015-10-25 | 1 | -1/+1 |
| * | | | | | 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 | =Corey Hulen | 2015-10-26 | 4 | -8/+12 |
| * | | | | Merge pull request #1164 from hmhealey/plt778 | Corey Hulen | 2015-10-26 | 7 | -87/+195 |
| |\ \ \ \ | |||||
| | * | | | | Moved logic for searching for posts by multiple users/channels into the sql q... | hmhealey | 2015-10-26 | 3 | -49/+73 |
| | * | | | | 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 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | 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 server... | hmhealey | 2015-10-26 | 2 | -3/+9 |
| * | | | | | Merge pull request #1191 from mattermost/PLT-564 | Joram Wilander | 2015-10-26 | 1 | -12/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | 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 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | 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 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 | 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 trashcan/github-1130-handle-trailing-characters... | Harrison Healey | 2015-10-26 | 1 | -14/+48 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | 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 |
| |\ \ \ \ | |||||
| | * | | | | Add java and ini language | Florian Orben | 2015-10-24 | 2 | -1/+7 |
| | * | | | | fix markup if code is of unknown language | Florian Orben | 2015-10-24 | 1 | -1/+1 |