Merge branch 'master' into production

server/achievements/Achievement.coffee

@@ -13,7 +13,7 @@ TreemaUtils = require '../../bower_components/treema/treema-utils.js'
 
 AchievementSchema = new mongoose.Schema({
   userField: String
-}, {strict: false, minimize: false})
+}, {strict: false})
 
 AchievementSchema.methods.objectifyQuery = ->
   try

server/analytics/AnalyticsLogEvent.coffee

@@ -5,7 +5,7 @@ AnalyticsLogEventSchema = new mongoose.Schema({
   created:
     type: Date
     'default': Date.now
-}, {strict:false, minimize: false})
+}, {strict: false})
 AnalyticsLogEventSchema.index({event: 1, created: -1})
 
 module.exports = AnalyticsLogEvent = mongoose.model('analytics.log.event', AnalyticsLogEventSchema)

server/analytics/AnalyticsUsersActive.coffee

@@ -5,6 +5,6 @@ AnalyticsUsersActiveSchema = new mongoose.Schema({
   created:
     type: Date
     'default': Date.now
-}, {strict:false, minimize: false})
+}, {strict: false})
 
 module.exports = AnalyticsUsersActive = mongoose.model('analytics.users.active', AnalyticsUsersActiveSchema)

server/articles/Article.coffee

@@ -1,7 +1,7 @@
 mongoose = require 'mongoose'
 plugins = require '../plugins/plugins'
 
-ArticleSchema = new mongoose.Schema(body: String, {strict:false, minimize: false})
+ArticleSchema = new mongoose.Schema(body: String, {strict: false})
 
 ArticleSchema.plugin(plugins.NamedPlugin)
 ArticleSchema.plugin(plugins.VersionedPlugin)

server/campaigns/Campaign.coffee

@@ -1,7 +1,7 @@
 mongoose = require 'mongoose'
 plugins = require '../plugins/plugins'
 
-CampaignSchema = new mongoose.Schema(body: String, {strict:false, minimize: false})
+CampaignSchema = new mongoose.Schema(body: String, {strict: false})
 
 CampaignSchema.plugin(plugins.NamedPlugin)
 CampaignSchema.plugin(plugins.TranslationCoveragePlugin)

server/levels/Level.coffee

@@ -4,7 +4,7 @@ jsonschema = require '../../app/schemas/models/level'
 
 LevelSchema = new mongoose.Schema({
   description: String
-}, {strict:false, minimize: false})
+}, {strict: false})
 
 LevelSchema.plugin(plugins.NamedPlugin)
 LevelSchema.plugin(plugins.PermissionsPlugin)

server/levels/components/LevelComponent.coffee

@@ -5,7 +5,7 @@ jsonschema = require '../../../app/schemas/models/level_component'
 LevelComponentSchema = new mongoose.Schema {
   description: String
   system: String
-}, {strict:false, minimize: false}
+}, {strict: false}
 
 LevelComponentSchema.plugin plugins.NamedPlugin
 LevelComponentSchema.plugin plugins.PermissionsPlugin

server/levels/feedbacks/LevelFeedback.coffee

@@ -8,6 +8,6 @@ LevelFeedbackSchema = new mongoose.Schema({
   created:
     type: Date
     'default': Date.now
-}, {strict:false, minimize: false})
+}, {strict: false})
 
 module.exports = LevelFeedback = mongoose.model('level.feedback', LevelFeedbackSchema)

server/levels/sessions/LevelSession.coffee

@@ -10,7 +10,7 @@ LevelSessionSchema = new mongoose.Schema({
   created:
     type: Date
     'default': Date.now
-}, {strict:false, minimize: false})
+}, {strict: false})
 LevelSessionSchema.plugin(plugins.PermissionsPlugin)
 LevelSessionSchema.plugin(AchievablePlugin)
 

server/levels/systems/LevelSystem.coffee

@@ -4,7 +4,7 @@ jsonschema = require '../../../app/schemas/models/level_system'
 
 LevelSystemSchema = new mongoose.Schema {
   description: String
-}, {strict:false, minimize: false}
+}, {strict: false}
 
 LevelSystemSchema.plugin(plugins.NamedPlugin)
 LevelSystemSchema.plugin(plugins.PermissionsPlugin)

