summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mach2.py2
-rw-r--r--package.json6
-rw-r--r--static/scripts/app/controllers.js1
-rw-r--r--tests/test.dbbin19456 -> 19456 bytes
-rw-r--r--tests/testapp.dbbin2048 -> 2048 bytes
5 files changed, 6 insertions, 3 deletions
diff --git a/mach2.py b/mach2.py
index daf5027..0d674fb 100644
--- a/mach2.py
+++ b/mach2.py
@@ -500,7 +500,7 @@ def load_user(user_id):
if result:
local_user = User(
- id=result[0], username=result[1],password_hash=result[2],
+ id=result[0], username=result[1], password_hash=result[2],
authenticated=1, active=result[4], anonymous=0,
transcode_command=result[7])
diff --git a/package.json b/package.json
index aa0ff4d..02a7064 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,10 @@
"devDependencies": {
"grunt": "~0.4.5",
"grunt-bower-task": "^0.4.0",
- "grunt-run": "^0.3.0"
+ "grunt-run": "^0.3.0",
+ "karma": "^1.7.0"
+ },
+ "dependencies": {
+ "vue": "^2.3.3"
}
}
diff --git a/static/scripts/app/controllers.js b/static/scripts/app/controllers.js
index 35340e6..2e41732 100644
--- a/static/scripts/app/controllers.js
+++ b/static/scripts/app/controllers.js
@@ -66,7 +66,6 @@ mach2Controllers.controller(
ArtistAlbums,
ArtistTracks
) {
- console.log('Am I here?');
$scope.artist = Artist.query({
artistId: $stateParams.artistId
});
diff --git a/tests/test.db b/tests/test.db
index 1602d6f..6012502 100644
--- a/tests/test.db
+++ b/tests/test.db
Binary files differ
diff --git a/tests/testapp.db b/tests/testapp.db
index ae0702d..db96624 100644
--- a/tests/testapp.db
+++ b/tests/testapp.db
Binary files differ