From 3308eeaf82378ad61b76d04cb3ceb94e76082bcf Mon Sep 17 00:00:00 2001
From: Rokt33r <fluke8259@gmail.com>
Date: Sun, 23 Aug 2015 04:00:18 +0900
Subject: [PATCH 1/3] fix minor bug

---
 browser/main/Components/PlanetHeader.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/main/Components/PlanetHeader.jsx b/browser/main/Components/PlanetHeader.jsx
index 101b2a3b..f5880407 100644
--- a/browser/main/Components/PlanetHeader.jsx
+++ b/browser/main/Components/PlanetHeader.jsx
@@ -32,6 +32,7 @@ module.exports = React.createClass({
     if (e.keyCode === 38 || e.keyCode === 40) {
       var search = React.findDOMNode(this.refs.search)
       search.blur()
+      e.preventDefault()
     }
     if (e.keyCode !== 27 && (e.keyCode !== 13 || !e.metaKey)) {
       e.stopPropagation()

From f60856b998eda7393ccd414f1a8a227dcbfe2bd5 Mon Sep 17 00:00:00 2001
From: Rokt33r <fluke8259@gmail.com>
Date: Mon, 24 Aug 2015 06:14:13 +0900
Subject: [PATCH 2/3] v0.2.4 - Minor fix

---
 browser/main/Mixins/Helper.js | 3 +++
 browser/main/Services/Hq.js   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/browser/main/Mixins/Helper.js b/browser/main/Mixins/Helper.js
index fa8ec774..ee9d8564 100644
--- a/browser/main/Mixins/Helper.js
+++ b/browser/main/Mixins/Helper.js
@@ -1,4 +1,5 @@
 function deleteItemFromTargetArray (item, targetArray) {
+  if (targetArray == null) targetArray = []
   targetArray.some(function (_item, index) {
     if (_item.id === item.id) {
       targetArray.splice(index, 1)
@@ -11,6 +12,8 @@ function deleteItemFromTargetArray (item, targetArray) {
 }
 
 function updateItemToTargetArray (item, targetArray) {
+  if (targetArray == null) targetArray = []
+
   var isNew = !targetArray.some(function (_item, index) {
     if (_item.id === item.id) {
       targetArray.splice(index, 1, item)
diff --git a/browser/main/Services/Hq.js b/browser/main/Services/Hq.js
index 518d7916..500e5922 100644
--- a/browser/main/Services/Hq.js
+++ b/browser/main/Services/Hq.js
@@ -35,6 +35,9 @@ module.exports = {
   fetchUser: function (userName) {
     return request
       .get(apiUrl + 'resources/' + userName)
+      .set({
+        Authorization: 'Bearer ' + localStorage.getItem('token')
+      })
   },
   updateUser: function (userName, input) {
     return request
@@ -79,6 +82,9 @@ module.exports = {
   fetchPlanet: function (userName, planetName) {
     return request
       .get(apiUrl + 'resources/' + userName + '/planets/' + planetName)
+      .set({
+        Authorization: 'Bearer ' + localStorage.getItem('token')
+      })
   },
   updatePlanet: function (userName, planetName, input) {
     return request

From bfdf691bed19821a49fafeec43502f469ca92975 Mon Sep 17 00:00:00 2001
From: Rokt33r <fluke8259@gmail.com>
Date: Mon, 24 Aug 2015 06:22:16 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=9F=E8=A3=85=20-=20Member=E3=81=8COwn?=
 =?UTF-8?q?er=E3=81=A7=E3=81=AF=E3=81=AA=E3=81=84=E3=81=A8=E3=81=8D?=
 =?UTF-8?q?=E3=81=ABTeam=E8=A8=AD=E5=AE=9A=E3=83=9C=E3=82=BF=E3=83=BC?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E5=85=A8=E9=83=A8=E9=9A=A0=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 browser/main/Containers/UserContainer.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/main/Containers/UserContainer.jsx b/browser/main/Containers/UserContainer.jsx
index a8145f02..f9cbab9b 100644
--- a/browser/main/Containers/UserContainer.jsx
+++ b/browser/main/Containers/UserContainer.jsx
@@ -223,7 +223,9 @@ module.exports = React.createClass({
   renderTeamHome: function (currentUser) {
     var user = this.state.user
 
-    var isOwner = true
+    var isOwner = user.Members == null ? false : user.Members.some(function (member) {
+      return member.id === currentUser.id && member.TeamMember.role === 'owner'
+    })
 
     var userPlanets = user.Planets.map(function (planet) {
       return (
@@ -257,7 +259,7 @@ module.exports = React.createClass({
             <div className='userName'>{user.name}</div>
           </div>
 
-          <button onClick={this.openTeamSettingsModal} className='editProfileButton'>Team settings</button>
+          {isOwner ? (<button onClick={this.openTeamSettingsModal} className='editProfileButton'>Team settings</button>) : null}
         </div>
         <div className='memberList'>
           <div className='memberLabel'>{members.length} {members.length > 1 ? 'Members' : 'Member'}</div>