Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PLT-1310 fixing regression caused by this bug | =Corey Hulen | 2015-12-03 | 1 | -0/+9 |
| | |||||
* | Merge pull request #1610 from esethna/patch-37 | Corey Hulen | 2015-12-03 | 1 | -1/+16 |
|\ | | | | | Update test-markdown-lists.md | ||||
| * | Update test-markdown-lists.md | Eric Sethna | 2015-12-03 | 1 | -1/+16 |
| | | | | | | | | 1. Fix bug in expected for nested ordered lists 2. Add case with carriage return and new line after a list | ||||
* | | Merge pull request #1593 from npcode/sso-github | Corey Hulen | 2015-12-03 | 2 | -0/+24 |
|\ \ | | | | | | | Add unofficial guide for GitHub SSO | ||||
| * | | Add unofficial guide for GitHub SSO | Yi EungJun | 2015-12-03 | 2 | -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/safarifonts | Corey Hulen | 2015-12-03 | 1 | -9/+13 |
|\ \ \ | |_|/ |/| | | Changed font changing code to use jquery to fix Safari weirdness | ||||
| * | | Changed font changing code to use jquery to fix Safari weirdness | hmhealey | 2015-12-03 | 1 | -9/+13 |
| | | | |||||
* | | | Merge pull request #1606 from mattermost/lfbrock-patch-3 | it33 | 2015-12-03 | 1 | -4/+11 |
|\ \ \ | | | | | | | | | Update CONTRIBUTING.md | ||||
| * | | | Update CONTRIBUTING.md | lfbrock | 2015-12-03 | 1 | -4/+11 |
| | | | | |||||
* | | | | Update Troubleshooting.md | it33 | 2015-12-03 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1602 from mattermost/fix-build-number | Joram Wilander | 2015-12-03 | 1 | -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 Hulen | 2015-12-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1598 from mattermost/plt-1079 | Harrison Healey | 2015-12-03 | 2 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | PLT-1079 Add limit to Props size in Post table | ||||
| * | | | Add limit to Props size in Post table | JoramWilander | 2015-12-03 | 2 | -1/+5 |
| | | | | |||||
* | | | | Merge pull request #1599 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2015-12-03 | 3 | -9/+37 |
|\ \ \ \ | | | | | | | | | | | Improvements to the system console | ||||
| * | | | | Improvements to the system console | Asaad Mahmood | 2015-12-03 | 3 | -9/+37 |
| | | | | | |||||
* | | | | | Merge pull request #1597 from hmhealey/polyfill | Christopher Speller | 2015-12-03 | 3 | -0/+4415 |
|\ \ \ \ \ | | | | | | | | | | | | | Re-add babel-polyfill | ||||
| * | | | | | Added babel-polyfill from babel-core 6.1.18 | hmhealey | 2015-12-03 | 3 | -0/+4415 |
| | | | | | | |||||
* | | | | | | Merge pull request #1594 from mattermost/plt-1332 | Christopher Speller | 2015-12-03 | 1 | -0/+4 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | PLT-1332 Update post if shouldHighlight prop changes | ||||
| * | | | | | Update post if shouldHighlight prop changes | JoramWilander | 2015-12-03 | 1 | -0/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #1595 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-03 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fixing account settings modal sidebar in IE 11 | ||||
| * | | | | Updating position for accounts modal nav | Asaad Mahmood | 2015-12-03 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1582 from hmhealey/emojiautocomplete | Harrison Healey | 2015-12-03 | 5 | -5/+97 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Emoji autocomplete | ||||
| * | | | | Added emoji autocomplete to post textbox | hmhealey | 2015-12-03 | 4 | -1/+93 |
| | | | | | |||||
| * | | | | Fixed emoticon code to use an ES6 map properly | hmhealey | 2015-12-03 | 1 | -4/+4 |
|/ / / / | |||||
* | | | | Merge pull request #1589 from mattermost/PLT-1301a | Christopher Speller | 2015-12-03 | 2 | -2/+13 |
|\ \ \ \ | | | | | | | | | | | PLT-1301a adding jump to search | ||||
| * | | | | PLT-1301a adding jump to search | =Corey Hulen | 2015-12-02 | 2 | -2/+13 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1587 from mattermost/PLT-1300 | Christopher Speller | 2015-12-03 | 3 | -2/+37 |
|\ \ \ \ | | | | | | | | | | | PLT-1300 adding jump button to bottom of center archive channel | ||||
| * | | | | Changing name of var | =Corey Hulen | 2015-12-02 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | PLT-1300 adding jump button to bottom of center archive channel | =Corey Hulen | 2015-12-02 | 3 | -2/+37 |
| |/ / / | |||||
* | | | | Merge pull request #1585 from mattermost/PLT-1301 | Christopher Speller | 2015-12-03 | 2 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | PLT-1301 Fixing RHS disappearing bug | ||||
| * | | | | PLT-1301 Fixing RHS disappearing bug | =Corey Hulen | 2015-12-02 | 2 | -2/+0 |
| |/ / / | |||||
* | | | | Merge pull request #1579 from hmhealey/plt1298 | Christopher Speller | 2015-12-03 | 26 | -815/+474 |
|\ \ \ \ | | | | | | | | | | | PLT-1298 Converted Command and @Mention autocomplete to new suggestion components | ||||
| * | | | | Fixed unused imports | hmhealey | 2015-12-02 | 3 | -3/+0 |
| | | | | | |||||
| * | | | | Fixed suggestion list height in the edit post modal and RHS | hmhealey | 2015-12-02 | 3 | -5/+17 |
| | | | | | |||||
| * | | | | Removed command autocomplete from the comment textbox and edit post modal | hmhealey | 2015-12-02 | 3 | -2/+12 |
| | | | | | |||||
| * | | | | Changed Command autocomplete to pick a suggestion when space is pressed | hmhealey | 2015-12-02 | 3 | -2/+16 |
| | | | | | |||||
| * | | | | Moved action creation for suggestions | hmhealey | 2015-12-02 | 5 | -47/+63 |
| | | | | | |||||
| * | | | | Moved autocomplete components into web/react/components/suggestion | hmhealey | 2015-12-01 | 9 | -29/+29 |
| | | | | | |||||
| * | | | | Cleaned up styling for command and at mention suggestions | hmhealey | 2015-12-01 | 7 | -49/+32 |
| | | | | | |||||
| * | | | | Replaced CommandList with the new suggestion components | hmhealey | 2015-12-01 | 5 | -146/+82 |
| | | | | | |||||
| * | | | | Fixed SuggestionLists to properly hide when the textbox loses focus | hmhealey | 2015-12-01 | 3 | -7/+11 |
| | | | | | |||||
| * | | | | Replaced MentionList and Mention components with AtMentionProvider | hmhealey | 2015-12-01 | 13 | -601/+278 |
| | | | | | |||||
| * | | | | Fixed SuggestionBox keyboard handlers when there are no suggestions available | hmhealey | 2015-12-01 | 1 | -18/+22 |
| | | | | | |||||
| * | | | | Fixed losing suggestion selection when entering additional characters | hmhealey | 2015-12-01 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | Merge pull request #1554 from florianorben/emoji_style | Christopher Speller | 2015-12-03 | 2478 | -8/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow to switch between default and emoji-one emoji style | ||||
| * | | | | | switch to only use emoji one smileys; remove setting to switch | Florian Orben | 2015-12-01 | 4199 | -1025/+13 |
| | | | | | | |||||
| * | | | | | Allow to switch between default and emoji-one emoji style | Florian Orben | 2015-12-01 | 4199 | -10/+1035 |
| | | | | | | |||||
* | | | | | | Merge pull request #1591 from rgarmsen2295/plt-1158 | Joram Wilander | 2015-12-03 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-1158 Limit the 'Team Name' input field in Team Settings to 22 characters | ||||
| * | | | | | | Limit edit team name input field to 22 characters | Reed Garmsen | 2015-12-02 | 1 | -0/+1 |
| | |_|/ / / | |/| | | | |