Merge branch 'dev'

* dev:
  fix bugs - ArticleList text overflow behaviour in Finder, PlanetContainer - No DevTools

browser/main/Components/PlanetArticleList.jsx

@@ -62,7 +62,7 @@ module.exports = React.createClass({
               </div>
               <div className='itemRight'>
                 <div className='itemInfo'>{moment(article.updatedAt).fromNow()} by <span className='userProfileName'>{article.User.profileName}</span></div>
-                <div className='description'>{article.description.length > 50 ? article.description.substring(0, 50) + ' …' : article.description}</div>
+                <div className='description'>{article.description}</div>
                 <div className='tags'><i className='fa fa-tags'/>{tags}</div>
               </div>
             </div>

browser/styles/finder/index.styl

@@ -46,6 +46,9 @@ body
         border solid 2px transparent
         box-sizing border-box
         cursor pointer
+        white-space nowrap
+        overflow-x hidden
+        text-overflow ellipsis
       .divider
         box-sizing border-box
         border-bottom solid 1px borderColor

modules/menu-template.js

@@ -89,13 +89,13 @@ module.exports = [
         click: function () {
           BrowserWindow.getFocusedWindow().reload()
         }
-      },
+      // },
-      {
+      // {
-        label: 'Toggle DevTools',
+      //   label: 'Toggle DevTools',
-        accelerator: 'Alt+Command+I',
+      //   accelerator: 'Alt+Command+I',
-        click: function () {
+      //   click: function () {
-          BrowserWindow.getFocusedWindow().toggleDevTools()
+      //     BrowserWindow.getFocusedWindow().toggleDevTools()
-        }
+      //   }
       }
     ]
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "boost",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Boost App",
   "main": "main.js",
   "scripts": {