Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat

2014-12-29 21:09:04 +01:00
parent 1ff19efac5 9b10081117
commit 752161b284
6 changed files with 21 additions and 6 deletions
@@ -278,7 +278,8 @@ var UserSchema = new Schema({
    automaticAllocation: Boolean,
    allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},
    costume: Boolean,
-    sleep: {type: Boolean, 'default': false},
+    dateFormat: {type: String, enum:['MM/dd/yyyy', 'dd/MM/yyyy'], 'default': 'MM/dd/yyyy'},
+	sleep: {type: Boolean, 'default': false},
    stickyHeader: {type: Boolean, 'default': true},
    disableClasses: {type: Boolean, 'default': false},
    newTaskEdit: {type: Boolean, 'default': false},