Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed issue with emails containing a '+' | Reed Garmsen | 2015-12-13 | 1 | -1/+1 |
| | |||||
* | Updated emails in unit tests to include '+' | Reed Garmsen | 2015-12-13 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1652 from hmhealey/plt1319 | Corey Hulen | 2015-12-11 | 6 | -30/+57 |
|\ | | | | | 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 | 2 | -17/+31 |
| | | |||||
| * | Moved logic for making direct channels visible to both members on post to ↵ | hmhealey | 2015-12-07 | 1 | -13/+2 |
| | | | | | | | | the server | ||||
| * | Added preference_changed web socket event | hmhealey | 2015-12-07 | 4 | -4/+28 |
| | | |||||
* | | 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 | 3 | -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 Garmsen | 2015-12-10 | 3 | -21/+32 |
| |/ / | | | | | | | | | | 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 | 3 | -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 ↵ | hmhealey | 2015-12-10 | 3 | -20/+43 |
| | | | | | | | | | | | | change is made | ||||
* | | | 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 | ||||
* | | | Merge pull request #1678 from mattermost/plt-1402 | Corey Hulen | 2015-12-09 | 4 | -8/+15 |
|\ \ \ | |/ / |/| | | PLT-1402 Fix OEmbeds when switching channel, vine/soundcloud heights, and yout… | ||||
| * | | Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embeds | JoramWilander | 2015-12-09 | 4 | -8/+15 |
| | | | |||||
* | | | Merge pull request #1674 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-12-09 | 2 | -2/+3 |
|\ \ \ | |/ / |/| | | Ui improvements | ||||
| * | | Improving pencil icon for manage members | Asaad Mahmood | 2015-12-09 | 1 | -1/+3 |
| | | | |||||
| * | | Removing clearfix from modal body | Asaad Mahmood | 2015-12-09 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #1672 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-09 | 146 | -324/+47799 |
|\| | | | | | | | | Multiple UI Improvements | ||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-12-09 | 146 | -324/+47799 |
| | | | |||||
* | | | 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 | 3 | -1/+53 |
|\ \ \ | | | | | | | | | PLT-1418 Adding old style replying in RHS | ||||
| * \ \ | Fixing merge | =Corey Hulen | 2015-12-08 | 15 | -39/+59 |
| |\ \ \ | |||||
| * | | | | PLT-1418 Adding old style replying in RHS | =Corey Hulen | 2015-12-08 | 3 | -2/+54 |
| | | | | | |||||
* | | | | | 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 | 2 | -0/+6 |
| | | | | |||||
* | | | | Adding jump text instead of icon | Asaad Mahmood | 2015-12-08 | 2 | -2/+9 |
| | | | | |||||
* | | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-08 | 14 | -37/+44 |
|/ / / | |||||
* | | | 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 |
| |/ |