aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_groups.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-6/+6
| | | | PHPBB3-11700
* Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
|\ | | | | | | | | | | | | | | | | * 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
| * [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-121-1/+2
| | | | | | | | | | | | | | | | 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
* | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-111-1/+1
| | | | | | | | | | | | | | The avatar manager's method localize_errors() shouldn't be called if avatars are disabled in the config. PHPBB3-11602
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-0/+10
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10840] Add check_form_key to acp_groups.php
| * [ticket/10840] Add check_form_key to acp_groups.phpJoas Schilling2013-06-031-0/+10
| | | | | | | | PHPBB3-10840
* | [ticket/11409] Add success message after updating group position settingsOliver Schramm2013-05-311-0/+2
| | | | | | | | PHPBB3-11409
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-261-5/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-191-1/+1
| | | | | | | | | | | | | | | | | | 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
| * [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Merge calls to validate_data() in acp_groupsMarc Alexander2013-05-191-11/+12
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colourMarc Alexander2013-05-191-1/+1
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | 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
| * [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-151-1/+1
| | | | | | | | | | | | | | This will now make sure that 'AAFF00' will be matched but strings like 'AAFF00 AABB00' will not. PHPBB3-11538
| * [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | [ticket/11535] Correctly merge avatar_errors array into primary error arrayMarc Alexander2013-05-131-2/+8
| | | | | | | | | | | | | | | | 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
* | Merge branch 'develop-olympus' into developNils Adermann2013-04-121-41/+42
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/11358] Removed all trailing white spaces. [ticket/11358] Fixed the code according to coding guidlines.
| * [ticket/11358] Removed all trailing white spaces.erangamapa2013-04-121-4/+4
| | | | | | | | | | | | Removed all trailing white spaces with new lines. PHPBB3-11358
| * [ticket/11358] Fixed the code according to coding guidlines.erangamapa2013-04-121-42/+43
| | | | | | | | | | | | | | Added proper indentation and new line after break in switch statement. PHPBB3-11358
* | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-041-85/+70
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 ...
| * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-041-18/+36
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| * | | [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-191-4/+3
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The phpbb_user object might be used for language variables and other things. PHPBB3-10018
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-071-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | | [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [feature/avatars] Add function for localizing errorsMarc Alexander2013-01-061-16/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Fix behavior of avatar manager and variablesMarc Alexander2012-12-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $force_all variable was only partially removed and the behavior was not consistent in all files. PHPBB3-10018
| * | | | [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Fix variable namesMarc Alexander2012-11-301-13/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Let avatar manager handle $ignore_configMarc Alexander2012-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The avatar manager already handles if avatars are enabled. It should also handle ignoring the config settings. PHPBB3-10018
| * | | | [feature/avatars] Get list of enabled drivers from avatar managerMarc Alexander2012-11-301-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [feature/avatars] Implement better treatment of avatar errorsMarc Alexander2012-11-251-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Small cosmetic changesMarc Alexander2012-11-251-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Add static methods for handling driver namesMarc Alexander2012-11-251-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Small fixesMarc Alexander2012-11-251-7/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Only create avatar objects if necessaryMarc Alexander2012-11-251-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Miscellaneous fixesMarc Alexander2012-11-251-6/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Remove unnecessary abbreviationsMarc Alexander2012-11-251-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Handle deletion of avatarsMarc Alexander2012-11-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this wasn't handled correctly if at all. PHPBB3-10018
| * | | | [feature/avatars] Fix acp front-end of user and group avatarsMarc Alexander2012-11-171-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the changes to the avatar manager etc. these had to be updated. PHPBB3-10018
| * | | | [feature/avatars] Fix coding guidelines infractionsMarc Alexander2012-11-121-1/+2
| | | | |
| * | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into ↵Marc Alexander2012-11-121-90/+90
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/avatars Conflicts: phpBB/adm/style/acp_groups.html phpBB/adm/style/acp_users_avatar.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_display.php phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/styles/prosilver/template/ucp_avatar_options.html
| | * \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-211-2/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| | * | | | | [feature/avatars] Simplify clean_row, move it to avatar managerIgor Wiedler2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | | | [feature/avatars] Introduce an avatar driver interfaceIgor Wiedler2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | | | [feature/avatars] Introduce global phpbb_avatar_managerIgor Wiedler2012-04-081-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | | | [feature/avatars] Use request object in avatar driversIgor Wiedler2012-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-31 06:33:42 +0000