summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1593 from npcode/sso-githubCorey Hulen2015-12-032-0/+24
|\ | | | | Add unofficial guide for GitHub SSO
| * Add unofficial guide for GitHub SSOYi EungJun2015-12-032-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | SSO for Github Enterprise was added at 6d63f57, but it seemed not to work with GitHub. The curlpits were: * The url to get the authenticate user is /user, not /api/v3/user. * Users should set their public email for GitHub. Describe the detail in GitHub.md and rename the original Github.md to GitHub-Enterprise.md.
* | Merge pull request #1608 from hmhealey/safarifontsCorey Hulen2015-12-031-9/+13
|\ \ | | | | | | Changed font changing code to use jquery to fix Safari weirdness
| * | Changed font changing code to use jquery to fix Safari weirdnesshmhealey2015-12-031-9/+13
| | |
* | | Merge pull request #1606 from mattermost/lfbrock-patch-3it332015-12-031-4/+11
|\ \ \ | | | | | | | | Update CONTRIBUTING.md
| * | | Update CONTRIBUTING.mdlfbrock2015-12-031-4/+11
| | | |
* | | | Update Troubleshooting.mdit332015-12-031-1/+1
| |/ / |/| |
* | | Merge pull request #1602 from mattermost/fix-build-numberJoram Wilander2015-12-031-1/+1
|\ \ \ | | | | | | | | Fixing issue where build number isn't set causing caching issues
| * | | Fixing issue where build number isn't set causing caching issues=Corey Hulen2015-12-031-1/+1
| | | |
* | | | Merge pull request #1598 from mattermost/plt-1079Harrison Healey2015-12-032-1/+5
|\ \ \ \ | |/ / / |/| | | PLT-1079 Add limit to Props size in Post table
| * | | Add limit to Props size in Post tableJoramWilander2015-12-032-1/+5
| | | |
* | | | Merge pull request #1599 from asaadmahmoodspin/ui-improvementsChristopher Speller2015-12-033-9/+37
|\ \ \ \ | | | | | | | | | | Improvements to the system console
| * | | | Improvements to the system consoleAsaad Mahmood2015-12-033-9/+37
| | | | |
* | | | | Merge pull request #1597 from hmhealey/polyfillChristopher Speller2015-12-033-0/+4415
|\ \ \ \ \ | | | | | | | | | | | | Re-add babel-polyfill
| * | | | | Added babel-polyfill from babel-core 6.1.18hmhealey2015-12-033-0/+4415
| | | | | |
* | | | | | Merge pull request #1594 from mattermost/plt-1332Christopher Speller2015-12-031-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | PLT-1332 Update post if shouldHighlight prop changes
| * | | | | Update post if shouldHighlight prop changesJoramWilander2015-12-031-0/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #1595 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-031-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | Fixing account settings modal sidebar in IE 11
| * | | | Updating position for accounts modal navAsaad Mahmood2015-12-031-1/+0
| | | | |
* | | | | Merge pull request #1582 from hmhealey/emojiautocompleteHarrison Healey2015-12-035-5/+97
|\ \ \ \ \ | |_|/ / / |/| | | | Emoji autocomplete
| * | | | Added emoji autocomplete to post textboxhmhealey2015-12-034-1/+93
| | | | |
| * | | | Fixed emoticon code to use an ES6 map properlyhmhealey2015-12-031-4/+4
|/ / / /
* | | | Merge pull request #1589 from mattermost/PLT-1301aChristopher Speller2015-12-032-2/+13
|\ \ \ \ | | | | | | | | | | PLT-1301a adding jump to search
| * | | | PLT-1301a adding jump to search=Corey Hulen2015-12-022-2/+13
| | |/ / | |/| |
* | | | Merge pull request #1587 from mattermost/PLT-1300Christopher Speller2015-12-033-2/+37
|\ \ \ \ | | | | | | | | | | PLT-1300 adding jump button to bottom of center archive channel
| * | | | Changing name of var=Corey Hulen2015-12-022-2/+2
| | | | |
| * | | | PLT-1300 adding jump button to bottom of center archive channel=Corey Hulen2015-12-023-2/+37
| |/ / /
* | | | Merge pull request #1585 from mattermost/PLT-1301Christopher Speller2015-12-032-2/+0
|\ \ \ \ | | | | | | | | | | PLT-1301 Fixing RHS disappearing bug
| * | | | PLT-1301 Fixing RHS disappearing bug=Corey Hulen2015-12-022-2/+0
| |/ / /
* | | | 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