Merge remote-tracking branch 'origin/polishing' into owen

frontend/dist/config/template.json

@@ -22,6 +22,15 @@
 	"messages": {
 		"accountRemoval": "Your account will be deactivated instantly and your data will shortly be deleted by an admin."
 	},
+	// "shortcutOverrides": {
+	// 	"editSong.useAllDiscogs": {
+	// 		"keyCode": 68,
+	// 		"ctrl": true,
+	// 		"alt": true,
+	// 		"shift": false,
+	// 		"preventDefault": true
+	// 	}
+	// },
 	"skipConfigVersionCheck": false,
-	"configVersion": 6
+	"configVersion": 7
 }

frontend/src/keyboardShortcuts.js

@@ -32,6 +32,13 @@ const lib = {
 		shortcuts[name].shift = shortcuts[name].shift
 			? shortcuts[name].shift
 			: false;
+		lofig.get("shortcutOverrides").then(overrides => {
+			if (overrides && overrides[name])
+				shortcuts[name] = Object.assign(
+					shortcuts[name],
+					overrides[name]
+				);
+		});
 		lib.remakeShortcutsArray();
 	},
 

frontend/src/main.js

@@ -9,7 +9,7 @@ import store from "./store";
 
 import AppComponent from "./App.vue";
 
-const REQUIRED_CONFIG_VERSION = 6;
+const REQUIRED_CONFIG_VERSION = 7;
 
 lofig.folder = "../config/default.json";