sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-15 00:12:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into sabrecat/party-page

Browse source
This commit is contained in:
Blade Barringer 2015-09-05 09:20:06 -05:00
commit 6fc8e0b5a5
3 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/locales/en/settings.json
View file

@ -22,7 +22,6 @@
"fixValPop": "Manually change values like Health, Level, and Gold.",
"enableClass": "Enable Class System",
"enableClassPop": "You opted out of the class system initially. Would you like now to opt-in?",
"showClass": "Show Classes Tour",
"classTourPop": "Show the tour for using the class system.",
"resetAccount": "Reset Account",
"resetAccPop": "Start over, removing all levels, gold, gear, history, and tasks.",

4
website/public/js/controllers/settingsCtrl.js
View file

@ -58,10 +58,6 @@ habitrpg.controller('SettingsCtrl',
Guide.goto('intro', 0, true);
}
$scope.showClassesTour = function(){
Guide.goto('classes', 0, true);
}
$scope.showBailey = function(){
User.set({'flags.newStuff':true});
}

1
website/views/options/settings.jade
View file

@ -74,7 +74,6 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
button.btn.btn-default(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('showBaileyPop'))= env.t('showBailey')
button.btn.btn-default(ng-click='openRestoreModal()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('fixValPop'))= env.t('fixVal')
button.btn.btn-default(ng-if='user.preferences.disableClasses==true', ng-click='user.ops.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('enableClassPop'))= env.t('enableClass')
button.btn.btn-default(ng-if='!user.preferences.disableClasses && user.flags.classSelected', ng-click='showClassesTour()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('classTourPop'))= env.t('showClass')
div.alert.alert-warning(style='padding:2px;margin-top:7px')
h5=env.t('customDayStart')