Merge pull request #63 from StarGazer1258/beta

Merge 2.5.8-beta to stable
StarGazer1258 · Aug 1, 2019 · ccbef30 · ccbef30
2 parents 9d67a97 + 0527d3a
commit ccbef30
Show file tree

Hide file tree

Showing 26 changed files with 254 additions and 68 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "beatdrop",
   "description": "A desktop app for downloading Beat Saber songs.",
   "author": "Nathaniel Johns (StarGazer1258)",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "private": false,
   "license": "CC-BY-NC-SA-4.0",
   "repository": {
@@ -28,6 +28,7 @@
     "redux-thunk": "^2.3.0",
     "remarkable": "^1.7.1",
     "rimraf": "^2.6.2",
+    "semver": "^6.3.0",
     "sortablejs": "^1.8.0-rc1",
     "walker": "^1.0.7"
   },

diff --git a/src/actions/detailsActions.js b/src/actions/detailsActions.js
@@ -1,5 +1,5 @@
 import { LOAD_DETAILS, CLEAR_DETAILS, SET_DETAILS_LOADING, DISPLAY_WARNING } from './types'
-import { SONG_DETAILS } from '../views'
+import { SONG_DETAILS } from '../constants/views'
 
 import AdmZip from 'adm-zip'
 import { hashAndWriteToMetadata } from './queueActions'