Merge branch 'master' into file-v3

# Conflicts:
#	config/version.yml
This commit is contained in:
Mathieu Lagacé
2020-10-13 14:48:50 -04:00
30 changed files with 908 additions and 922 deletions

View File

@@ -31,6 +31,7 @@ class CreateEventsTable extends Migration
$table->string('calendar_color');
$table->string('calendar_icon');
$table->string('weekly_msg_publication_time')->default('-5day');
$table->boolean('hidden')->default(0);
$table->timestamps();
});
}

View File

@@ -28,6 +28,7 @@ class CreateEventTypesTable extends Migration
$table->boolean('use_schedule')->default(false);
$table->text('schedule_model');
$table->boolean('is_promoted')->default(false);
$table->boolean('hidden')->default(false);
$table->timestamps();
});
}