Merge branch 'locks-auto-equip' into develop

This commit is contained in:
Blade Barringer
2015-10-29 12:25:18 -05:00
6 changed files with 85 additions and 33 deletions

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},