Merge branch 'master' into dev

README.md

@@ -38,8 +38,6 @@ Known Issues
 
 ***
 ### Want to contribute? [See How!](https://github.com/Ulauncher/Ulauncher/wiki)
-
-### Reed [How to Report A New Bug](https://github.com/Ulauncher/Ulauncher/wiki/How-to-Report-A-New-Bug)
 ***
 
 License

build-utils/build-preferences.sh

@@ -10,5 +10,5 @@ cd `dirname $0`
 cd ../data/preferences
 
 npm install
-./node_modules/.bin/bower install -F --allow-root
+./node_modules/.bin/bower install -f --allow-root
 ./gulp build

data/preferences/bower.json

@@ -19,13 +19,13 @@
   "dependencies": {
     "font-awesome": "~4.4.0",
     "pure": "~0.6.0",
-    "angular": "^1.5.4",
-    "angular-route": "^1.5.3",
-    "angular-ui-grid": "^3.1.1",
-    "angular-ui-bootstrap": "^1.3.2",
-    "angular-schema-form": "^0.8.13",
-    "angular-schema-form-bootstrap": "^0.2.0",
-    "bootstrap": "^3.3.6"
+    "angular": "~1.5.4",
+    "angular-route": "~1.5.3",
+    "angular-ui-grid": "~3.1.1",
+    "angular-ui-bootstrap": "~1.3.2",
+    "angular-schema-form": "~0.8.13",
+    "angular-schema-form-bootstrap": "~0.2.0",
+    "bootstrap": "~3.3.6"
   },
   "resolutions": {
     "angular": "*"

data/preferences/gulpfile.js

@@ -112,11 +112,17 @@ gulp.task('inject-build',['copy-index-html', 'build-concat-css', 'build-concat-j
 
 gulp.task('build-copy-fonts', function() {
   return gulp.src(['bower_components/font-awesome/fonts/*',
-                   'bower_components/angular-ui-grid/*.ttf',
-                   'bower_components/angular-ui-grid/*.woff'])
+                   'bower_components/bootstrap/dist/fonts/*'])
     .pipe(gulp.dest('build/fonts'));
 });
 
+gulp.task('build-copy-fonts-to-css', function() {
+  return gulp.src(['bower_components/angular-ui-grid/*.ttf',
+                   'bower_components/angular-ui-grid/*.woff',
+                   'bower_components/angular-ui-grid/*.svg'])
+    .pipe(gulp.dest('build/css'));
+});
+
 
 gulp.task('default', ['serve', 'inject-dev']);
-gulp.task('build', ['clean-build', 'inject-build', 'build-copy-fonts']);
+gulp.task('build', ['clean-build', 'inject-build', 'build-copy-fonts', 'build-copy-fonts-to-css']);

ulauncher/ui/windows/PreferencesUlauncherDialog.py

@@ -146,7 +146,7 @@ def on_scheme_callback(self, scheme_request):
             resp = rt.dispatch(self, scheme_request.get_uri())
             callback = '%s(%s);' % (callback_name, json.dumps(resp))
         except PrefsApiError as e:
-            callback = '%s(null, %s);' % (callback_name, json.dumps(e))
+            callback = '%s(null, %s);' % (callback_name, json.dumps(e.message))
         except Exception as e:
             message = 'Unexpected API error. %s: %s' % (type(e).__name__, e.message)
             callback = '%s(null, %s);' % (callback_name, json.dumps(message))