Merge branch 'hotfix-development'

Author: alexweissman

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.3.1.22
+
+- Use `nullableTimestamps` instead of `timestamps` in installer, to prevent conflict with MySQL modes 'NO_ZERO_IN_DATE' and 'NO_ZERO_DATE'.
+
 ## v0.3.1.21
 
 - Use Laravel's Schema interface to create tables and default rows, instead of constructing them with SQL

userfrosting/initialize.php

@@ -158,7 +158,7 @@
         'guest_theme' => 'default',
         'minify_css' => '0',
         'minify_js' => '0',
-        'version' => '0.3.1.21',
+        'version' => '0.3.1.22',
         'author' => 'Alex Weissman',
         'show_terms_on_register' => '1',
         'site_location' => 'The State of Indiana'

userfrosting/models/database/Database.php

@@ -258,7 +258,7 @@ public static function install(){
                 $table->boolean('flag_verified')->default(1)->comment("Set to ''1'' if the user has verified their account via email, ''0'' otherwise.");
                 $table->boolean('flag_enabled')->default(1)->comment("Set to ''1'' if the user''s account is currently enabled, ''0'' otherwise.  Disabled accounts cannot be logged in to, but they retain all of their data and settings.");
                 $table->boolean('flag_password_reset')->default(0)->comment("Set to ''1'' if the user has an outstanding password reset request, ''0'' otherwise.");
-                $table->timestamps();
+                $table->nullableTimestamps();
                 $table->string('password', 255);
                 $table->engine = 'InnoDB';
                 $table->collation = 'utf8_unicode_ci';