Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1231 from hmhealey/plt798 | Joram Wilander | 2015-10-29 | 1 | -1/+1 |
|\ | | | | | PLT-798 Fixed nil pointer when failing to upload an oversized image | ||||
| * | Fixed nil pointer when failing to upload an oversized image | hmhealey | 2015-10-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1230 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-10-29 | 8 | -171/+239 |
|\ \ | |/ |/| | UI Improvements | ||||
| * | Updating margin for paragraphs | Asaad Mahmood | 2015-10-29 | 1 | -1/+7 |
| | | |||||
| * | UI Improvements | Asaad Mahmood | 2015-10-29 | 7 | -170/+232 |
|/ | |||||
* | Merge pull request #1227 from mattermost/plt-849 | Joram Wilander | 2015-10-29 | 2 | -4/+45 |
|\ | | | | | PLT-849 Update town square intro text. | ||||
| * | 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 #1226 from mattermost/bug-fix | Corey Hulen | 2015-10-29 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fixing 200 error bug | ||||
| * | | | Fixing 200 error bug | =Corey Hulen | 2015-10-29 | 2 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #1206 from florianorben/post_style | Corey Hulen | 2015-10-28 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | Change post paragraphs' line heights and margins for better readability | ||||
| * | | Change post paragraphs' line heights and margins for better readability | Florian Orben | 2015-10-28 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #1214 from mattermost/outgoing-hook-fix | Corey Hulen | 2015-10-28 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Pass in iter vars to closures properly for outgoing webhooks | ||||
| * | | | Pass in iter vars to closure properly | JoramWilander | 2015-10-28 | 1 | -4/+4 |
| | | | | |||||
* | | | | 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 | 20 | -200/+534 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 8 | -92/+274 |
| | | | | | | |||||
| * | | | | | Added Channel.Purpose on the server | hmhealey | 2015-10-27 | 7 | -7/+155 |
| | | | | | | |||||
| * | | | | | Renamed Channel.Description to Channel.Header on the client | hmhealey | 2015-10-27 | 10 | -62/+63 |
| | | | | | | |||||
| * | | | | | Renamed Channel.Description to Channel.Header on the server | hmhealey | 2015-10-27 | 8 | -61/+64 |
| | | | | | | |||||
* | | | | | | Merge pull request #1219 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-10-28 | 18 | -155/+188 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Ui improvements | ||||
| * | | | | | Multiple UI changes | Asaad Mahmood | 2015-10-29 | 14 | -59/+86 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-29 | 19 | -236/+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 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #1216 from mattermost/revert-1170-PLT-395 | Christopher Speller | 2015-10-28 | 13 | -219/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Revert "PLT-395: Add syntax highlighting to Markdown code blocks" | ||||
| * | | | | | | Revert "PLT-395: Add syntax highlighting to Markdown code blocks" | Christopher Speller | 2015-10-28 | 13 | -219/+1 |
|/ / / / / / | |||||
| | * | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-28 | 36 | -207/+1437 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | ui-improvements | ||||
* | | | | | | Merge pull request #1210 from mattermost/PLT-25 | Christopher Speller | 2015-10-28 | 4 | -11/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-25 fixing issues with stats page | ||||
| * | | | | | | PLT-25 fixing issues with stats page | =Corey Hulen | 2015-10-27 | 4 | -11/+10 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1187 from mattermost/code-contribution-guidelines-update | Christopher Speller | 2015-10-28 | 2 | -47/+49 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Code contribution guidelines update | ||||
| * | | | | | | | Update Code-Contribution-Guidelines.md | it33 | 2015-10-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fixing link | it33 | 2015-10-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Update CONTRIBUTING.md | it33 | 2015-10-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Update CONTRIBUTING.md | it33 | 2015-10-26 | 1 | -16/+12 |
| | | | | | | | | |||||
| * | | | | | | | Update CONTRIBUTING.md | it33 | 2015-10-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Update CONTRIBUTING.md | it33 | 2015-10-26 | 1 | -1/+4 |
| | | | | | | | | |||||
| * | | | | | | | Update Code-Contribution-Guidelines.md | it33 | 2015-10-26 | 1 | -44/+1 |
| | | | | | | | | |||||
| * | | | | | | | Update CONTRIBUTING.md | it33 | 2015-10-26 | 1 | -3/+49 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1205 from florianorben/fix-relative-time | Joram Wilander | 2015-10-28 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Dont display '1 minute ago' timestamps for post posted < than 1 minute ago | ||||
| * | | | | | | | Dont display '1 minute ago' timestamps for post posted < than 1 minute ago | Florian Orben | 2015-10-28 | 1 | -2/+6 |
| | |/ / / / / | |/| | | | | |