summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-1.3'Christopher Speller2015-12-148-16/+15
|\
| * Fixing pageup issueAsaad Mahmood2015-12-152-7/+1
| * Updating container fluid cssAsaad Mahmood2015-12-141-0/+6
| * Adding sidebar animation backAsaad Mahmood2015-12-141-0/+5
| * Removing translateXAsaad Mahmood2015-12-141-5/+0
| * Fixing IE scrolling issue and also fixing horizontal scrollbarAsaad Mahmood2015-12-144-6/+7
| * Push notifications help text updateit332015-12-141-1/+1
| * Changed positioning of root elements to fix weird IE11 bughmhealey2015-12-111-3/+2
| * Fixing eslint error=Corey Hulen2015-12-111-1/+0
| * PLT-1472 Adding back button to search click through=Corey Hulen2015-12-112-8/+7
| * Fixing jumping of center channel with few posts on IE11Christopher Speller2015-12-101-0/+1
* | Merge pull request #1711 from asaadmahmoodspin/code-themesCorey Hulen2015-12-1411-25/+73
|\ \
| * | Removing sidebar right fixAsaad Mahmood2015-12-141-1/+5
| * | Fixing sidebar--rightAsaad Mahmood2015-12-141-5/+1
| * | Merge branch 'master' of https://github.com/mattermost/platform into code-themesAsaad Mahmood2015-12-148-45/+332
| |\ \
| * | | Updating the naming for the docs pageAsaad Mahmood2015-12-142-2/+2
| * | | Multiple UI ImprovementsAsaad Mahmood2015-12-1110-24/+72
* | | | Merge pull request #1690 from npcode/trim-outgoing-callback-urlHarrison Healey2015-12-141-1/+1
|\ \ \ \
| * | | | Trim callback urls for outgoing webhooksYi EungJun2015-12-121-1/+1
* | | | | Merge pull request #1697 from asaadmahmoodspin/masterHarrison Healey2015-12-142-14/+21
|\ \ \ \ \
| * | | | | ADding utilis mobile instead of widthAsaad Mahmood2015-12-111-3/+3
| * | | | | Updating direct messages codeAsaad Mahmood2015-12-111-1/+1
| * | | | | Updating code for direct messagesAsaad Mahmood2015-12-102-3/+5
| * | | | | FIxing scroll for more direct channelsAsaad Mahmood2015-12-102-14/+19
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1716 from rgarmsen2295/plt-1453Harrison Healey2015-12-141-7/+8
|\ \ \ \ \
| * | | | | No longer errors upon saving the same info in Account Settings -> GeneralReed Garmsen2015-12-111-7/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #1717 from rgarmsen2295/plt-1026Harrison Healey2015-12-141-1/+1
|\ \ \ \ \
| * | | | | When a team's statistics is selected in the sys console the team name is now ...Reed Garmsen2015-12-111-1/+1
| |/ / / /
* | | | | Merge pull request #1720 from rgarmsen2295/plt-860Harrison Healey2015-12-142-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed issue with emails containing a '+'Reed Garmsen2015-12-131-1/+1
| * | | | Updated emails in unit tests to include '+'Reed Garmsen2015-12-131-2/+2
| |/ / /
* | | | Merge pull request #1588 from rgarmsen2295/plt-881Joram Wilander2015-12-128-45/+332
|\ \ \ \ | |/ / / |/| | |
| * | | Added legal and support settings to sys console and implemented support for o...Reed Garmsen2015-12-108-45/+332
* | | | Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-116-30/+57
|\ \ \ \
| * | | | 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 the...hmhealey2015-12-071-13/+2
| * | | | Added preference_changed web socket eventhmhealey2015-12-074-4/+28
* | | | | Merge pull request #1703 from rgarmsen2295/plt-583Christopher Speller2015-12-111-6/+13
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | Fixed issue with Team Settings modal saving items instead of cancelling; chan...Reed Garmsen2015-12-103-21/+32
| |/ / / / /
* | | | | | Merge pull request #1698 from rgarmsen2295/plt-1346Christopher Speller2015-12-111-32/+52
|\ \ \ \ \ \
| * | | | | | Disabling ability to enable team listing on a system where EnableTeamListing=...Reed Garmsen2015-12-101-32/+52
| |/ / / / /
* | | | | | Merge pull request #1684 from hmhealey/plt1184Joram Wilander2015-12-113-20/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed EditChannelHeaderModal's contents not always being updated when a chang...hmhealey2015-12-103-20/+43
* | | | | | Revert "add helper method to add ephemeral messages; also switch 'delete mess...Christopher Speller2015-12-105-103/+48
* | | | | | add helper method to add ephemeral messages; also switch 'delete message' to ...Florian Orben2015-12-095-48/+103
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1678 from mattermost/plt-1402Corey Hulen2015-12-094-8/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |