Merge branch 'develop' of github.com:lefnire/habitrpg into develop

bower.json

@@ -15,8 +15,8 @@
   ],
   "dependencies": {
     "jquery": "~2.0.3",
-    "angular": "1.2.0-rc.1",
-    "angular-resource": "1.2.0-rc.1",
+    "angular": "1.2.0-rc.2",
+    "angular-resource": "1.2.0-rc.2",
     "angular-ui": "~0.4.0",
     "angular-bootstrap": "~0.5.0",
     "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#rewrite",
@@ -29,9 +29,9 @@
     "sticky": "*",
     "bootstrap-datepicker": "~1.2.0",
     "bootstrap": "v2.3.2",
-    "angular-route": "1.2.0-rc.1",
+    "angular-route": "1.2.0-rc.2",
     "angular-ui-utils": "~0.0.4",
-    "angular-sanitize": "1.2.0-rc.1",
+    "angular-sanitize": "1.2.0-rc.2",
     "marked": "~0.2.9"
   },
   "resolutions": {

views/shared/modals/settings.jade

@@ -18,13 +18,13 @@ div(ng-controller='SettingsCtrl')
         form#restore-form.form-horizontal
           h3 Stats
           .option-group.option-medium
-            input.option-content(type='number', data-for='stats.hp', ng-model='user.stats.hp')
+            input.option-content(type='number', step="any", data-for='stats.hp', ng-model='user.stats.hp')
             span.input-suffix HP
           .option-group.option-medium
-            input.option-content(type='number', data-for='stats.exp', ng-model='user.stats.exp')
+            input.option-content(type='number', step="any", data-for='stats.exp', ng-model='user.stats.exp')
             span.input-suffix Exp
           .option-group.option-medium
-            input.option-content(type='number', data-for='stats.gp', ng-model='user.stats.gp')
+            input.option-content(type='number', step="any", data-for='stats.gp', ng-model='user.stats.gp')
             span.input-suffix GP
           .option-group.option-medium
             input.option-content(type='number', data-for='stats.lvl', ng-model='user.stats.lvl')

views/tasks/task.jade

@@ -36,8 +36,8 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use
     // Habits
     span(ng-if='list.main && task.type=="habit"')
       // only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges
-      a.task-action-btn(ng-show='task.up', ng-click='score(task,"up")') +
-      a.task-action-btn(ng-show='task.down', ng-click='score(task,"down")') -
+      a.task-action-btn(ng-if='task.up', ng-click='score(task,"up")') +
+      a.task-action-btn(ng-if='task.down', ng-click='score(task,"down")') -
     //span(ng-if='!list.main')
     //  span.task-action-btn(ng-show='task.up') +
     //  span.task-action-btn(ng-show='task.down') =
@@ -117,7 +117,7 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use
       // if Reward, pricing
       fieldset.option-group.option-short(ng-if='task.type=="reward"')
         legend.option-title Price
-        input.option-content(type='number', size='16', min='0', ng-model='task.value')
+        input.option-content(type='number', size='16', min='0', step="any", ng-model='task.value')
         .money.input-suffix
           span.shop_gold
       // if Todos, the due date