Merge branch 'unstable'

Conflicts: src/data.js
matejc · Nov 17, 2015 · 1f85f9c · 1f85f9c
2 parents 7bd49e5 + 9816539
commit 1f85f9c
Show file tree

Hide file tree

Showing 3,175 changed files with 208,741 additions and 404,184 deletions.
diff --git a/bower_components/web-animations-next/COPYING → LICENSE b/bower_components/web-animations-next/COPYING → LICENSE
diff --git a/README.md b/README.md
@@ -1,13 +1,15 @@
 NixUI
 =====
 
-NodeWebkit UI for Nix package manager
+NodeWebkit UI for Nix package manager written with Polymer
 
 
 Requirement
 -----------
 
 - Nix package manager
+- nwjs
+- node (for development)
 
 
 Just Run It
@@ -48,6 +50,15 @@ Explanation:
  - `NIX_PATH`: same as `NIX_PATH` environment variable, if you use `nix-channel` to update then leave it as is
 
 
+Key/mouse bindings
+------------------
+
+- `Tab`: circle through list items and fields
+- `Enter` or `left click`: open panel
+- `ESC` or `right click`: close panel
+- `/`: focus the search field
+
+
 Development
 -----------
 
@@ -63,10 +74,27 @@ Run UI
 $ make develop
 ```
 
+Development - The classical way
+-------------------------------
+
+Install node dependencies
+
+```
+$ npm install
+```
+
+
+Run it
+```
+$ nw .
+```
+
 
 Screenshots
 -----------
 
+(from version 0.1.2)
+
 ![Configuration Options](img/configoptions.jpg)
 ![Packages](img/packages.jpg)
 ![Package Information](img/package.jpg)
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nixui",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "homepage": "https://github.com/matejc/nixui",
   "authors": [
     "Matej Cotman <[email protected]>"
@@ -13,7 +13,7 @@
     "nix",
     "package manager"
   ],
-  "license": "BSD 2-Clause",
+  "license": "Apache-2.0",
   "ignore": [
     "**/.*",
     "node_modules",
@@ -22,13 +22,16 @@
     "tests"
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#0.5.1",
-    "core-elements": "Polymer/core-elements#0.5.1",
-    "core-signals": "Polymer/core-signals#0.5.1",
-    "paper-elements": "Polymer/paper-elements#0.5.1",
-    "core-animation": "Polymer/core-animation#0.5.1",
     "underscore": "underscore#1.7.0",
-    "jQuery": "~2.1.1",
-    "d3": "~3.4.13"
+    "polymer": "Polymer/polymer#1.1.0",
+    "paper-elements": "PolymerElements/paper-elements#1.0.2",
+    "iron-elements": "PolymerElements/iron-elements#1.0.3",
+    "neon-elements": "PolymerElements/neon-elements#1.0.0",
+    "google-feeds": "GoogleWebComponents/google-feeds#1.0.1",
+    "js-beautify": "1.5.10",
+    "font-awesome-polymer-icons": "philya/font-awesome-polymer-icons#39d6e60662"
+  },
+  "resolutions": {
+    "polymer": "^1.0.0"
   }
 }
diff --git a/bower_components/context-free-parser/.bower.json b/bower_components/context-free-parser/.bower.json
diff --git a/bower_components/context-free-parser/README.md b/bower_components/context-free-parser/README.md
diff --git a/bower_components/context-free-parser/bower.json b/bower_components/context-free-parser/bower.json
diff --git a/bower_components/context-free-parser/context-free-parser.html b/bower_components/context-free-parser/context-free-parser.html
diff --git a/bower_components/context-free-parser/context-free-parser.js b/bower_components/context-free-parser/context-free-parser.js
diff --git a/bower_components/context-free-parser/demo.html b/bower_components/context-free-parser/demo.html
diff --git a/bower_components/context-free-parser/index.html b/bower_components/context-free-parser/index.html
diff --git a/bower_components/context-free-parser/package.json b/bower_components/context-free-parser/package.json