Commit Graph

89 Commits

Author SHA1 Message Date
=Corey Hulen
468f01dc89 Merging from master 2015-10-19 10:25:51 -07:00
Corey Hulen
ea1b312968 Merge pull request #1072 from mattermost/plt-554
PLT-554 Small refactor of websocket code on client and server
2015-10-19 09:56:34 -07:00
Asaad Mahmood
13a35539f3 Updating scroll on LHS 2015-10-19 14:36:31 +05:00
=Corey Hulen
8b2d7f391a Fixing merge 2015-10-16 09:12:30 -07:00
=Corey Hulen
6a1755d2e3 Inital support for multi-tab loging 2015-10-16 09:10:54 -07:00
JoramWilander
2b5ec4a3c0 Small refactor of websocket code on client and server 2015-10-16 11:48:55 -04:00
Christopher Speller
495673d80d Fixing some client warnings 2015-10-16 10:50:10 -04:00
Christopher Speller
099d853877 Merge pull request #1079 from hmhealey/initprefs
Added an initial call to get all user preferences on page load
2015-10-16 08:16:40 -04:00
hmhealey
327b0b5a21 Added an initial call to get all user preferences on page load 2015-10-15 15:17:07 -04:00
Christopher Speller
1571a9a2df Fixing most deprication warnings 2015-10-15 15:00:28 -04:00
Asaad Mahmood
95aaa0a080 Multiple UI Improvements 2015-10-15 22:54:15 +05:00
hmhealey
ae0d4dce7b Updated More Direct Channels modal and converted it to ReactBootstrap 2015-10-14 16:57:08 -04:00
hmhealey
6c4022337c Fixed overwritten CSS class in the sidebar 2015-10-14 09:11:35 -04:00
Asaad Mahmood
99f243b444 Multiple UI Improvements 2015-10-14 17:04:13 +05:00
hmhealey
3f2b6bfa27 Fixed leave direct channel button for users with a long username 2015-10-13 18:31:17 -04:00
hmhealey
97b2f6ffe7 Made further changes based on feedback 2015-10-13 15:36:58 -04:00
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
hmhealey
a2517ee991 Cleaned up JSX errors 2015-10-13 09:42:26 -04:00
hmhealey
097d236f43 Fixed edge cases with leaving a direct channel while viewing that channel 2015-10-13 09:42:26 -04:00
hmhealey
ae0eb91180 Hid the close button when the unread badge is visible and moved it to the right side of the sidebar 2015-10-13 09:42:25 -04:00
hmhealey
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -04:00
hmhealey
415f959614 Made direct channels visible when receiving a message on one 2015-10-13 09:42:25 -04:00
hmhealey
ed31538893 Changed direct messages channels so users can show/hide them 2015-10-13 09:42:24 -04:00
hmhealey
7d03c24b44 Changed direct channels in the sidebar to be displayed based on user preferences 2015-10-13 09:42:24 -04:00
Christopher Speller
806fd77ec9 Merge pull request #981 from mattermost/plt-517
PLT-517 Changing SpinPunch to Mattermost in copyright
2015-10-08 12:55:11 -04:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
Christopher Speller
7014496252 Fixing ability to dynamicly update members list. 2015-10-08 10:54:27 -04:00
JoramWilander
1421e1ec4a Fix user_added websocket event and update websocket channel access cache on add/remove member. 2015-10-07 11:39:45 -04:00
Christopher Speller
33b957ed1a Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. Adding new ESLint rules. Fixing new ESLint errors. 2015-10-05 11:05:06 -04:00
Christopher Speller
f4afabd679 Merge pull request #903 from mattermost/PLT-44
PLT-44 allow team switching without the need to login
2015-10-05 10:20:14 -04:00
=Corey Hulen
430806301d PLT-44 allow team switching without the need to login 2015-10-01 17:52:47 -07:00
hmhealey
c9a0030551 Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps 2015-10-01 08:31:17 -04:00
hmhealey
c16b9de8dc Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps 2015-10-01 08:31:11 -04:00
hmhealey
c4d50885a7 Implemented ChannelMember.MarkUnreadLevel so that it actually functions 2015-09-30 09:59:58 -04:00
hmhealey
4bc625e8d1 Added 'default' option to channel notification settings that just uses the user's notification level 2015-09-30 09:59:58 -04:00
Reed Garmsen
5b67abf34b Better parsing of the website's title when viewing a channel 2015-09-28 15:13:10 -07:00
Chengwei Yang
f7a32fa38a PLT-126: Change 'Private Messages' to 'Direct Messages'
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
2015-09-23 22:43:14 +08:00
Christopher Speller
acf2fb64b4 Cleaned up logic for the unread indicators 2015-09-16 17:08:05 -04:00
hmhealey
7e66a3d5be Moved unread channel indicators into their own React component and file 2015-09-16 16:51:16 -04:00
hmhealey
8d0c69aec6 Properly hide unread channel indicators when there are no unread channels 2015-09-16 16:51:16 -04:00
Asaad Mahmood
28b61e6437 UI Updates for multiple tickets 2015-09-16 20:32:10 +05:00
Christopher Speller
0ea0233c50 New add channel modal using react-bootstrap. 2015-09-14 13:56:58 -04:00
hmhealey
2e5a58a11e PLT-159 Changed unread posts indicator to not be shown for the current channel 2015-09-09 15:22:43 -04:00
JoramWilander
fec8fd46c8 Fix missed binds. 2015-09-02 16:27:55 -04:00
JoramWilander
b9e16f41f1 Remove use of getDOMNode from multiple files. 2015-09-02 14:26:01 -04:00
JoramWilander
31519f7c88 Changed imports to be upper case for multiple files. 2015-09-02 08:40:25 -04:00
JoramWilander
27519d3f73 Reformatted sidebar.jsx to meet style guide requirements. 2015-09-01 08:53:10 -04:00
Asaad Mahmood
8d6c354811 Also updating the position of the bottom unread indicator 2015-09-01 08:43:11 -04:00
Christopher Speller
38994fc50c Temporary PM channels now use username instead of display name 2015-08-27 10:42:48 -04:00
Reed Garmsen
f2b06cfc7c Added feature to the 'More...' PM channel list and fixed small cosmetic issues 2015-08-18 08:47:14 -07:00