mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into psr-7

Browse Source 
Conflicts:
	src/Api/Actions/Discussions/IndexAction.php
	src/Api/Actions/SerializeAction.php
	src/Core/Formatter/FormatterManager.php
	src/Extend/ForumAssets.php
	src/Forum/Actions/IndexAction.php
	src/Forum/ForumServiceProvider.php
This commit is contained in:
Franz Liedke
2015-06-17 00:52:50 +02:00
parent a240fbc3ec 8a0cf2dcba
commit 0262f45f57
91 changed files with 1381 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/core/migrations/2015_02_24_000000_create_users_discussions_table.php
View File

@@ -15,7 +15,6 @@ class CreateUsersDiscussionsTable extends Migration
public function up()
{
Schema::create('users_discussions', function (Blueprint $table) {
$table->integer('user_id')->unsigned();
$table->integer('discussion_id')->unsigned();
$table->dateTime('read_time')->nullable();

1
framework/core/migrations/2015_02_24_000000_create_users_table.php
View File

@@ -20,6 +20,7 @@ class CreateUsersTable extends Migration
$table->string('email', 150)->unique();
$table->boolean('is_activated')->default(0);
$table->string('password', 100);
$table->string('locale', 10)->default('en');
$table->text('bio')->nullable();
$table->text('bio_html')->nullable();
$table->string('avatar_path', 100)->nullable();