Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform into code-themes | Asaad Mahmood | 2015-12-14 | 7 | -41/+309 |
|\ | |||||
| * | Merge pull request #1588 from rgarmsen2295/plt-881 | Joram Wilander | 2015-12-12 | 7 | -41/+309 |
| |\ | | | | | | | PLT-881 Adds Legal and Support Settings to the System Console | ||||
| | * | Added legal and support settings to sys console and implemented support for ↵ | Reed Garmsen | 2015-12-10 | 7 | -41/+309 |
| | | | | | | | | | | | | options in app | ||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-11 | 1 | -0/+22 |
|/ / | |||||
* | | Merge pull request #1652 from hmhealey/plt1319 | Corey Hulen | 2015-12-11 | 1 | -26/+24 |
|\ \ | | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists | ||||
| * | | Changed Sidebar direct channel list to be driven by preferences | hmhealey | 2015-12-08 | 1 | -16/+25 |
| | | | |||||
| * | | Moved logic for making direct channels visible to both members on post to ↵ | hmhealey | 2015-12-07 | 1 | -13/+2 |
| | | | | | | | | | | | | the server | ||||
* | | | Merge pull request #1703 from rgarmsen2295/plt-583 | Christopher Speller | 2015-12-11 | 1 | -6/+13 |
|\ \ \ | | | | | | | | | PLT-583 Disables the ability to send email invites when user creation is disabled | ||||
| * | | | Disables the ability to send email invites when user creation is disabled | Reed Garmsen | 2015-12-10 | 1 | -6/+13 |
| | | | | |||||
* | | | | Merge pull request #1702 from rgarmsen2295/plt-1047 | Christopher Speller | 2015-12-11 | 2 | -20/+31 |
|\ \ \ \ | | | | | | | | | | | PLT-1047 Fixed issue with Team Settings modal visually saving items instead of cancelling | ||||
| * | | | | Fixed issue with Team Settings modal saving items instead of cancelling; ↵ | Reed Garmsen | 2015-12-10 | 2 | -20/+31 |
| |/ / / | | | | | | | | | | | | | changed remaining copyrights | ||||
* | | | | Merge pull request #1698 from rgarmsen2295/plt-1346 | Christopher Speller | 2015-12-11 | 1 | -32/+52 |
|\ \ \ \ | | | | | | | | | | | PLT-1346 Hides the ability to enable team listing on a team where it's been disabled in the system console | ||||
| * | | | | Disabling ability to enable team listing on a system where ↵ | Reed Garmsen | 2015-12-10 | 1 | -32/+52 |
| |/ / / | | | | | | | | | | | | | EnableTeamListing=false | ||||
* | | | | Merge pull request #1684 from hmhealey/plt1184 | Joram Wilander | 2015-12-11 | 1 | -18/+34 |
|\ \ \ \ | |/ / / |/| | | | PLT-1184 Fixed EditChannelHeaderModal's contents not being updated when a change is made | ||||
| * | | | Fixed EditChannelHeaderModal's contents not always being updated when a ↵ | hmhealey | 2015-12-10 | 1 | -18/+34 |
| | | | | | | | | | | | | | | | | change is made | ||||
* | | | | Revert "add helper method to add ephemeral messages; also switch 'delete ↵ | Christopher Speller | 2015-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | mess…" | ||||
* | | | | add helper method to add ephemeral messages; also switch 'delete message' to ↵ | Florian Orben | 2015-12-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | this new method | ||||
* | | | | Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embeds | JoramWilander | 2015-12-09 | 3 | -6/+13 |
|/ / / | |||||
* | | | Merge pull request #1672 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-09 | 1 | -1/+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 | 2 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | PLT-1430 Removed space bar from autocompletes | ||||
| * | | | | Removed space bar from autocompletes | hmhealey | 2015-12-09 | 2 | -2/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1663 from mattermost/PLT-1418 | Joram Wilander | 2015-12-09 | 1 | -1/+21 |
|\ \ \ \ | | | | | | | | | | | 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 | 1 | -2/+22 |
| | | | | | | |||||
* | | | | | | 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 |
| |/ / / | |||||
* / / / | Fix username on commented on message for webhooks | JoramWilander | 2015-12-08 | 1 | -3/+11 |
|/ / / | |||||
* | | | 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 #1628 from florianorben/fix-font-load-on-first-page-visit | Joram Wilander | 2015-12-08 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | 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 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | 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 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Display username 'System' for system messages | ||||
| * | | | | Display username 'System' for system messages | Florian Orben | 2015-12-07 | 2 | -2/+2 |
| |/ / / | |||||
* | | | | Fixing es lint error | Asaad Mahmood | 2015-12-08 | 1 | -5/+0 |
| | | | | |||||
* | | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-07 | 13 | -14/+26 |
|/ / / | |||||
* | | | 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 | 2 | -7/+10 |
|\ \ \ \ | | | | | | | | | | | PLT-1355 Move link preview into pre-release feature |