| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
| |
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.
PHPBB3-12458
|
| |
|
|
| |
PHPBB3-12153
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/feature/pagination-class:
[ticket/11849] Fix more function calls
[ticket/11849] Update more MCP calls to pagination class
[ticket/11849] Update some ACP modules with new pagination
[ticket/11849] Update rest of the UCP modules
[ticket/11849] Update UCP notifications and pm folder
[ticket/11849] Update search and memberlist
[ticket/11849] Update pagination in viewonline.php
[ticket/11849] Remove old pagination test
[ticket/11849] Update pagination code in viewtopic.php
[ticket/11849] Replace pagination in viewforum.php with class
[ticket/11849] Add service definition
[ticket/11849] Remove pagination functions
[ticket/11849] Test validate_start and on_page
[ticket/11849] Move pagination code to class
|
| | |
| |
| |
| | |
PHPBB3-11849
|
| | |
| |
| |
| | |
PHPBB3-11842
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
phpBB/includes/acp/acp_groups.php
|
| | |\
| | |
| | | |
[ticket/10810] Move color swatches from popup windows to inline blocks.
|
| | | |
| | |
| | |
| | | |
PHPBB3-10810
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Until now, the user data had both user_id and group_id keys in the avatar
data. As both group_ and user_ prefixes were removed the group_id was
collapsed onto the user_id and therefore all users in the same group had
the same prefix for their uploaded avatars. This patch will make sure
that the correct id is used depending on whether it's a group's or user's
avatar data.
PHPBB3-11525
|
| | |
| |
| |
| | |
PHPBB3-11842
|
| |/
|
|
|
|
|
|
|
| |
It seems like the function group_correct_avatar() was forgotten while adding
the new avatar system. We now pass the group_id 0 to the upload avatar and
let the function group_correct_avatar() fix the avatar filename after creating
the group like it was done previously.
PHPBB3-11842
|
| |
|
|
| |
PHPBB3-11700
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11548] Fix incorrect usage of array_map on acp groups page
Conflicts:
tests/functional/common_groups_test.php
tests/functional/ucp_groups_test.php
|
| | |
| |
| |
| |
| |
| |
| |
| | |
The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.
PHPBB3-11548
|
| | |
| |
| |
| |
| |
| |
| | |
The avatar manager's method localize_errors() shouldn't be called if
avatars are disabled in the config.
PHPBB3-11602
|
| |\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10840] Add check_form_key to acp_groups.php
|
| | |
| |
| |
| | |
PHPBB3-10840
|
| | |
| |
| |
| | |
PHPBB3-11409
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11538] Add optional switch as argument to hex colour validation
[ticket/11538] Modify test colour values
[ticket/11538] Limit comment in acp_groups to 80 characters per line
[ticket/11538] Move group ID into abstract test class and add more test cases
[ticket/11538] Merge calls to validate_data() in acp_groups
[ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
[ticket/11538] Use abstract class for functional test cases for group colour
[ticket/11538] Add function phpbb_validate_colour for validating colours
[ticket/11538] Make sure regex doesn't allow multiple color values
[ticket/11538] Add tests for acp group manage page
[ticket/11538] Simplify colour value check and remove support for '#'
[ticket/11538] Fix incorrect regex and test for duplicate # in color string
[ticket/11538] Use regex for testing color value and improve tests
[ticket/11538] Make sure group color can't exceed maximum of 6 characters
Conflicts:
phpBB/includes/functions_user.php
phpBB/styles/prosilver/template/ucp_groups_manage.html
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The value of $optional will decide whether an empty string will be
treated as incorrect input or if it is allowed. The optional argument
will default to false and therefore treat an empty string as incorrect
unless explicitly told to not do so.
PHPBB3-11538
|
| | |
| |
| |
| | |
PHPBB3-11538
|
| | |
| |
| |
| | |
PHPBB3-11538
|
| | |
| |
| |
| | |
PHPBB3-11538
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
It will be possible to use this function via the validate_data() function
interface that has already been used previously. Thus, this new function
will extend the capabilities of validate_data() to checking hex color
values.
PHPBB3-11538
|
| | |
| |
| |
| |
| |
| |
| | |
This will now make sure that 'AAFF00' will be matched but strings like
'AAFF00 AABB00' will not.
PHPBB3-11538
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The input length for the hex color is now limited to 6 characters and
the support for colors starting with a '#' has been dropped. The allowed
input length of 7 in prosilver seems to have been a relict from old ages
of phpBB3. In order to have proper support for correct checking of the
colour value, the new code was also ported to the ACP groups manage page.
The tests have been modified to reflect the changes to the behavior of
the color check. Tests for the ACP will follow.
PHPBB3-11538
|
| | |
| |
| |
| |
| |
| |
| |
| | |
The $avatar_errors array needs to be merged into the primary $error array
before the group settings get applied. This is currently not the case.
Functional tests for this will be provided by PR #1401.
PHPBB3-11535
|
| |\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/11358] Removed all trailing white spaces.
[ticket/11358] Fixed the code according to coding guidlines.
|
| | |
| |
| |
| |
| |
| | |
Removed all trailing white spaces with new lines.
PHPBB3-11358
|
| | |
| |
| |
| |
| |
| |
| | |
Added proper indentation and new line after break in switch
statement.
PHPBB3-11358
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
# 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
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
phpBB/install/database_update.php
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10018
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The phpbb_user object might be used for language variables and other
things.
PHPBB3-10018
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
phpBB/config/services.yml
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The $force_all variable was only partially removed and the behavior was
not consistent in all files.
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The avatar manager already handles if avatars are enabled. It should also
handle ignoring the config settings.
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This shouldn't be done in the avatar drivers. We need to force the
display all avatar drivers in the ACP or it won't be possible to enable
avatars after they have been disabled.
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10018
|
