summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar.jsx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PLT-44=Corey Hulen2015-10-201-10/+19
|\
| * Handle window resize events in React wayAntti Ahti2015-10-201-10/+19
* | Merging from master=Corey Hulen2015-10-191-100/+16
|\|
| * Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-191-92/+0
| |\
| | * Small refactor of websocket code on client and serverJoramWilander2015-10-161-92/+0
| * | Updating scroll on LHSAsaad Mahmood2015-10-191-1/+3
| * | Fixing some client warningsChristopher Speller2015-10-161-7/+13
| |/
* | Fixing merge=Corey Hulen2015-10-161-5/+1
|\|
| * Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-161-5/+1
| |\
| | * Added an initial call to get all user preferences on page loadhmhealey2015-10-151-5/+1
* | | Inital support for multi-tab loging=Corey Hulen2015-10-161-2/+2
|/ /
* / Fixing most deprication warningsChristopher Speller2015-10-151-3/+3
|/
* Multiple UI ImprovementsAsaad Mahmood2015-10-151-1/+3
* Updated More Direct Channels modal and converted it to ReactBootstraphmhealey2015-10-141-26/+43
* Fixed overwritten CSS class in the sidebarhmhealey2015-10-141-1/+1
* Multiple UI ImprovementsAsaad Mahmood2015-10-141-1/+25
* Fixed leave direct channel button for users with a long usernamehmhealey2015-10-131-6/+8
* Made further changes based on feedbackhmhealey2015-10-131-1/+3
* Removed Preference.AltIdhmhealey2015-10-131-9/+7
* Cleaned up JSX errorshmhealey2015-10-131-26/+24
* Fixed edge cases with leaving a direct channel while viewing that channelhmhealey2015-10-131-5/+10
* Hid the close button when the unread badge is visible and moved it to the rig...hmhealey2015-10-131-2/+2
* Renamed show_hide preference to showhmhealey2015-10-131-3/+5
* Made direct channels visible when receiving a message on onehmhealey2015-10-131-0/+12
* Changed direct messages channels so users can show/hide themhmhealey2015-10-131-150/+79
* Changed direct channels in the sidebar to be displayed based on user preferenceshmhealey2015-10-131-37/+129
* Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-081-1/+1
|\
| * Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-081-1/+1
* | Fixing ability to dynamicly update members list.Christopher Speller2015-10-081-1/+1
|/
* Fix user_added websocket event and update websocket channel access cache on a...JoramWilander2015-10-071-1/+1
* Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ...Christopher Speller2015-10-051-15/+17
* Merge pull request #903 from mattermost/PLT-44Christopher Speller2015-10-051-1/+3
|\
| * PLT-44 allow team switching without the need to login=Corey Hulen2015-10-011-1/+3
* | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyPropshmhealey2015-10-011-1/+1
* | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyPropshmhealey2015-10-011-1/+1
* | Implemented ChannelMember.MarkUnreadLevel so that it actually functionshmhealey2015-09-301-1/+1
* | Added 'default' option to channel notification settings that just uses the us...hmhealey2015-09-301-5/+9
|/
* Better parsing of the website's title when viewing a channelReed Garmsen2015-09-281-5/+10
* PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-231-1/+1
* Cleaned up logic for the unread indicatorsChristopher Speller2015-09-161-15/+65
* Moved unread channel indicators into their own React component and filehmhealey2015-09-161-70/+19
* Properly hide unread channel indicators when there are no unread channelshmhealey2015-09-161-5/+11
* UI Updates for multiple ticketsAsaad Mahmood2015-09-161-1/+6
* New add channel modal using react-bootstrap.Christopher Speller2015-09-141-8/+16
* PLT-159 Changed unread posts indicator to not be shown for the current channelhmhealey2015-09-091-3/+5
* Fix missed binds.JoramWilander2015-09-021-3/+3
* Remove use of getDOMNode from multiple files.JoramWilander2015-09-021-15/+15
* Changed imports to be upper case for multiple files.JoramWilander2015-09-021-11/+11
* Reformatted sidebar.jsx to meet style guide requirements.JoramWilander2015-09-011-228/+318
* Also updating the position of the bottom unread indicatorAsaad Mahmood2015-09-011-1/+0