summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-16133-17054/+14467
| |\ \ \ \ \
| * | | | | | update posts time in the right sidebar when user changes time formatStas Vovk2015-10-151-0/+14
| * | | | | | fixed style guide errorStas Vovk2015-10-151-1/+1
| * | | | | | added file with display settingsStas Vovk2015-10-141-0/+168
| * | | | | | added display tab under account settings. added 24h time optionStas Vovk2015-10-145-14/+38
* | | | | | | Merge pull request #1083 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-163-3/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Adding momentum scrolling on IOSAsaad Mahmood2015-10-163-3/+6
* | | | | | | Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-1611-13/+179
|\ \ \ \ \ \ \
| * | | | | | | Added an initial call to get all user preferences on page loadhmhealey2015-10-1511-13/+179
| * | | | | | | Removed preference migration codehmhealey2015-10-153-99/+39
* | | | | | | | Merge pull request #1078 from hmhealey/plt701Christopher Speller2015-10-163-100/+42
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Removed preference migration codehmhealey2015-10-153-100/+42
* | | | | | | | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-165-20/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix lintAntti Ahti2015-10-151-5/+4
| * | | | | | | | Treat teams as an array instead of objectAntti Ahti2015-10-151-8/+5
| * | | | | | | | Sort teams by display nameAntti Ahti2015-10-151-1/+19
| * | | | | | | | Sanitize team dataAntti Ahti2015-10-142-0/+7
| * | | | | | | | Fix typo (isTreamCreationAllowed -> isTeamCreationAllowed)Antti Ahti2015-10-141-7/+7
| * | | | | | | | Use team display name in team switcher menuAntti Ahti2015-10-144-14/+18
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #1080 from hmhealey/plt686Joram Wilander2015-10-161-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Changed preference saving to use the master databasehmhealey2015-10-151-1/+1
* | | | | | | | Update Troubleshooting.mdit332015-10-151-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #1059 from florianorben/PLT-74Corey Hulen2015-10-155-6/+111
|\ \ \ \ \ \ \
| * | | | | | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-152-5/+16
| * | | | | | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-155-3/+97
| |/ / / / / /
* | | | | | | Merge pull request #1082 from mattermost/lfbrock-patch-1Corey Hulen2015-10-151-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOG.mdit332015-10-151-0/+1
| * | | | | | | Added known issue to v1.1 and added new section for v1.2lfbrock2015-10-151-2/+10
| |/ / / / / /
* | | | | | | Merge pull request #1081 from mattermost/hmhealey-patch-1Corey Hulen2015-10-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Updated node.js source path in Ubuntu dev setupHarrison Healey2015-10-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #1075 from mattermost/plt-577Christopher Speller2015-10-1596-16753/+13493
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Adding ReactDOM as a globalChristopher Speller2015-10-152-6/+1
| * | | | | Fixing most deprication warningsChristopher Speller2015-10-1579-377/+423
| * | | | | Updating build for updated versionsChristopher Speller2015-10-151-8/+10
| * | | | | Upgrading react and react-bootstrap. 0.13.3 to 0.14 and 0.25.1 to 0.27.1Christopher Speller2015-10-159-13768/+11448
| * | | | | Upgrading perfect scrollbar from 0.6.5 to 0.6.7Christopher Speller2015-10-154-53/+168
| * | | | | Upgrading jquery from 1.11.1 to 2.1.4Christopher Speller2015-10-154-2541/+1443
|/ / / / /
* | | | | Merge pull request #1077 from mattermost/mark-testsChristopher Speller2015-10-158-15/+49
|\ \ \ \ \
| * | | | | Marking when user ran the unit tests=Corey Hulen2015-10-158-15/+49
* | | | | | Merge pull request #1076 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-10-1521-66/+97
|\ \ \ \ \ \
| * | | | | | Removing my navbar popover changes since Chris has already done the popover c...Asaad Mahmood2015-10-151-15/+16
| * | | | | | Changing user popover trigger from hover click to just clickAsaad Mahmood2015-10-151-1/+1
| * | | | | | Multiple UI ImprovementsAsaad Mahmood2015-10-1522-82/+112
|/ / / / / /
* | | | | | Merge pull request #1057 from hmhealey/plt520Christopher Speller2015-10-155-137/+346
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Updated More Direct Channels modal and converted it to ReactBootstraphmhealey2015-10-145-137/+346
* | | | | | Merge pull request #1055 from florianorben/PLT-42Christopher Speller2015-10-152-0/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploadingFlorian Orben2015-10-142-0/+17
| | |/ / / | |/| | |
* | | | | Merge pull request #1065 from apaatsio/clarify-system-menuHarrison Healey2015-10-151-1/+5
|\ \ \ \ \
| * | | | | Add titles to clarify icons in system consoleAntti Ahti2015-10-151-1/+5
* | | | | | Merge pull request #1063 from mattermost/SMTP-updateCorey Hulen2015-10-151-45/+36
|\ \ \ \ \ \