server/levels/thangs/ThangType.coffee

@@ -3,7 +3,7 @@ plugins = require '../../plugins/plugins'
 
 ThangTypeSchema = new mongoose.Schema({
   body: String,
-}, {strict:false, minimize: false})
+}, {strict: false})
 
 ThangTypeSchema.plugin plugins.NamedPlugin
 ThangTypeSchema.plugin plugins.VersionedPlugin

server/mail/sent/MailSent.coffee

@@ -6,6 +6,6 @@ MailSent = new mongoose.Schema({
   sent:
     type: Date
     'default': Date.now
-}, {strict:false, minimize: false})
+}, {strict: false})
 
 module.exports = MailSent = mongoose.model('mail.sent', MailSent)

server/patches/Patch.coffee

@@ -3,7 +3,7 @@ deltas = require '../../app/core/deltas'
 log = require 'winston'
 {handlers} = require '../commons/mapping'
 
-PatchSchema = new mongoose.Schema({status: String}, {strict:false, minimize: false})
+PatchSchema = new mongoose.Schema({status: String}, {strict: false})
 
 PatchSchema.pre 'save', (next) ->
   return next() unless @isNew # patch can't be altered after creation, so only need to check data once
@@ -43,7 +43,7 @@ PatchSchema.pre 'save', (next) ->
     patches = document.get('patches') or []
     patches = _.clone patches
     patches.push @_id
-    document.set 'patches', patches, {strict:false}
+    document.set 'patches', patches, {strict: false}
     @targetLoaded = document
     document.save (err) -> next(err)
 

server/payments/Payment.coffee

@@ -1,6 +1,6 @@
 mongoose = require('mongoose')
 
-PaymentSchema = new mongoose.Schema({}, {strict:false, minimize: false})
+PaymentSchema = new mongoose.Schema({}, {strict: false})
 PaymentSchema.index({recipient: 1, 'stripe.timestamp': 1, 'ios.transactionID'}, {unique: true, name: 'unique payment'})
 
 module.exports = mongoose.model('payment', PaymentSchema)

server/purchases/Purchase.coffee

@@ -1,6 +1,6 @@
 mongoose = require('mongoose')
 
-PurchaseSchema = new mongoose.Schema({status: String}, {strict:false, minimize: false})
+PurchaseSchema = new mongoose.Schema({status: String}, {strict: false})
 PurchaseSchema.index({recipient: 1, 'purchased.original': 1}, {unique: true, name: 'unique purchase'})
 
 module.exports = mongoose.model('purchase', PurchaseSchema)

server/user_code_problems/UserCodeProblem.coffee

@@ -5,6 +5,6 @@ UserCodeProblemSchema = new mongoose.Schema({
   created:
     type: Date
     'default': Date.now
-}, {strict:false, minimize: false})
+}, {strict: false})
 
 module.exports = UserCodeProblem = mongoose.model('user.code.problem', UserCodeProblemSchema)

server/users/User.coffee

@@ -17,7 +17,7 @@ UserSchema = new mongoose.Schema({
   dateCreated:
     type: Date
     'default': Date.now
-}, {strict:false, minimize: false})
+}, {strict: false})
 
 UserSchema.post('init', ->
   @set('anonymous', false) if @get('email')

server/users/remarks/UserRemark.coffee

@@ -6,6 +6,6 @@ UserRemarkSchema = new mongoose.Schema({
   created:
     type: Date
     'default': Date.now
-}, {strict:false, minimize: false})
+}, {strict: false})
 
 module.exports = UserRemark = mongoose.model('user.remark', UserRemarkSchema)

test/server/functional/level.spec.coffee

@@ -8,7 +8,7 @@ describe 'Level', ->
     permissions: simplePermissions
     scripts: []
     thangs: []
-    documentation: {specificArticles: [{}], generalArticles: []}
+    documentation: {specificArticles: [], generalArticles: []}
 
   urlLevel = '/db/level'