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

Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync

Browse Source
This commit is contained in:
Blade Barringer
2015-06-28 21:07:32 -05:00
parent 0e4e7a032a 5f29e19aa7
commit b72b14fe6c
555 changed files with 15797 additions and 11552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/public/js/app.js
View File

@@ -243,7 +243,7 @@ window.habitrpg = angular.module('habitrpg',
.state('options.settings.notifications', {
url: "/notifications",
templateUrl: "partials/options.settings.notifications.html"
})
});
var settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID));
if (settings && settings.auth) {
@@ -251,4 +251,4 @@ window.habitrpg = angular.module('habitrpg',
$httpProvider.defaults.headers.common['x-api-user'] = settings.auth.apiId;
$httpProvider.defaults.headers.common['x-api-key'] = settings.auth.apiToken;
}
}])
}]);