summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #1554 from florianorben/emoji_styleChristopher Speller2015-12-032478-8/+21
|\ \ \ \ \ \
| * | | | | | switch to only use emoji one smileys; remove setting to switchFlorian Orben2015-12-014199-1025/+13
| * | | | | | Allow to switch between default and emoji-one emoji styleFlorian Orben2015-12-014199-10/+1035
* | | | | | | Merge pull request #1591 from rgarmsen2295/plt-1158Joram Wilander2015-12-031-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Limit edit team name input field to 22 charactersReed Garmsen2015-12-021-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #1590 from rgarmsen2295/plt-169Joram Wilander2015-12-031-29/+20
|\ \ \ \ \ \ \
| * | | | | | | Cancelling out of a notification's setting change now displays the correct op...Reed Garmsen2015-12-021-29/+20
| |/ / / / / /
* | | | | | | Merge pull request #1540 from hmhealey/plt1297Christopher Speller2015-12-0310-380/+725
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Changed SuggestionProviders to be regular objects and not singletonshmhealey2015-12-013-7/+5
| * | | | | | Added -1 as an ignored magic numberhmhealey2015-12-011-1/+1
| * | | | | | Replaced SearchAutocomplete with new suggestion componentshmhealey2015-12-019-379/+726
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1592 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-024-20/+48
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | Updating UI for tablet viewAsaad Mahmood2015-12-022-6/+2
| * | | | Multiple UI ImprovementsAsaad Mahmood2015-12-023-19/+51
| | |/ / | |/| |
* | | | Merge pull request #1584 from mattermost/lfbrock-patch-3Corey Hulen2015-12-021-1/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Update Sign-in.mdlfbrock2015-12-021-1/+5
|/ / /
* | | Merge pull request #1581 from mattermost/font-fixChristopher Speller2015-12-021-2/+4
|\ \ \
| * | | Stop firefox from crashing due to fontsJoramWilander2015-12-021-2/+4
|/ / /
* | | Merge pull request #1577 from mattermost/plt-1307Joram Wilander2015-12-024-60/+73
|\ \ \
| * | | Minor changeJoramWilander2015-12-021-2/+1
| * | | Remove loggingJoramWilander2015-12-021-2/+0
| * | | Add bindJoramWilander2015-12-021-0/+1
| * | | Make proper async calls when switching channelsJoramWilander2015-12-024-61/+76
* | | | Merge pull request #1578 from mattermost/emitter-leakHarrison Healey2015-12-021-2/+8
|\ \ \ \
| * | | | Fix emitter leakJoramWilander2015-12-021-2/+8
|/ / / /
* | | | Merge pull request #1576 from mattermost/remove-scrollJoram Wilander2015-12-021-3/+1
|\ \ \ \
| * | | | Remove perfectscrollbar from center channelJoramWilander2015-12-021-3/+1
|/ / / /
* | | | Merge pull request #1535 from florianorben/PLT-1233Christopher Speller2015-12-0262-2/+18819
|\ \ \ \
| * | | | PLT-1233: "Display Font" option in Account Settings > DisplayFlorian Orben2015-11-2862-2/+18819
* | | | | Merge pull request #1556 from npcode/sso-github-entJoram Wilander2015-12-022-1/+26
|\ \ \ \ \
| * | | | | Note that the Github Enterprise SSO is unofficialYi EungJun2015-12-021-2/+4
| * | | | | Make the Gitlab SSO Support compatible with Github EnterpriseYi EungJun2015-12-022-1/+24
* | | | | | Merge pull request #1563 from esethna/patch-33Corey Hulen2015-12-011-0/+18
|\ \ \ \ \ \
| * | | | | | Create README.mdEric Sethna2015-12-011-0/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1566 from esethna/patch-34Corey Hulen2015-12-011-0/+177
|\ \ \ \ \ \
| * | | | | | Create test-markdown-lists.mdEric Sethna2015-12-011-0/+177
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1567 from esethna/patch-36Corey Hulen2015-12-012-25/+139
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update test-markdown.mdEric Sethna2015-12-012-25/+139
|/ / / / /
* | | | | Merge pull request #1565 from mattermost/plt-1270Joram Wilander2015-12-011-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Minor fixJoramWilander2015-12-011-1/+1
* | | | | Merge pull request #1560 from mattermost/plt-1270Christopher Speller2015-12-011-5/+7
|\| | | |
| * | | | Fix channel creation errorsJoramWilander2015-12-011-5/+7
* | | | | Merge pull request #1562 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-016-11/+11
|\ \ \ \ \
| * | | | | Multiple UI ImprovementsAsaad Mahmood2015-12-016-11/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #1559 from mattermost/plt-510Harrison Healey2015-12-015-73/+142
|\ \ \ \ \
| * | | | | Updated oauth2 app register modalJoramWilander2015-12-015-73/+142
* | | | | | Merge pull request #1522 from tamtamchik/patch-1Joram Wilander2015-12-011-15/+11
|\ \ \ \ \ \
| * | | | | | fix new linesYuri Tkachenko2015-11-301-2/+2
| * | | | | | easier node install for ubuntu fromYuri Tkachenko2015-11-301-6/+2
| * | | | | | removed installation of GodepYuri Tkachenko2015-11-301-7/+4