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

Merge branch 'develop' into sabrecat/more-modals

Browse Source
This commit is contained in:
Sabe Jones
2015-10-30 16:33:17 -04:00
parent c28afc9abc ad6fbef85c
commit 5d3f41637f
233 changed files with 2017 additions and 2111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/src/models/user.js
View File

@@ -347,6 +347,7 @@ var UserSchema = new Schema({
language: String,
automaticAllocation: Boolean,
allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},
autoEquip: {type: Boolean, 'default': true},
costume: Boolean,
dateFormat: {type: String, enum:['MM/dd/yyyy', 'dd/MM/yyyy', 'yyyy/MM/dd'], 'default': 'MM/dd/yyyy'},
sleep: {type: Boolean, 'default': false},