Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1600 from hmhealey/plt1152 | Joram Wilander | 2015-12-04 | 8 | -100/+53 |
|\ | | | | | PLT-1152 Fix cross-contamination between invite member modals | ||||
| * | Renamed channel_intro_mssages.jsx to channel_intro_messages.jsx | hmhealey | 2015-12-03 | 2 | -1/+1 |
| | | |||||
| * | Removed some internal state from ChannelMembersModal and ChannelInviteModal | hmhealey | 2015-12-03 | 7 | -53/+23 |
| | | |||||
| * | Switched ChannelInviteModal to use a ToggleModalButton wherever possible | hmhealey | 2015-12-03 | 6 | -47/+30 |
| | | |||||
* | | Merge pull request #1604 from hmhealey/plt1285 | Joram Wilander | 2015-12-04 | 2 | -2/+27 |
|\ \ | | | | | | | PLT-1285 Fixed IE11 tabs preventing themselves from logging out | ||||
| * | | Fixed IE11 tabs preventing themselves from logging out | hmhealey | 2015-12-03 | 2 | -2/+27 |
| |/ | |||||
* | | Merge pull request #1605 from hmhealey/plt1370 | Joram Wilander | 2015-12-04 | 6 | -33/+19 |
|\ \ | | | | | | | PLT-1370 Changed SuggestionBox to clear its suggestions on losing focus | ||||
| * | | Changed SuggestionBox to clear its suggestions on losing focus | hmhealey | 2015-12-03 | 6 | -33/+19 |
| | | | |||||
* | | | reorder display settings; remove 'button thingy' in font options | Florian Orben | 2015-12-04 | 1 | -6/+3 |
| | | | |||||
* | | | Changed font changing code to use jquery to fix Safari weirdness | hmhealey | 2015-12-03 | 1 | -9/+13 |
|/ / | |||||
* | | 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 |
| | | | |||||
* | | | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1590 from rgarmsen2295/plt-169 | Joram Wilander | 2015-12-03 | 1 | -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 Garmsen | 2015-12-02 | 1 | -29/+20 |
| |/ / / / | | | | | | | | | | | | | | | | option in the minimized setting tab | ||||
* | | | | | Merge pull request #1540 from hmhealey/plt1297 | Christopher Speller | 2015-12-03 | 10 | -380/+725 |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | PLT-1297 Replaced SearchAutocomplete with new suggestion components | ||||
| * | | | Changed SuggestionProviders to be regular objects and not singletons | hmhealey | 2015-12-01 | 3 | -7/+5 |
| | | | | |||||
| * | | | Added -1 as an ignored magic number | hmhealey | 2015-12-01 | 1 | -1/+1 |
| | | | |