From 1055d8f4a116cdbdb3cf38ecf4781c7fa761d7bd Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Wed, 29 Jul 2015 18:35:33 -0400
Subject: Fixed team API to properly provide team names for the Find My Team
 email

---
 api/team.go | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/api/team.go b/api/team.go
index c9fe42ecc..01c8e50b6 100644
--- a/api/team.go
+++ b/api/team.go
@@ -275,11 +275,24 @@ func emailTeams(c *Context, w http.ResponseWriter, r *http.Request) {
 	subjectPage := NewServerTemplatePage("find_teams_subject", c.GetSiteURL())
 	bodyPage := NewServerTemplatePage("find_teams_body", c.GetSiteURL())
 
-	if err := utils.SendMail(email, subjectPage.Render(), bodyPage.Render()); err != nil {
-		l4g.Error("An error occured while sending an email in emailTeams err=%v", err)
-	}
+	if result := <-Srv.Store.Team().GetTeamsForEmail(email); result.Err != nil {
+		c.Err = result.Err
+	} else {
+		teams := result.Data.([]*model.Team)
 
-	w.Write([]byte(model.MapToJson(m)))
+		// the template expects Props to be a map with team names as the keys
+		props := make(map[string]string)
+		for _, team := range teams {
+			props[team.Name] = team.Name
+		}
+		bodyPage.Props = props
+
+		if err := utils.SendMail(email, subjectPage.Render(), bodyPage.Render()); err != nil {
+			l4g.Error("An error occured while sending an email in emailTeams err=%v", err)
+		}
+
+		w.Write([]byte(model.MapToJson(m)))
+	}
 }
 
 func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) {
-- 
cgit v1.2.3-1-g7c22


From e5c79cd193f778e9036d938ba71c59d6e0cf3dc9 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 30 Jul 2015 10:54:41 -0400
Subject: makes the LHS dropdown close when clicking on the LHS header

---
 web/react/components/sidebar_header.jsx | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 0156dc01a..559f2ef91 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -17,8 +17,15 @@ var NavbarDropdown = React.createClass({
         e.preventDefault();
         client.logout();
     },
+    blockToggle: false,
     componentDidMount: function() {
         UserStore.addTeamsChangeListener(this._onChange);
+
+        var self = this;
+        $(this.refs.dropdown.getDOMNode()).on('hide.bs.dropdown', function(e) {
+            self.blockToggle = true;
+            setTimeout(function(){self.blockToggle = false;}, 100);
+        });
     },
     componentWillUnmount: function() {
         UserStore.removeTeamsChangeListener(this._onChange);
@@ -75,7 +82,7 @@ var NavbarDropdown = React.createClass({
 
         return (
             <ul className="nav navbar-nav navbar-right">
-                <li className="dropdown">
+                <li ref="dropdown" className="dropdown">
                     <a href="#" className="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
                         <span className="dropdown__icon" dangerouslySetInnerHTML={{__html: Constants.MENU_ICON }} />
                     </a>
@@ -108,7 +115,11 @@ module.exports = React.createClass({
     },
 
     toggleDropdown: function(e) {
-        $('.team__header').find('.dropdown-toggle').trigger('click');
+        if (this.refs.dropdown.blockToggle) {
+            this.refs.dropdown.blockToggle = false;
+            return;
+        }
+        $('.team__header').find('.dropdown-toggle').dropdown('toggle');
     },
 
     render: function() {
@@ -131,7 +142,7 @@ module.exports = React.createClass({
                         <div className="team__name">{ this.props.teamDisplayName }</div>
                     </div>
                 </a>
-                <NavbarDropdown teamType={this.props.teamType} />
+                <NavbarDropdown ref="dropdown" teamType={this.props.teamType} />
             </div>
         );
     }
-- 
cgit v1.2.3-1-g7c22


From 3f781fdaf977e3103b12deb266ef39a8df64bff0 Mon Sep 17 00:00:00 2001
From: it33 <iantien@gmail.com>
Date: Thu, 30 Jul 2015 08:36:13 -0700
Subject: Removing unnecessary "the"

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f0857e99d..4ba3de128 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,8 @@ Learn More
 <li/>Make a pull request: http://www.mattermost.org/contribute-to-mattermost/</li>
 </ul>
 
-Installing the Mattermost
-=========================
+Installing Mattermost
+=====================
 
 You're installing "Mattermost Alpha", a pre-released version intended for an early look at what we're building. While SpinPunch runs this version internally, it's not recommended for production deployments since we can't guarantee API stability or backwards compatibility until our production release. 
 
-- 
cgit v1.2.3-1-g7c22


From 4b531ef8c4ff1ea34658f5b0b0c15ebc0321a867 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 30 Jul 2015 12:11:01 -0400
Subject: added .off() for dropdown hide event on LHS header

---
 web/react/components/sidebar_header.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 559f2ef91..e01ddcd05 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -29,6 +29,8 @@ var NavbarDropdown = React.createClass({
     },
     componentWillUnmount: function() {
         UserStore.removeTeamsChangeListener(this._onChange);
+
+        $(this.refs.dropdown.getDOMNode()).off('hide.bs.dropdown');
     },
     _onChange: function() {
         if (this.isMounted()) {
-- 
cgit v1.2.3-1-g7c22