summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-116-30/+57
|\ | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists
| * Changed Sidebar direct channel list to be driven by preferenceshmhealey2015-12-082-17/+31
| |
| * Moved logic for making direct channels visible to both members on post to ↵hmhealey2015-12-071-13/+2
| | | | | | | | the server
| * Added preference_changed web socket eventhmhealey2015-12-074-4/+28
| |
* | 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-113-21/+32
|\ \ \ | | | | | | | | 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-103-21/+32
| |/ / | | | | | | | | | 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-113-20/+43
|\ \ \ | |/ / |/| | 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-103-20/+43
| | | | | | | | | | | | change is made
* | | Revert "add helper method to add ephemeral messages; also switch 'delete ↵Christopher Speller2015-12-105-103/+48
| | | | | | | | | | | | mess…"
* | | add helper method to add ephemeral messages; also switch 'delete message' to ↵Florian Orben2015-12-095-48/+103
| | | | | | | | | | | | this new method
* | | Merge pull request #1678 from mattermost/plt-1402Corey Hulen2015-12-094-8/+15
|\ \ \ | |/ / |/| | PLT-1402 Fix OEmbeds when switching channel, vine/soundcloud heights, and yout…
| * | Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embedsJoramWilander2015-12-094-8/+15
| | |
* | | Merge pull request #1674 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-12-092-2/+3
|\ \ \ | |/ / |/| | Ui improvements
| * | Improving pencil icon for manage membersAsaad Mahmood2015-12-091-1/+3
| | |
| * | Removing clearfix from modal bodyAsaad Mahmood2015-12-091-1/+0
| | |
* | | Merge pull request #1672 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-09146-324/+47799
|\| | | | | | | | Multiple UI Improvements
| * | Multiple UI ImprovementsAsaad Mahmood2015-12-09146-324/+47799
| | |
* | | 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-093-16/+2
|\ \ \ | | | | | | | | PLT-1430 Removed space bar from autocompletes
| * | | Removed space bar from autocompleteshmhealey2015-12-093-16/+2
| |/ /
* | | Merge pull request #1663 from mattermost/PLT-1418Joram Wilander2015-12-093-1/+53
|\ \ \ | | | | | | | | PLT-1418 Adding old style replying in RHS
| * \ \ Fixing merge=Corey Hulen2015-12-0815-39/+59
| |\ \ \
| * | | | PLT-1418 Adding old style replying in RHS=Corey Hulen2015-12-083-2/+54
| | | | |
* | | | | 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-082-0/+6
| | | |
* | | | Adding jump text instead of iconAsaad Mahmood2015-12-082-2/+9
| | | |
* | | | Multiple UI ImprovementsAsaad Mahmood2015-12-0814-37/+44
|/ / /
* | | 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
| |/ /
* | | Merge pull request #1651 from mattermost/plt-1399Corey Hulen2015-12-081-3/+11
|\ \ \ | | | | | | | | PLT-1399 Fix username on commented on message for webhooks
| * | | Fix username on commented on message for webhooksJoramWilander2015-12-081-3/+11
| |/ /
* / / Fix edited posts not updating by websocketJoramWilander2015-12-081-0/+1
|/ /
* | Merge pull request #1647 from mattermost/PLT-564Christopher Speller2015-12-081-4/+5
|\ \ | | | | | | PLT-564 fixing error bar
| * | PLT-564 fixing error bar=Corey Hulen2015-12-071-4/+5
| |/
* | 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 #1639 from hmhealey/plt1063Christopher Speller2015-12-083-7/+4
|\ \ | | | | | | PLT-1063 Switched marked to forked version
| * | Removed special handling of snake_case words since that's now done by markedhmhealey2015-12-071-5/+3
| | |
| * | Switched marked to mattermost/markedhmhealey2015-12-071-1/+1
| | |
| * | Removed :* smiley since it conflicts heavily with the markdown parserhmhealey2015-12-071-1/+0
| |/
* | Merge pull request #1636 from mattermost/plt-1354Christopher Speller2015-12-082-2/+2
|\ \ | | | | | | PLT-1354 Show channel member count up to 100 now
| * | Show channel member count up to 100 nowJoramWilander2015-12-072-2/+2
| |/