Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #1211 from mattermost/PLT-340 | Joram Wilander | 2015-10-30 | 13 | -57/+495 | |
|\ \ | | | | | | | PLT-340 allow team directory and open invites | |||||
| * | | Adding error when enabling team dir without global prop being set. | =Corey Hulen | 2015-10-29 | 1 | -2/+9 | |
| | | | ||||||
| * | | Moving single team redirect to backend | =Corey Hulen | 2015-10-28 | 1 | -6/+0 | |
| | | | ||||||
| * | | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-28 | 3 | -12/+10 | |
| |\ \ | ||||||
| * | | | Removing console.log | =Corey Hulen | 2015-10-27 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | PLT-340 | =Corey Hulen | 2015-10-27 | 13 | -57/+496 | |
| | | | | ||||||
* | | | | Merge pull request #1220 from florianorben/PLT-395 | Harrison Healey | 2015-10-30 | 7 | -2/+213 | |
|\ \ \ \ | | | | | | | | | | | PLT-395: Add syntax highlighting to Markdown code blocks | |||||
| * | | | | allow code theme to be shareable | Florian Orben | 2015-10-29 | 2 | -2/+7 | |
| | | | | | ||||||
| * | | | | use XML syntax highlighting if provided language is html | Florian Orben | 2015-10-29 | 1 | -4/+10 | |
| | | | | | ||||||
| * | | | | escape user input | Florian Orben | 2015-10-29 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Add java and ini language | Florian Orben | 2015-10-29 | 2 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | Forgot to add those altough they are quite common | |||||
| * | | | | fix markup if code is of unknown language | Florian Orben | 2015-10-29 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | code style theme chooser | Florian Orben | 2015-10-29 | 4 | -1/+110 | |
| | | | | | ||||||
| * | | | | highlight code in markdown blocks | Florian Orben | 2015-10-29 | 3 | -0/+85 | |
| | | | | | ||||||
* | | | | | Merge pull request #1233 from hmhealey/plt600 | Christopher Speller | 2015-10-30 | 2 | -5/+12 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-600 Added help text for the channel header and purpose dialogs | |||||
| * | | | | Added help text for the channel header and purpose dialogs | hmhealey | 2015-10-29 | 2 | -5/+12 | |
| |/ / / | ||||||
* | | | | simplify check if ctrl+enter was pressed | Florian Orben | 2015-10-29 | 2 | -75/+4 | |
| | | | | ||||||
* | | | | fix component unmount | Florian Orben | 2015-10-29 | 2 | -1/+70 | |
| | | | | ||||||
* | | | | enable ctrl+enter send for edit msg modal | Florian Orben | 2015-10-29 | 1 | -4/+25 | |
|/ / / | ||||||
* | | | UI Improvements | Asaad Mahmood | 2015-10-29 | 2 | -91/+125 | |
| | | | ||||||
* | | | 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 | |
| | | | | | |