From 999d1553e1ce45adf58f6082b160bc1147dc592b Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Mon, 19 Dec 2016 10:05:46 -0300
Subject: PLT-4167 Team Sidebar (#4569)

* PLT-4167 Team Sidebar

* Address feedback from PM

* change route from my_members to members

* bug fixes

* Updating styles for teams sidebar (#4681)

* Added PM changes

* Fix corner cases

* Addressing feedback

* use two different endpoints

* Bug fixes

* Rename model and client functions, using preferences to store last team and channel viewed

* Fix mobile notification count and closing the team sidebar

* unit test, fixed bad merge and retrieve from cached when available

* bug fixes

* use id for last channel in preferences, query optimization

* Updating multi team css (#4830)
---
 webapp/components/needs_team.jsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'webapp/components/needs_team.jsx')

diff --git a/webapp/components/needs_team.jsx b/webapp/components/needs_team.jsx
index f8a774389..f90297065 100644
--- a/webapp/components/needs_team.jsx
+++ b/webapp/components/needs_team.jsx
@@ -141,6 +141,7 @@ export default class NeedsTeam extends React.Component {
             content.push(
                 this.props.navbar
             );
+            content.push(this.props.team_sidebar);
             content.push(
                 this.props.sidebar
             );
@@ -197,6 +198,7 @@ NeedsTeam.propTypes = {
     ]),
     navbar: React.PropTypes.element,
     sidebar: React.PropTypes.element,
+    team_sidebar: React.PropTypes.element,
     center: React.PropTypes.element,
     params: React.PropTypes.object,
     user: React.PropTypes.object
-- 
cgit v1.2.3-1-g7c22

