Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 1 | -10/+19 |
|\ | |||||
| * | Handle window resize events in React way | Antti Ahti | 2015-10-20 | 1 | -10/+19 |
| | | | | | | | | | | | | Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling. See http://facebook.github.io/react/tips/dom-event-listeners.html | ||||
* | | Merging from master | =Corey Hulen | 2015-10-19 | 1 | -100/+16 |
|\| | |||||
| * | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 1 | -92/+0 |
| |\ | | | | | | | PLT-554 Small refactor of websocket code on client and server | ||||
| | * | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 1 | -92/+0 |
| | | | |||||
| * | | Updating scroll on LHS | Asaad Mahmood | 2015-10-19 | 1 | -1/+3 |
| | | | |||||
| * | | Fixing some client warnings | Christopher Speller | 2015-10-16 | 1 | -7/+13 |
| |/ | |||||
* | | Fixing merge | =Corey Hulen | 2015-10-16 | 1 | -5/+1 |
|\| | |||||
| * | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 1 | -5/+1 |
| |\ | | | | | | | Added an initial call to get all user preferences on page load | ||||
| | * | Added an initial call to get all user preferences on page load | hmhealey | 2015-10-15 | 1 | -5/+1 |
| | | | |||||
* | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 1 | -2/+2 |
|/ / | |||||
* / | Fixing most deprication warnings | Christopher Speller | 2015-10-15 | 1 | -3/+3 |
|/ | |||||
* | Multiple UI Improvements | Asaad Mahmood | 2015-10-15 | 1 | -1/+3 |
| | |||||
* | Updated More Direct Channels modal and converted it to ReactBootstrap | hmhealey | 2015-10-14 | 1 | -26/+43 |
| | |||||
* | Fixed overwritten CSS class in the sidebar | hmhealey | 2015-10-14 | 1 | -1/+1 |
| | |||||
* | Multiple UI Improvements | Asaad Mahmood | 2015-10-14 | 1 | -1/+25 |
| | |||||
* | Fixed leave direct channel button for users with a long username | hmhealey | 2015-10-13 | 1 | -6/+8 |
| | |||||
* | Made further changes based on feedback | hmhealey | 2015-10-13 | 1 | -1/+3 |
| | |||||
* | Removed Preference.AltId | hmhealey | 2015-10-13 | 1 | -9/+7 |
| | |||||
* | Cleaned up JSX errors | hmhealey | 2015-10-13 | 1 | -26/+24 |
| | |||||
* | Fixed edge cases with leaving a direct channel while viewing that channel | hmhealey | 2015-10-13 | 1 | -5/+10 |
| | |||||
* | Hid the close button when the unread badge is visible and moved it to the ↵ | hmhealey | 2015-10-13 | 1 | -2/+2 |
| | | | | right side of the sidebar | ||||
* | Renamed show_hide preference to show | hmhealey | 2015-10-13 | 1 | -3/+5 |
| | |||||
* | Made direct channels visible when receiving a message on one | hmhealey | 2015-10-13 | 1 | -0/+12 |
| | |||||
* | Changed direct messages channels so users can show/hide them | hmhealey | 2015-10-13 | 1 | -150/+79 |
| | |||||
* | Changed direct channels in the sidebar to be displayed based on user preferences | hmhealey | 2015-10-13 | 1 | -37/+129 |
| | |||||
* | Merge pull request #981 from mattermost/plt-517 | Christopher Speller | 2015-10-08 | 1 | -1/+1 |
|\ | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright | ||||
| * | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 1 | -1/+1 |
| | | |||||
* | | Fixing ability to dynamicly update members list. | Christopher Speller | 2015-10-08 | 1 | -1/+1 |
|/ | |||||
* | Fix user_added websocket event and update websocket channel access cache on ↵ | JoramWilander | 2015-10-07 | 1 | -1/+1 |
| | | | | add/remove member. | ||||
* | Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵ | Christopher Speller | 2015-10-05 | 1 | -15/+17 |
| | | | | Adding new ESLint rules. Fixing new ESLint errors. | ||||
* | Merge pull request #903 from mattermost/PLT-44 | Christopher Speller | 2015-10-05 | 1 | -1/+3 |
|\ | | | | | PLT-44 allow team switching without the need to login | ||||
| * | PLT-44 allow team switching without the need to login | =Corey Hulen | 2015-10-01 | 1 | -1/+3 |
| | | |||||
* | | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 1 | -1/+1 |
| | | |||||
* | | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 1 | -1/+1 |
| | | |||||
* | | Implemented ChannelMember.MarkUnreadLevel so that it actually functions | hmhealey | 2015-09-30 | 1 | -1/+1 |
| | | |||||
* | | Added 'default' option to channel notification settings that just uses the ↵ | hmhealey | 2015-09-30 | 1 | -5/+9 |
|/ | | | | user's notification level | ||||
* | Better parsing of the website's title when viewing a channel | Reed Garmsen | 2015-09-28 | 1 | -5/+10 |
| | |||||
* | PLT-126: Change 'Private Messages' to 'Direct Messages' | Chengwei Yang | 2015-09-23 | 1 | -1/+1 |
| | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | Cleaned up logic for the unread indicators | Christopher Speller | 2015-09-16 | 1 | -15/+65 |
| | |||||
* | Moved unread channel indicators into their own React component and file | hmhealey | 2015-09-16 | 1 | -70/+19 |
| | |||||
* | Properly hide unread channel indicators when there are no unread channels | hmhealey | 2015-09-16 | 1 | -5/+11 |
| | |||||
* | UI Updates for multiple tickets | Asaad Mahmood | 2015-09-16 | 1 | -1/+6 |
| | |||||
* | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 1 | -8/+16 |
| | |||||
* | PLT-159 Changed unread posts indicator to not be shown for the current channel | hmhealey | 2015-09-09 | 1 | -3/+5 |
| | |||||
* | Fix missed binds. | JoramWilander | 2015-09-02 | 1 | -3/+3 |
| | |||||
* | Remove use of getDOMNode from multiple files. | JoramWilander | 2015-09-02 | 1 | -15/+15 |
| | |||||
* | Changed imports to be upper case for multiple files. | JoramWilander | 2015-09-02 | 1 | -11/+11 |
| | |||||
* | Reformatted sidebar.jsx to meet style guide requirements. | JoramWilander | 2015-09-01 | 1 | -228/+318 |
| | |||||
* | Also updating the position of the bottom unread indicator | Asaad Mahmood | 2015-09-01 | 1 | -1/+0 |
| |