Merge branch 'master' into authwindow-clipboard

Author: Emmanouil Konstantinidis

package.json

@@ -9,7 +9,7 @@
     "watch-js": "watchify -t reactify src/js/app.js -o build/js/app.js -v",
     "watch": "grunt build && npm build && npm run watch-js | grunt watch",
     "start": "electron .",
-    "dist": "rm -rf Gitify.app/ && electron-packager . Gitify --platform=darwin --arch=x64 --version=0.26.1 --icon=images/app-icon.icns --prune --ignore=src",
+    "dist": "rm -rf Gitify.app/ && electron-packager . Gitify --platform=darwin --arch=x64 --version=0.27.1 --icon=images/app-icon.icns --prune --ignore=src",
     "test": "jsxhint --reporter node_modules/jshint-stylish/stylish.js 'src/**/*.js', 'index.js' --exclude 'Gruntfile.js'"
   },
   "repository": {
@@ -44,8 +44,8 @@
     "watchify": "=3.2.1"
   },
   "devDependencies": {
-    "electron-packager": "=4.1.1",
-    "electron-prebuilt": "=0.26.1",
+    "electron-packager": "=4.1.2",
+    "electron-prebuilt": "=0.27.1",
     "grunt": "=0.4.5",
     "grunt-contrib-clean": "=0.6.0",
     "grunt-contrib-copy": "=0.8.0",

src/js/stores/notifications.js

@@ -26,7 +26,7 @@ var NotificationsStore = Reflux.createStore({
     var tokens = AuthStore.authStatus();
 
     apiRequests
-      .getAuth('https://api.github.com/notifications?now=' + Date.now())
+      .getAuth('https://api.github.com/notifications')
       .end(function (err, response) {
         if (response && response.ok) {
           // Success - Do Something.

src/js/utils/api-requests.js

@@ -21,6 +21,7 @@ var apiRequests = {
       .get(url)
       .set('Accept', 'application/vnd.github.v3+json')
       .set('Authorization', 'token ' + AuthStore.authStatus())
+      .set('Cache-Control', 'no-cache')
       .set('User-Agent', 'Gitify');
   },
 
@@ -30,6 +31,7 @@ var apiRequests = {
       .send(params)
       .set('Accept', 'application/vnd.github.v3+json')
       .set('Authorization', 'token ' + AuthStore.authStatus())
+      .set('Cache-Control', 'no-cache')
       .set('User-Agent', 'Gitify');
   }
 };