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

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

Browse Source 
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
This commit is contained in:
Blade Barringer
2015-02-09 22:21:27 -06:00
parent 45d1fb4c6e 24a6b2f4cc
commit 75c9b5a978
14 changed files with 2327 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ angular.module('habitrpg')
var runAuth = function(id, token) {
User.authenticate(id, token, function(err) {
$window.location.href = '/';
$window.location.href = ('/' + window.location.hash);
});
};
@@ -57,7 +57,7 @@ angular.module('habitrpg')
$scope.playButtonClick = function(){
window.ga && ga('send', 'event', 'button', 'click', 'Play');
if (User.authenticated()) {
window.location.href = '/#/tasks';
window.location.href = ('/' + window.location.hash);
} else {
$modal.open({
templateUrl: 'modals/login.html'