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

Conflicts: src/controllers/auth.js src/controllers/challenges.js src/controllers/groups.js src/controllers/members.js src/controllers/payments/index.js src/controllers/user.js src/middleware.js src/models/user.js
2015-02-03 21:13:55 -06:00
parent a59067def7 035fe8c0de
commit cc767efa20
25 changed files with 600 additions and 250 deletions
@@ -242,6 +242,8 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
                a(ui-sref='options.settings.coupon') Coupon
              li
                a(ui-sref='options.settings.subscription')=env.t('subscription')
+              li
+                a(ui-sref='options.settings.notifications')=env.t('notifications')
            ul.toolbar-submenu(ng-click='expandMenu(null)')
              li
                a(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank')=env.t('FAQ')