Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "add helper method to add ephemeral messages; also switch 'delete ↵ | Christopher Speller | 2015-12-10 | 5 | -103/+48 |
| | | | | mess…" | ||||
* | add helper method to add ephemeral messages; also switch 'delete message' to ↵ | Florian Orben | 2015-12-09 | 5 | -48/+103 |
| | | | | this new method | ||||
* | Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embeds | JoramWilander | 2015-12-09 | 4 | -8/+15 |
| | |||||
* | Merge pull request #1672 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-09 | 2 | -2/+1 |
|\ | | | | | Multiple UI Improvements | ||||
| * | Multiple UI Improvements | Asaad Mahmood | 2015-12-09 | 2 | -2/+1 |
| | | |||||
* | | Merge pull request #1670 from mattermost/plt-1407 | Corey Hulen | 2015-12-09 | 1 | -2/+9 |
|\ \ | |/ |/| | PLT-1407 Delay center scroll when sidebar opens to be after animation | ||||
| * | Delay center scroll when sidebar opens to be after animation | JoramWilander | 2015-12-09 | 1 | -2/+9 |
| | | |||||
* | | Merge pull request #1671 from hmhealey/plt1430 | Christopher Speller | 2015-12-09 | 3 | -16/+2 |
|\ \ | | | | | | | PLT-1430 Removed space bar from autocompletes | ||||
| * | | Removed space bar from autocompletes | hmhealey | 2015-12-09 | 3 | -16/+2 |
| |/ | |||||
* | | Merge pull request #1663 from mattermost/PLT-1418 | Joram Wilander | 2015-12-09 | 2 | -1/+46 |
|\ \ | | | | | | | PLT-1418 Adding old style replying in RHS | ||||
| * \ | Fixing merge | =Corey Hulen | 2015-12-08 | 7 | -16/+13 |
| |\ \ | |||||
| * | | | PLT-1418 Adding old style replying in RHS | =Corey Hulen | 2015-12-08 | 2 | -2/+47 |
| | | | | |||||
* | | | | Merge pull request #1657 from mattermost/plt-1410 | Christopher Speller | 2015-12-09 | 1 | -6/+13 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-1410 Fix email error not showing up on team signup page | ||||
| * | | | Fix email error not showing up on team signup page | JoramWilander | 2015-12-08 | 1 | -6/+13 |
| | | | | |||||
* | | | | Merge pull request #1661 from mattermost/plt-1425 | Harrison Healey | 2015-12-08 | 1 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-1425 Remove @all from recent mentions | ||||
| * | | | Remove @all from recent mentions | JoramWilander | 2015-12-08 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Closing RHS if jump is clicked for archives | Asaad Mahmood | 2015-12-08 | 1 | -0/+5 |
| | | | |||||
* | | | Adding jump text instead of icon | Asaad Mahmood | 2015-12-08 | 1 | -1/+1 |
| | | | |||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-08 | 6 | -15/+7 |
|/ / | |||||
* | | Merge pull request #1654 from hmhealey/plt1421 | Joram Wilander | 2015-12-08 | 1 | -3/+20 |
|\ \ | | | | | | | PLT-1421 Changed ordering of emoticon suggestions | ||||
| * | | Changed ordering of emoticon suggestions | hmhealey | 2015-12-08 | 1 | -3/+20 |
| |/ | |||||
* | | Merge pull request #1651 from mattermost/plt-1399 | Corey Hulen | 2015-12-08 | 1 | -3/+11 |
|\ \ | | | | | | | PLT-1399 Fix username on commented on message for webhooks | ||||
| * | | Fix username on commented on message for webhooks | JoramWilander | 2015-12-08 | 1 | -3/+11 |
| |/ | |||||
* / | Fix edited posts not updating by websocket | JoramWilander | 2015-12-08 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #1647 from mattermost/PLT-564 | Christopher Speller | 2015-12-08 | 1 | -4/+5 |
|\ | | | | | PLT-564 fixing error bar | ||||
| * | PLT-564 fixing error bar | =Corey Hulen | 2015-12-07 | 1 | -4/+5 |
| | | |||||
* | | Merge pull request #1645 from mattermost/plt-1365 | Christopher Speller | 2015-12-08 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1365 Don't display system console on mobile | ||||
| * | | Don't display system console on mobile | JoramWilander | 2015-12-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1639 from hmhealey/plt1063 | Christopher Speller | 2015-12-08 | 3 | -7/+4 |
|\ \ | | | | | | | PLT-1063 Switched marked to forked version | ||||
| * | | Removed special handling of snake_case words since that's now done by marked | hmhealey | 2015-12-07 | 1 | -5/+3 |
| | | | |||||
| * | | Switched marked to mattermost/marked | hmhealey | 2015-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | Removed :* smiley since it conflicts heavily with the markdown parser | hmhealey | 2015-12-07 | 1 | -1/+0 |
| |/ | |||||
* | | Merge pull request #1636 from mattermost/plt-1354 | Christopher Speller | 2015-12-08 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1354 Show channel member count up to 100 now | ||||
| * | | Show channel member count up to 100 now | JoramWilander | 2015-12-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1628 from florianorben/fix-font-load-on-first-page-visit | Joram Wilander | 2015-12-08 | 2 | -0/+13 |
|\ \ | | | | | | | fix font not being changed on first page visit (if preferences havent been loaded before) | ||||
| * | | fix font not being changed on first page visit (if preferences havent been ↵ | Florian Orben | 2015-12-04 | 2 | -0/+13 |
| | | | | | | | | | | | | loaded before) | ||||
* | | | Merge pull request #1640 from florianorben/collapse_fix | Joram Wilander | 2015-12-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix a typo that was breaking combination of sequential messages | ||||
| * | | | fix that was breaking combination of sequential messages | Florian Orben | 2015-12-07 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1641 from florianorben/display_system_username | Joram Wilander | 2015-12-08 | 3 | -2/+3 |
|\ \ \ | | | | | | | | | Display username 'System' for system messages | ||||
| * | | | Display username 'System' for system messages | Florian Orben | 2015-12-07 | 3 | -2/+3 |
| |/ / | |||||
* | | | Fixing es lint error | Asaad Mahmood | 2015-12-08 | 1 | -5/+0 |
| | | | |||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-07 | 14 | -14/+27 |
|/ / | |||||
* | | Merge pull request #1627 from florianorben/ux-formatting-task-list | Joram Wilander | 2015-12-07 | 1 | -1/+1 |
|\ \ | | | | | | | fix misaligned checkbox; remove list-style from list-elements with checkboxes | ||||
| * | | fix misaligned checkbox; remove list-style from list-elements with checkboxes | Florian Orben | 2015-12-05 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1616 from florianorben/PLT-1380 | Christopher Speller | 2015-12-07 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1380: Post system message when user updates channel header | ||||
| * | | PLT-1380: Post system message when user updates channel header | Florian Orben | 2015-12-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1626 from mattermost/PLT-1355 | Corey Hulen | 2015-12-04 | 3 | -7/+14 |
|\ \ \ | | | | | | | | | PLT-1355 Move link preview into pre-release feature | ||||
| * | | | PLT-1355 Move link preview into pre-release feature | =Corey Hulen | 2015-12-04 | 3 | -7/+14 |
| | | | | |||||
* | | | | Merge pull request #1630 from florianorben/autocomplete-on-tab | Corey Hulen | 2015-12-04 | 2 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | autocomplete component should enter suggestions on 'tab' | ||||
| * | | | | autocomplete component should enter suggestions on 'tab' | Florian Orben | 2015-12-04 | 2 | -2/+3 |
| | |_|/ | |/| | |