krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into analytics-service-server-side

Browse Source
This commit is contained in:
Blade Barringer
2015-07-19 10:13:34 -05:00
parent 16c6647b34 dc2fab14d0
commit 054d884154
570 changed files with 17624 additions and 14265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/public/js/controllers/authCtrl.js
View File

@@ -55,8 +55,8 @@ angular.module('habitrpg')
$scope.auth = function() {
var data = {
username: $scope.loginUsername || $('#login-tab input[name="username"]').val(),
password: $scope.loginPassword || $('#login-tab input[name="password"]').val()
username: $scope.loginUsername || $('#loginForm input[name="username"]').val(),
password: $scope.loginPassword || $('#loginForm input[name="password"]').val()
};
$http.post(ApiUrl.get() + "/api/v2/user/auth/local", data)
.success(function(data, status, headers, config) {