Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1730 from mattermost/PLT-1404 | Joram Wilander | 2015-12-15 | 3 | -0/+28 |
|\ | | | | | PLT-1404 signal login to other tabs | ||||
| * | PLT-1404 signal login to other tags | =Corey Hulen | 2015-12-14 | 3 | -0/+28 |
| | | |||||
* | | Merge pull request #1725 from mattermost/fix-console-err | Christopher Speller | 2015-12-15 | 3 | -0/+40 |
|\ \ | | | | | | | Adding error bar message when console error detected | ||||
| * | | Adding error bar message when console error detected | =Corey Hulen | 2015-12-14 | 3 | -0/+40 |
| |/ | |||||
* | | Merge branch 'release-1.3' | Christopher Speller | 2015-12-14 | 8 | -16/+15 |
|\ \ | |||||
| * | | Fixing pageup issue | Asaad Mahmood | 2015-12-15 | 2 | -7/+1 |
| | | | |||||
| * | | Updating container fluid css | Asaad Mahmood | 2015-12-14 | 1 | -0/+6 |
| | | | |||||
| * | | Adding sidebar animation back | Asaad Mahmood | 2015-12-14 | 1 | -0/+5 |
| | | | |||||
| * | | Removing translateX | Asaad Mahmood | 2015-12-14 | 1 | -5/+0 |
| | | | |||||
| * | | Fixing IE scrolling issue and also fixing horizontal scrollbar | Asaad Mahmood | 2015-12-14 | 4 | -6/+7 |
| | | | |||||
| * | | Push notifications help text update | it33 | 2015-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Changed positioning of root elements to fix weird IE11 bug | hmhealey | 2015-12-11 | 1 | -3/+2 |
| | | | |||||
| * | | Fixing eslint error | =Corey Hulen | 2015-12-11 | 1 | -1/+0 |
| | | | |||||
| * | | PLT-1472 Adding back button to search click through | =Corey Hulen | 2015-12-11 | 2 | -8/+7 |
| | | | |||||
| * | | Fixing jumping of center channel with few posts on IE11 | Christopher Speller | 2015-12-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1711 from asaadmahmoodspin/code-themes | Corey Hulen | 2015-12-14 | 11 | -25/+73 |
|\ \ \ | |_|/ |/| | | Multiple UI Improvements | ||||
| * | | Removing sidebar right fix | Asaad Mahmood | 2015-12-14 | 1 | -1/+5 |
| | | | |||||
| * | | Fixing sidebar--right | Asaad Mahmood | 2015-12-14 | 1 | -5/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into code-themes | Asaad Mahmood | 2015-12-14 | 8 | -45/+332 |
| |\ \ | |||||
| * | | | Updating the naming for the docs page | Asaad Mahmood | 2015-12-14 | 2 | -2/+2 |
| | | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-11 | 10 | -24/+72 |
| | | | | |||||
* | | | | Merge pull request #1690 from npcode/trim-outgoing-callback-url | Harrison Healey | 2015-12-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Trim callback urls for outgoing webhooks | ||||
| * | | | | Trim callback urls for outgoing webhooks | Yi EungJun | 2015-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Adding traling whitespace is common mistake. | ||||
* | | | | | Merge pull request #1697 from asaadmahmoodspin/master | Harrison Healey | 2015-12-14 | 2 | -14/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | FIxing scroll for more direct channels | ||||
| * | | | | | ADding utilis mobile instead of width | Asaad Mahmood | 2015-12-11 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Updating direct messages code | Asaad Mahmood | 2015-12-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Updating code for direct messages | Asaad Mahmood | 2015-12-10 | 2 | -3/+5 |
| | | | | | | |||||
| * | | | | | FIxing scroll for more direct channels | Asaad Mahmood | 2015-12-10 | 2 | -14/+19 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1716 from rgarmsen2295/plt-1453 | Harrison Healey | 2015-12-14 | 1 | -7/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1453 No longer errors upon saving the same info in Account Settings -> General | ||||
| * | | | | | No longer errors upon saving the same info in Account Settings -> General | Reed Garmsen | 2015-12-11 | 1 | -7/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1717 from rgarmsen2295/plt-1026 | Harrison Healey | 2015-12-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1026 Bolds the team name when the team's statistics page is selected in the system console | ||||
| * | | | | | When a team's statistics is selected in the sys console the team name is now ↵ | Reed Garmsen | 2015-12-11 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | also bolded | ||||
* | | | | | Merge pull request #1720 from rgarmsen2295/plt-860 | Harrison Healey | 2015-12-14 | 2 | -3/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+' | ||||
| * | | | | 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 #1588 from rgarmsen2295/plt-881 | Joram Wilander | 2015-12-12 | 8 | -45/+332 |
|\ \ \ \ | |/ / / |/| | | | 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 | 8 | -45/+332 |
| | | | | | | | | | | | | | | | | options in app | ||||
* | | | | 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…" |