mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-16 21:54:00 +02:00
Merge branch 'develop' into feature/avatars
* develop: (201 commits) [feature/new-tz-handling] Don't use global user but make it a parameter [feature/new-tz-handling] Fix size of suggestion button in chrome [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid [feature/new-tz-handling] Add previous selected value to validation if valid [feature/new-tz-handling] Display suggestion when a different value is selected [ticket/10998] Add border-radius to forum rules block - prosilver [feature/new-tz-handling] Remove additional marking of selected items [feature/new-tz-handling] Move update helper function to new class [feature/new-tz-handling] Fix unit test [feature/new-tz-handling] Delete old variable which is not used anymore [feature/new-tz-handling] Rename $user->tz back to $user->timezone [feature/pagination-as-list] New parameter for name of start var [feature/pagination-as-list] Updates for nils comments [feature/pagination-as-list] Rename and deprecate functions [feature/pagination-as-list] Various fixes and improvements [ticket/10968] Render pagination within the template [feature/new-tz-handling] Remove "timezone might be numeric" [feature/new-tz-handling] Add function to update the timezone [feature/new-tz-handling] Correctly update user and board timezones on update [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL ...
This commit is contained in:
@@ -1242,8 +1242,7 @@ CREATE TABLE phpbb_users (
|
||||
user_inactive_time INTEGER DEFAULT 0 NOT NULL,
|
||||
user_posts INTEGER DEFAULT 0 NOT NULL,
|
||||
user_lang VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL,
|
||||
user_timezone DOUBLE PRECISION DEFAULT 0 NOT NULL,
|
||||
user_dst INTEGER DEFAULT 0 NOT NULL,
|
||||
user_timezone VARCHAR(100) CHARACTER SET NONE DEFAULT 'UTC' NOT NULL,
|
||||
user_dateformat VARCHAR(30) CHARACTER SET UTF8 DEFAULT 'd M Y H:i' NOT NULL COLLATE UNICODE,
|
||||
user_style INTEGER DEFAULT 0 NOT NULL,
|
||||
user_rank INTEGER DEFAULT 0 NOT NULL,
|
||||
|
@@ -1526,8 +1526,7 @@ CREATE TABLE [phpbb_users] (
|
||||
[user_inactive_time] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_posts] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_lang] [varchar] (30) DEFAULT ('') NOT NULL ,
|
||||
[user_timezone] [float] DEFAULT (0) NOT NULL ,
|
||||
[user_dst] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_timezone] [varchar] (100) DEFAULT ('UTC') NOT NULL ,
|
||||
[user_dateformat] [varchar] (30) DEFAULT ('d M Y H:i') NOT NULL ,
|
||||
[user_style] [int] DEFAULT (0) NOT NULL ,
|
||||
[user_rank] [int] DEFAULT (0) NOT NULL ,
|
||||
|
@@ -890,8 +890,7 @@ CREATE TABLE phpbb_users (
|
||||
user_inactive_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
user_lang varbinary(30) DEFAULT '' NOT NULL,
|
||||
user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
|
||||
user_dst tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
user_timezone varbinary(100) DEFAULT 'UTC' NOT NULL,
|
||||
user_dateformat varbinary(90) DEFAULT 'd M Y H:i' NOT NULL,
|
||||
user_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
|
@@ -890,8 +890,7 @@ CREATE TABLE phpbb_users (
|
||||
user_inactive_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
user_lang varchar(30) DEFAULT '' NOT NULL,
|
||||
user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
|
||||
user_dst tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
user_timezone varchar(100) DEFAULT 'UTC' NOT NULL,
|
||||
user_dateformat varchar(30) DEFAULT 'd M Y H:i' NOT NULL,
|
||||
user_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
|
@@ -1638,8 +1638,7 @@ CREATE TABLE phpbb_users (
|
||||
user_inactive_time number(11) DEFAULT '0' NOT NULL,
|
||||
user_posts number(8) DEFAULT '0' NOT NULL,
|
||||
user_lang varchar2(30) DEFAULT '' ,
|
||||
user_timezone number(5, 2) DEFAULT '0' NOT NULL,
|
||||
user_dst number(1) DEFAULT '0' NOT NULL,
|
||||
user_timezone varchar2(100) DEFAULT 'UTC' NOT NULL,
|
||||
user_dateformat varchar2(90) DEFAULT 'd M Y H:i' NOT NULL,
|
||||
user_style number(8) DEFAULT '0' NOT NULL,
|
||||
user_rank number(8) DEFAULT '0' NOT NULL,
|
||||
|
@@ -1140,8 +1140,7 @@ CREATE TABLE phpbb_users (
|
||||
user_inactive_time INT4 DEFAULT '0' NOT NULL CHECK (user_inactive_time >= 0),
|
||||
user_posts INT4 DEFAULT '0' NOT NULL CHECK (user_posts >= 0),
|
||||
user_lang varchar(30) DEFAULT '' NOT NULL,
|
||||
user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
|
||||
user_dst INT2 DEFAULT '0' NOT NULL CHECK (user_dst >= 0),
|
||||
user_timezone varchar(100) DEFAULT 'UTC' NOT NULL,
|
||||
user_dateformat varchar(30) DEFAULT 'd M Y H:i' NOT NULL,
|
||||
user_style INT4 DEFAULT '0' NOT NULL CHECK (user_style >= 0),
|
||||
user_rank INT4 DEFAULT '0' NOT NULL CHECK (user_rank >= 0),
|
||||
|
@@ -54,12 +54,11 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_salt', 'php
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact', 'contact@yourdomain.tld');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable_msg', '');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_dst', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email', 'address@yourdomain.tld');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig', '{L_CONFIG_BOARD_EMAIL_SIG}');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_hide_emails', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone', 'UTC');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval', '10');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type', 'd');
|
||||
@@ -125,6 +124,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_co
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_load_upd', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_max_chars', '14');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_min_chars', '3');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_max_word_len', '254');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_min_word_len', '4');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_ts_name', 'simple');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '25');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons');
|
||||
|
@@ -864,8 +864,7 @@ CREATE TABLE phpbb_users (
|
||||
user_inactive_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
user_posts INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
user_lang varchar(30) NOT NULL DEFAULT '',
|
||||
user_timezone decimal(5,2) NOT NULL DEFAULT '0',
|
||||
user_dst INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
user_timezone varchar(100) NOT NULL DEFAULT 'UTC',
|
||||
user_dateformat varchar(30) NOT NULL DEFAULT 'd M Y H:i',
|
||||
user_style INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
user_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
|
Reference in New Issue
Block a user