1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop

# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [feature/avatars] Use "Main" as category for avatars in root of gallery
  [feature/avatars] Remove trailing whitespace from avatar code
  [feature/avatars] Pass phpbb_user to prepare and process form functions
  [feature/avatars] Document the use of the allowed extensions array
  [feature/avatars] Use array for allowed extensions and implode if needed
  [feature/avatars] Use deprecated for compatibility function
  [feature/avatars] Correct license, copyright and package info
  [feature/avatars] Move list of supported formats to avatar driver class
  [feature/avatars] Add include of functions_display.php in BC function
  [feature/avatars] Add note about when compatibility function was added
  [feature/avatars] Add compatibility function for get_user_avatar()
  [feature/avatars] Move definition of driver_collection to avatars.yml
  [feature/avatars] Remove the obsolete request argument for avatar drivers
  [feature/avatars] Add missing @var to docblocks in avatar manager
  [feature/avatars] Remove not needed inline style
  [feature/avatars] Differentiate tests for get drivers functions
  ...
This commit is contained in:
Nathaniel Guse
2013-03-04 13:33:42 -06:00
63 changed files with 2432 additions and 1145 deletions

View File

@@ -445,7 +445,7 @@ CREATE TABLE phpbb_groups (
group_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
group_display INTEGER DEFAULT 0 NOT NULL,
group_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
group_avatar_type INTEGER DEFAULT 0 NOT NULL,
group_avatar_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
group_avatar_width INTEGER DEFAULT 0 NOT NULL,
group_avatar_height INTEGER DEFAULT 0 NOT NULL,
group_rank INTEGER DEFAULT 0 NOT NULL,
@@ -1357,7 +1357,7 @@ CREATE TABLE phpbb_users (
user_allow_massemail INTEGER DEFAULT 1 NOT NULL,
user_options INTEGER DEFAULT 230271 NOT NULL,
user_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
user_avatar_type INTEGER DEFAULT 0 NOT NULL,
user_avatar_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
user_avatar_width INTEGER DEFAULT 0 NOT NULL,
user_avatar_height INTEGER DEFAULT 0 NOT NULL,
user_sig BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,