Merge branch 'develop'

barriosnahuel · Jan 11, 2016 · 25141a8 · 25141a8
2 parents 7db66f5 + ad53ecf
commit 25141a8
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 6 deletions.
diff --git a/js/bend/events/pull_request_event.js b/js/bend/events/pull_request_event.js
@@ -26,6 +26,7 @@ spk.events.pullRequestEvent = (function () {
 
         switch (action) {
             case 'opened':
+            case 'reopened':
                 icon = 'img/events/pr-opened.png';
                 break;
             case 'closed':

diff --git a/manifest.json b/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
-    "name": "Spokesman -GitHub's notifications interpreter",
+    "name": "Spokesman - GitHub's notifications",
     "short_name": "Spokesman",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "Get desktop notifications of events that occur on GitHub that really interest you.",
     "browser_action": {
         "default_icon": {
@@ -17,10 +17,7 @@
         "48": "img/megaphone17-64.png",
         "128": "img/megaphone17-128.png"
     },
-    "options_ui": {
-        "chrome_style": false,
-        "page": "views/settings.html"
-    },
+    "options_page": "views/settings.html",
     "permissions": [
         "alarms",
         "notifications",

diff --git a/store/megaphone17-128.png → store/icon.png b/store/megaphone17-128.png → store/icon.png
diff --git a/store/marquee.png b/store/marquee.png
diff --git a/store/marquee.xcf b/store/marquee.xcf
diff --git a/store/mosaic-large_interesting_events.png b/store/mosaic-large_interesting_events.png
diff --git a/store/mosaic-large_interesting_events.xcf b/store/mosaic-large_interesting_events.xcf
diff --git a/store/mosaic-small_notifications.png b/store/mosaic-small_notifications.png
diff --git a/store/mosaic-small_notifications.xcf b/store/mosaic-small_notifications.xcf
diff --git a/store/screenshots/comment.png b/store/screenshots/comment.png
diff --git a/store/screenshots/more info.png b/store/screenshots/more info.png
diff --git a/store/screenshots/pr-merged.png b/store/screenshots/pr-merged.png
diff --git a/store/screenshots/pr-opened.png b/store/screenshots/pr-opened.png
diff --git a/store/screenshots/pr-reopened.png b/store/screenshots/pr-reopened.png
diff --git a/store/screenshots/release.png b/store/screenshots/release.png
diff --git a/store/screenshots/settings.png b/store/screenshots/settings.png