summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mattermost/platform into code-themesAsaad Mahmood2015-12-147-41/+309
|\
| * Merge pull request #1588 from rgarmsen2295/plt-881Joram Wilander2015-12-127-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 Garmsen2015-12-107-41/+309
| | | | | | | | | | | | options in app
* | | Multiple UI ImprovementsAsaad Mahmood2015-12-111-0/+22
|/ /
* | Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-111-26/+24
|\ \ | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists
| * | Changed Sidebar direct channel list to be driven by preferenceshmhealey2015-12-081-16/+25
| | |
| * | Moved logic for making direct channels visible to both members on post to ↵hmhealey2015-12-071-13/+2
| | | | | | | | | | | | the server
* | | Merge pull request #1703 from rgarmsen2295/plt-583Christopher Speller2015-12-111-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 disabledReed Garmsen2015-12-101-6/+13
| | | |
* | | | Merge pull request #1702 from rgarmsen2295/plt-1047Christopher Speller2015-12-112-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 Garmsen2015-12-102-20/+31
| |/ / / | | | | | | | | | | | | changed remaining copyrights
* | | | Merge pull request #1698 from rgarmsen2295/plt-1346Christopher Speller2015-12-111-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 Garmsen2015-12-101-32/+52
| |/ / / | | | | | | | | | | | | EnableTeamListing=false
* | | | Merge pull request #1684 from hmhealey/plt1184Joram Wilander2015-12-111-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 ↵hmhealey2015-12-101-18/+34
| | | | | | | | | | | | | | | | change is made
* | | | Revert "add helper method to add ephemeral messages; also switch 'delete ↵Christopher Speller2015-12-101-1/+1
| | | | | | | | | | | | | | | | mess…"
* | | | add helper method to add ephemeral messages; also switch 'delete message' to ↵Florian Orben2015-12-091-1/+1
| | | | | | | | | | | | | | | | this new method
* | | | Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embedsJoramWilander2015-12-093-6/+13
|/ / /
* | | Merge pull request #1672 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-091-1/+1
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2015-12-091-1/+1
| | | |
* | | | Merge pull request #1670 from mattermost/plt-1407Corey Hulen2015-12-091-2/+9
|\ \ \ \ | |/ / / |/| | | PLT-1407 Delay center scroll when sidebar opens to be after animation
| * | | Delay center scroll when sidebar opens to be after animationJoramWilander2015-12-091-2/+9
| | | |
* | | | Merge pull request #1671 from hmhealey/plt1430Christopher Speller2015-12-092-2/+1
|\ \ \ \ | | | | | | | | | | PLT-1430 Removed space bar from autocompletes
| * | | | Removed space bar from autocompleteshmhealey2015-12-092-2/+1
| |/ / /
* | | | Merge pull request #1663 from mattermost/PLT-1418Joram Wilander2015-12-091-1/+21
|\ \ \ \ | | | | | | | | | | PLT-1418 Adding old style replying in RHS
| * \ \ \ Fixing merge=Corey Hulen2015-12-087-16/+13
| |\ \ \ \
| * | | | | PLT-1418 Adding old style replying in RHS=Corey Hulen2015-12-081-2/+22
| | | | | |
* | | | | | Merge pull request #1657 from mattermost/plt-1410Christopher Speller2015-12-091-6/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | PLT-1410 Fix email error not showing up on team signup page
| * | | | | Fix email error not showing up on team signup pageJoramWilander2015-12-081-6/+13
| | | | | |
* | | | | | Merge pull request #1661 from mattermost/plt-1425Harrison Healey2015-12-081-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | PLT-1425 Remove @all from recent mentions
| * | | | | Remove @all from recent mentionsJoramWilander2015-12-081-3/+3
| | |/ / / | |/| | |
* | | | | Closing RHS if jump is clicked for archivesAsaad Mahmood2015-12-081-0/+5
| | | | |
* | | | | Adding jump text instead of iconAsaad Mahmood2015-12-081-1/+1
| | | | |
* | | | | Multiple UI ImprovementsAsaad Mahmood2015-12-086-15/+7
|/ / / /
* | | | Merge pull request #1654 from hmhealey/plt1421Joram Wilander2015-12-081-3/+20
|\ \ \ \ | | | | | | | | | | PLT-1421 Changed ordering of emoticon suggestions
| * | | | Changed ordering of emoticon suggestionshmhealey2015-12-081-3/+20
| |/ / /
* / / / Fix username on commented on message for webhooksJoramWilander2015-12-081-3/+11
|/ / /
* | | Merge pull request #1645 from mattermost/plt-1365Christopher Speller2015-12-081-1/+1
|\ \ \ | | | | | | | | PLT-1365 Don't display system console on mobile
| * | | Don't display system console on mobileJoramWilander2015-12-071-1/+1
| |/ /
* | | Merge pull request #1628 from florianorben/fix-font-load-on-first-page-visitJoram Wilander2015-12-081-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 Orben2015-12-041-0/+1
| | | | | | | | | | | | | | | | loaded before)
* | | | Merge pull request #1640 from florianorben/collapse_fixJoram Wilander2015-12-081-1/+1
|\ \ \ \ | | | | | | | | | | fix a typo that was breaking combination of sequential messages
| * | | | fix that was breaking combination of sequential messagesFlorian Orben2015-12-071-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1641 from florianorben/display_system_usernameJoram Wilander2015-12-082-2/+2
|\ \ \ \ | | | | | | | | | | Display username 'System' for system messages
| * | | | Display username 'System' for system messagesFlorian Orben2015-12-072-2/+2
| |/ / /
* | | | Fixing es lint errorAsaad Mahmood2015-12-081-5/+0
| | | |
* | | | Multiple UI ImprovementsAsaad Mahmood2015-12-0713-14/+26
|/ / /
* | | Merge pull request #1616 from florianorben/PLT-1380Christopher Speller2015-12-071-1/+1
|\ \ \ | | | | | | | | PLT-1380: Post system message when user updates channel header
| * | | PLT-1380: Post system message when user updates channel headerFlorian Orben2015-12-041-1/+1
| | | |
* | | | Merge pull request #1626 from mattermost/PLT-1355Corey Hulen2015-12-042-7/+10
|\ \ \ \ | | | | | | | | | | PLT-1355 Move link preview into pre-release feature