Merge branch 'develop' into api-v3

2016-03-30 23:40:00 +02:00
parent 7e9520b920 4fa8c6dfbd
commit 3089658cc7
26 changed files with 8755 additions and 8720 deletions
@@ -400,6 +400,8 @@ export let schema = new Schema({
    shirt: {type: String, default: 'blue'},
    timezoneOffset: Number,
    sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']},
+    chair: {type: String, default: 'none'},
+    timezoneOffsetAtLastCron: Number,
    language: String,
    automaticAllocation: Boolean,
    allocationMode: {type: String, enum: ['flat', 'classbased', 'taskbased'], default: 'flat'},