mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 16:56:44 +02:00
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (234 commits) [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10411] Fix call to function on non-object $db->...() [ticket/10411] Remove ajax delete, so the page is refreshed [feature/avatars] Auto-clear avatar dimensions when first changing avatars [ticket/10411] Update schema file with new table and remove the column [ticket/10411] Add unit tests for move() with values >1 [ticket/10411] Add migrations file for teampage table [ticket/10411] Revert database_update.php changes from for easier update ...
This commit is contained in:
@@ -466,7 +466,7 @@ CREATE TABLE phpbb_groups (
|
||||
group_desc_uid varchar(8) DEFAULT '' NOT NULL,
|
||||
group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0),
|
||||
group_avatar varchar(255) DEFAULT '' NOT NULL,
|
||||
group_avatar_type INT2 DEFAULT '0' NOT NULL,
|
||||
group_avatar_type varchar(255) DEFAULT '' NOT NULL,
|
||||
group_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_width >= 0),
|
||||
group_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (group_avatar_height >= 0),
|
||||
group_rank INT4 DEFAULT '0' NOT NULL CHECK (group_rank >= 0),
|
||||
@@ -476,7 +476,6 @@ CREATE TABLE phpbb_groups (
|
||||
group_message_limit INT4 DEFAULT '0' NOT NULL CHECK (group_message_limit >= 0),
|
||||
group_max_recipients INT4 DEFAULT '0' NOT NULL CHECK (group_max_recipients >= 0),
|
||||
group_legend INT4 DEFAULT '0' NOT NULL CHECK (group_legend >= 0),
|
||||
group_teampage INT4 DEFAULT '0' NOT NULL CHECK (group_teampage >= 0),
|
||||
PRIMARY KEY (group_id)
|
||||
);
|
||||
|
||||
@@ -1061,6 +1060,21 @@ CREATE TABLE phpbb_styles (
|
||||
|
||||
CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
|
||||
|
||||
/*
|
||||
Table: 'phpbb_teampage'
|
||||
*/
|
||||
CREATE SEQUENCE phpbb_teampage_seq;
|
||||
|
||||
CREATE TABLE phpbb_teampage (
|
||||
teampage_id INT4 DEFAULT nextval('phpbb_teampage_seq'),
|
||||
group_id INT4 DEFAULT '0' NOT NULL CHECK (group_id >= 0),
|
||||
teampage_name varchar(255) DEFAULT '' NOT NULL,
|
||||
teampage_position INT4 DEFAULT '0' NOT NULL CHECK (teampage_position >= 0),
|
||||
teampage_parent INT4 DEFAULT '0' NOT NULL CHECK (teampage_parent >= 0),
|
||||
PRIMARY KEY (teampage_id)
|
||||
);
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_topics'
|
||||
*/
|
||||
@@ -1239,7 +1253,7 @@ CREATE TABLE phpbb_users (
|
||||
user_allow_massemail INT2 DEFAULT '1' NOT NULL CHECK (user_allow_massemail >= 0),
|
||||
user_options INT4 DEFAULT '230271' NOT NULL CHECK (user_options >= 0),
|
||||
user_avatar varchar(255) DEFAULT '' NOT NULL,
|
||||
user_avatar_type INT2 DEFAULT '0' NOT NULL,
|
||||
user_avatar_type varchar(255) DEFAULT '' NOT NULL,
|
||||
user_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_width >= 0),
|
||||
user_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_height >= 0),
|
||||
user_sig TEXT DEFAULT '' NOT NULL,
|
||||
|
Reference in New Issue
Block a user