summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge pull request #1096 from rgarmsen2295/plt-153Joram Wilander2015-10-171-2/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-153 Added better recognition of Android devices in the Active Sessions UI
| | * | | | | | Added proper recognition of android devices in the Active Sessions UIReed Garmsen2015-10-161-2/+8
| | | | | | | |
| * | | | | | | Merge pull request #1097 from rgarmsen2295/plt-693Joram Wilander2015-10-171-1/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-693 Fixes back button on username page during team signup when email is turned off
| | * | | | | | | Fixes back button on username page during team signup when email is turned offReed Garmsen2015-10-161-1/+6
| | |/ / / / / /
| * | | | | | | Merge pull request #1099 from florianorben/PLT-463Joram Wilander2015-10-172-13/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too much room
| | * | | | | | PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too ↵Florian Orben2015-10-172-13/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | much room
| * | | | | | Merge pull request #1092 from trashcan/fix-autocomplete-transparencyJoram Wilander2015-10-161-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Add z-index to command-box so that elements behind it do not show through
| | * | | | | Add semi-colonPat Lathem2015-10-161-1/+1
| | | | | | |
| | * | | | | Add z-index to command-box so that elements behind it do not show through ↵Pat Lathem2015-10-161-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | autocomplete popup
| * | | | | Merge pull request #1089 from mattermost/client-warning-fixesCorey Hulen2015-10-1611-103/+132
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixing some client warnings
| | * | | | | Fixing some client warningsChristopher Speller2015-10-1611-103/+132
| | | |_|_|/ | | |/| | |
* | | | | | Refactoring web classes to use multi-session=Corey Hulen2015-10-164-94/+138
| | | | | |
* | | | | | Fixing merge=Corey Hulen2015-10-1637-165/+642
|\| | | | |
| * | | | | Merge pull request #1085 from mattermost/plt-633Harrison Healey2015-10-163-4/+17
| |\ \ \ \ \ | | |/ / / / | |/| | | | PLT-633 Add default username and icon to incoming webhooks.
| | * | | | Add default username and icon to incoming webhooks.JoramWilander2015-10-163-4/+17
| | | | | |
| * | | | | Adding single-line Docker installit332015-10-161-0/+7
| | | | | |
| * | | | | Merge pull request #1088 from hmhealey/initprefsHarrison Healey2015-10-161-1/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Fixed preference test that was failing
| | * | | | Fixed preference test that was failinghmhealey2015-10-161-1/+2
| |/ / / /
| * | | | Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-167-14/+220
| |\ \ \ \ | | | | | | | | | | | | PLT-638: added display tab under account settings. added 24h time option
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-16133-17054/+14467
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx
| | * | | | | 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 IOS
| | * | | | | 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 load
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | PLT-701 Removed preference migration code
| | * | | | | | Removed preference migration codehmhealey2015-10-153-100/+42
| | | | | | | |
| * | | | | | | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-165-20/+45
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use display name instead of name in team switcher menu
| | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First we need to convert the object to array, because objects cannot be sorted.
| | * | | | | | | Sanitize team dataAntti Ahti2015-10-142-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to expose sensitive data that might pose a security risk.
| | * | | | | | | Fix typo (isTreamCreationAllowed -> isTeamCreationAllowed)Antti Ahti2015-10-141-7/+7
| | | | | | | | |
| | * | | | | | | Use team display name in team switcher menuAntti Ahti2015-10-144-14/+18
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu
| * | | | | | | Merge pull request #1080 from hmhealey/plt686Joram Wilander2015-10-161-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | PLT-686 Changed preference saving to use the master database
| | * | | | | | 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 message
| | * | | | | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-152-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix bug where channel_id was not set if update_post ajax was "too fast" - fix bug js error if there is no last post, i.e. empty channel - renamed lastPostId to postId so it has a nicer api to be triggered from everywhere - fix a typo - automatically focus textarea on modal open
| | * | | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added known issue to v1.1 and added new section for v1.2
| | * | | | | | Update CHANGELOG.mdit332015-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Adding known issue around Slack import
| | * | | | | | 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 setup
| | * | | | | Updated node.js source path in Ubuntu dev setupHarrison Healey2015-10-151-1/+1
| |/ / / / /
* / / / / / Inital support for multi-tab loging=Corey Hulen2015-10-1664-300/+396
|/ / / / /