Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3

This commit is contained in:
Blade Barringer
2015-12-29 08:06:22 -06:00
550 changed files with 12318 additions and 8209 deletions

View File

@@ -212,7 +212,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
};
$scope.removeTask = function(task, list) {
if (!confirm(window.env.t('sureDelete'))) return;
if (!confirm(window.env.t('sureDelete', {taskType: window.env.t(task.type), taskText: task.text}))) return;
//TODO persist
// User.log({op: "delTask", data: task});
_.remove(list, task);