mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-08 17:56:52 +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:
@@ -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