Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add team type constants. | JoramWilander | 2015-10-29 | 1 | -0/+2 |
| | |||||
* | Update town square intro text. | JoramWilander | 2015-10-29 | 1 | -4/+43 |
| | |||||
* | Merge pull request #1224 from rgarmsen2295/plt-763 | Joram Wilander | 2015-10-29 | 4 | -2/+4 |
|\ | | | | | PLT-763 Fixed issue with refocusing not working after editing a post in the RHS | ||||
| * | Fixed issue with refocusing not working after editing a post in the RHS | Reed Garmsen | 2015-10-28 | 4 | -2/+4 |
| | | |||||
* | | Merge pull request #1221 from florianorben/disallow_edit_bot_msg_arrow_up | Joram Wilander | 2015-10-29 | 1 | -4/+5 |
|\ \ | | | | | | | Dont edit reply messages of outgoing webhooks by pressing up-arrow in chat input box | ||||
| * | | Dont edit reply messages of outgoing webhooks by pressing up-arrow in chat ↵ | Florian Orben | 2015-10-28 | 1 | -4/+5 |
| | | | | | | | | | | | | input box | ||||
* | | | Merge pull request #1218 from hmhealey/underscores | Joram Wilander | 2015-10-29 | 2 | -37/+77 |
|\ \ \ | |_|/ |/| | | PLT-631/PLT-764/PLT-204/PLT-521 Updating autolinking and handling of underscores by the markdown parser | ||||
| * | | Updated markdown regexes to better handle underscores and links | hmhealey | 2015-10-28 | 2 | -33/+42 |
| | | | |||||
| * | | Modified markdown lexer to not break up words written in snake_case | hmhealey | 2015-10-28 | 2 | -8/+39 |
| |/ | |||||
* | | Merge pull request #1213 from mattermost/plt-836 | Corey Hulen | 2015-10-28 | 2 | -27/+43 |
|\ \ | | | | | | | PLT-836 Prevent markdown styled links from embedding gifs | ||||
| * | | Prevent markdown styled links from embedding gifs | JoramWilander | 2015-10-28 | 2 | -27/+43 |
| | | | |||||
* | | | Merge pull request #1199 from hmhealey/plt600 | Corey Hulen | 2015-10-28 | 10 | -137/+320 |
|\ \ \ | | | | | | | | | PLT-600 Renamed channel description to channel header and added channel purpose field | ||||
| * | | | Added ability to see/edit channel purpose in the client | hmhealey | 2015-10-27 | 7 | -91/+273 |
| | | | | |||||
| * | | | Renamed Channel.Description to Channel.Header on the client | hmhealey | 2015-10-27 | 9 | -61/+62 |
| | | | | |||||
* | | | | Multiple UI changes | Asaad Mahmood | 2015-10-29 | 8 | -12/+35 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-29 | 12 | -218/+236 |
|\ \ \ \ | | |_|/ | |/| | | | | | | ui-improvements | ||||
| * | | | Merge pull request #1196 from florianorben/send-on-ctrl | Joram Wilander | 2015-10-28 | 7 | -17/+235 |
| |\ \ \ | | | | | | | | | | | allow messages to be send on ctrl+enter | ||||
| | * | | | add new user-setting section 'advanced' and remove ctrl-send setting from ↵ | Florian Orben | 2015-10-28 | 7 | -101/+202 |
| | | | | | | | | | | | | | | | | | | | | general tab | ||||
| | * | | | allow messages to be send on ctrl+enter | Florian Orben | 2015-10-28 | 3 | -17/+134 |
| | | | | | |||||
| * | | | | Revert "PLT-395: Add syntax highlighting to Markdown code blocks" | Christopher Speller | 2015-10-28 | 6 | -201/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-28 | 17 | -153/+641 |
|\| | | | | | | | | | | | | | | | | | | | ui-improvements | ||||
| * | | | | Merge pull request #1210 from mattermost/PLT-25 | Christopher Speller | 2015-10-28 | 2 | -10/+4 |
| |\ \ \ \ | | | | | | | | | | | | | PLT-25 fixing issues with stats page | ||||
| | * | | | | PLT-25 fixing issues with stats page | =Corey Hulen | 2015-10-27 | 2 | -10/+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 | 6 | -2/+434 |
| |\ \ \ | | |/ / | |/| | | PLT-25 adding stats to admin console | ||||
| | * | | adding arrow notation | =Corey Hulen | 2015-10-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-26 | 17 | -120/+432 |
| | |\ \ | |||||
| | * | | | 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 | 20 | -124/+437 |
| | |\ \ \ | |||||
| | * | | | | PLT-25 adding analytics panel | =Corey Hulen | 2015-10-23 | 3 | -13/+230 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-23 | 59 | -394/+601 |
| | |\ \ \ \ | |||||
| | * | | | | | Adding post counts by days | =Corey Hulen | 2015-10-22 | 1 | -3/+37 |
| | | | | | | | |||||
| | * | | | | | Adding analytics tab | =Corey Hulen | 2015-10-22 | 4 | -1/+173 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1195 from mattermost/plt-822 | Corey Hulen | 2015-10-27 | 9 | -139/+197 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-822 Refactoring post_store into post_store and search_store | ||||
| | * | | | | | | 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 ↵ | Asaad Mahmood | 2015-10-27 | 26 | -229/+962 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements | ||||
| * | | | | | | Merge pull request #1197 from rgarmsen2295/plt-166 | Christopher Speller | 2015-10-27 | 1 | -1/+6 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-166 Fixed issue with missing help text for @all and @channel in mention list | ||||
| | * | | | | | | 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 | 3 | -67/+182 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+132 |
| | |/ / / / / / | |||||
| * | | | | | / | 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 #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 |
| | | | | | | |