summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1579 from hmhealey/plt1298Christopher Speller2015-12-0326-815/+474
|\ | | | | PLT-1298 Converted Command and @Mention autocomplete to new suggestion components
| * Fixed unused importshmhealey2015-12-023-3/+0
| |
| * Fixed suggestion list height in the edit post modal and RHShmhealey2015-12-023-5/+17
| |
| * Removed command autocomplete from the comment textbox and edit post modalhmhealey2015-12-023-2/+12
| |
| * Changed Command autocomplete to pick a suggestion when space is pressedhmhealey2015-12-023-2/+16
| |
| * Moved action creation for suggestionshmhealey2015-12-025-47/+63
| |
| * Moved autocomplete components into web/react/components/suggestionhmhealey2015-12-019-29/+29
| |
| * Cleaned up styling for command and at mention suggestionshmhealey2015-12-017-49/+32
| |
| * Replaced CommandList with the new suggestion componentshmhealey2015-12-015-146/+82
| |
| * Fixed SuggestionLists to properly hide when the textbox loses focushmhealey2015-12-013-7/+11
| |
| * Replaced MentionList and Mention components with AtMentionProviderhmhealey2015-12-0113-601/+278
| |
| * Fixed SuggestionBox keyboard handlers when there are no suggestions availablehmhealey2015-12-011-18/+22
| |
| * Fixed losing suggestion selection when entering additional charactershmhealey2015-12-011-1/+7
| |
* | Merge pull request #1554 from florianorben/emoji_styleChristopher Speller2015-12-032478-8/+21
|\ \ | | | | | | Allow to switch between default and emoji-one emoji style
| * | 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
|\ \ \ | | | | | | | | PLT-1158 Limit the 'Team Name' input field in Team Settings to 22 characters
| * | | 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
|\ \ \ \ | | | | | | | | | | PLT-169 Fixes issue where cancelling a change in notification settings would not be reflected in the minimized section
| * | | | Cancelling out of a notification's setting change now displays the correct ↵Reed Garmsen2015-12-021-29/+20
| |/ / / | | | | | | | | | | | | option in the minimized setting tab
* | | | Merge pull request #1540 from hmhealey/plt1297Christopher Speller2015-12-0310-380/+725
|\ \ \ \ | | |_|/ | |/| | PLT-1297 Replaced SearchAutocomplete with new suggestion components
| * | | 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
|\ \ \ \ | | | | | | | | | | Ui improvements for the tablet/small browser view
| * | | | 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.md
| * | | 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 fonts
| * | | Stop firefox from crashing due to fontsJoramWilander2015-12-021-2/+4
|/ / /
* | | Merge pull request #1577 from mattermost/plt-1307Joram Wilander2015-12-024-60/+73
|\ \ \ | | | | | | | | PLT-1307 Make proper async calls when switching channels
| * | | 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 leak
| * | | | Fix emitter leakJoramWilander2015-12-021-2/+8
|/ / / /
* | | | Merge pull request #1576 from mattermost/remove-scrollJoram Wilander2015-12-021-3/+1
|\ \ \ \ | | | | | | | | | | Remove perfectscrollbar from center channel
| * | | | 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 > Display
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Make the Gitlab SSO Support compatible with Github Enterprise
| * | | | | Note that the Github Enterprise SSO is unofficialYi EungJun2015-12-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the GitLab SSO UI is used for GitHub Enterprise SSO, it's potentially confusing. Suggested-by: it33 <iantien@gmail.com>
| * | | | | Make the Gitlab SSO Support compatible with Github EnterpriseYi EungJun2015-12-022-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See doc/integrations/Single-Sign-On/Github.md for the usage. Note: I thought it should work also with Github.com but it failed with "Bad token type" error.
* | | | | | Merge pull request #1563 from esethna/patch-33Corey Hulen2015-12-011-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create README.md
| * | | | | | Create README.mdEric Sethna2015-12-011-0/+18
| | |_|_|_|/ | |/| | | | | | | | | | Instructions on how to use the test .md files.
* | | | | | Merge pull request #1566 from esethna/patch-34Corey Hulen2015-12-011-0/+177
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create test-markdown-lists.md
| * | | | | | Create test-markdown-lists.mdEric Sethna2015-12-011-0/+177
| | |_|_|_|/ | |/| | | | | | | | | | Tests for Numbered and Bulleted Lists.
* | | | | | Merge pull request #1567 from esethna/patch-36Corey Hulen2015-12-012-25/+139
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update test-markdown.md