Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2015-10-28 | 20 | -153/+709 |
|\ | |||||
| * | Merge pull request #1210 from mattermost/PLT-25 | Christopher Speller | 2015-10-28 | 3 | -11/+4 |
| |\ | |||||
| | * | PLT-25 fixing issues with stats page | =Corey Hulen | 2015-10-27 | 3 | -11/+4 |
| * | | Dont display '1 minute ago' timestamps for post posted < than 1 minute ago | Florian Orben | 2015-10-28 | 1 | -2/+6 |
| |/ | |||||
| * | Merge pull request #1190 from mattermost/PLT-25 | Corey Hulen | 2015-10-27 | 9 | -2/+503 |
| |\ | |||||
| | * | adding arrow notation | =Corey Hulen | 2015-10-26 | 1 | -1/+1 |
| | * | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-26 | 25 | -127/+457 |
| | |\ | |||||
| | * | | PLT-25 adding stats to admin console | =Corey Hulen | 2015-10-26 | 2 | -68/+77 |
| | * | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-25 | 26 | -141/+564 |
| | |\ \ | |||||
| | * | | | PLT-25 adding analytics panel | =Corey Hulen | 2015-10-23 | 6 | -13/+268 |
| | * | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-23 | 79 | -475/+857 |
| | |\ \ \ | |||||
| | * | | | | Adding post counts by days | =Corey Hulen | 2015-10-22 | 2 | -3/+52 |
| | * | | | | Adding analytics tab | =Corey Hulen | 2015-10-22 | 5 | -1/+189 |
| * | | | | | Merge pull request #1195 from mattermost/plt-822 | Corey Hulen | 2015-10-27 | 9 | -139/+197 |
| |\ \ \ \ \ | |||||
| | * | | | | | Refactoring post_store into post_store and search_store | Christopher Speller | 2015-10-26 | 9 | -139/+197 |
* | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro... | Asaad Mahmood | 2015-10-27 | 36 | -236/+1060 |
|\| | | | | | | |||||
| * | | | | | | 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 #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 |
| | |/ / / / / / | |||||
| * | | | | | / | 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 | 1 | -7/+7 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Parse incoming webhook requsets into model instead of string map | JoramWilander | 2015-10-26 | 1 | -7/+7 |
| * | | | | | | | 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 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge pull request #1193 from hmhealey/plt798 | Corey Hulen | 2015-10-26 | 2 | -3/+9 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | 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 |
| | |/ / / / | |||||
| * | | | | | 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 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 |
| | * | | | | | 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 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #1183 from girishso/strip-extra-s | Harrison Healey | 2015-10-26 | 1 | -0/+1 |
| |\ \ \ \ \ |