aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_groups.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11842] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-041-1/+1
| | | | PHPBB3-11842
* Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-211-1/+0
|\ | | | | [ticket/10810] Move color swatches from popup windows to inline blocks.
| * [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-131-1/+0
| | | | | | | | PHPBB3-10810
* | [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-241-1/+1
|/ | | | | | | | | | | 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
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-31/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-261-7/+0
| | | | | | | | PHPBB3-11744
| * [ticket/11744] Group join request notificationNathan Guse2013-07-261-29/+5
| | | | | | | | PHPBB3-11744
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-3/+3
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-2/+2
|/ | | | PHPBB3-11700
* Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error Conflicts: tests/functional/ucp_groups_test.php
| * [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-1/+2
| | | | | | | | | | | | | | | | Up to now the array_map() that turns error messages into the localized output was only ran if the group's color was set. With this patch it'll run the array_map() on the complete error array if it's not empty. 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
* | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
| | | | | | | | | | | | | | Without passing those values, the group is removed from the teampage and the legend while submitting the edit form on the ucp groups manage page. PHPBB3-11587
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-261-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] 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-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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/11538] Fix incorrect regex and test for duplicate # in color stringMarc Alexander2013-05-141-1/+1
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-141-5/+9
| | | | | | | | | | | | | | | | | | We are now using a regex with preg_match() in order to properly check if the entered color value is in hex color format or not. A proper error message is triggered if an incorrect color value is entered and the prepended '#' is removed if necessary. PHPBB3-11538
| * [ticket/11538] Make sure group color can't exceed maximum of 6 charactersMarc Alexander2013-05-141-0/+10
| | | | | | | | | | | | | | In order to prevent future issues with this, a basic set of functional tests for the UCP groups manage page have been added. 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
* | [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-241-2/+1
| | | | | | | | | | | | | | | | This should fix some other bugs that may not have yet been recognized--some areas only set to(), but sent according to user_notify_type, which is not necessarily email. PHPBB3-11454
* | [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
| * | [ticket/9492] Ensure to update all avatar values when the avatar is changedJoas Schilling2013-01-171-1/+1
| | | | | | | | | | | | PHPBB3-9492
* | | [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-13/+1
| | | | | | | | | | | | 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
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-041-4/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_groups.php
| * | [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-091-3/+3
| | | | | | | | | | | | PHPBB3-11259
* | | [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-271-1/+1
| | | | | | | | | | | | PHPBB3-10018
* | | [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-041-2/+2
| | | | | | | | | | | | PHPBB3-10018
* | | [feature/avatars] Fix variable namesMarc Alexander2012-11-301-16/+15
| | | | | | | | | | | | PHPBB3-10018
* | | [feature/avatars] Get list of enabled drivers from avatar managerMarc Alexander2012-11-301-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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-9/+4
| | | | | | | | | | | | PHPBB3-10018
* | | [feature/avatars] Add static methods for handling driver namesMarc Alexander2012-11-251-3/+3
| | | | | | | | | | | | PHPBB3-10018
* | | [feature/avatars] Only create avatar objects if necessaryMarc Alexander2012-11-251-1/+2
| | | | | | | | | | | | PHPBB3-10018
* | | [feature/avatars] Miscellaneous fixesMarc Alexander2012-11-251-1/+1
| | | | | | | | | | | | PHPBB3-10018
* | | [feature/avatars] Remove unnecessary abbreviationsMarc Alexander2012-11-251-8/+8
| | | | | | | | | | | | PHPBB3-10018
* | | [feature/avatars] Add support for modularized avatars to ucp groupsMarc Alexander2012-11-221-93/+91
| | | | | | | | | | | | | | | | | | | | | This seems to be the last component where the new avatars system was still missing. PHPBB3-10018
* | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into ↵Marc Alexander2012-11-121-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Modularized AvatarsCullen Walsh2012-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A modularized avatar system that easily allows plugins to be created for various avatar services, such as Gravatar. This inital commit includes module support and is backwards compatible with 3.0 avatars, but does notcontain ACP or UCP modules for manipulating new avatars. PHPBB3-10018
* | | | [ticket/10939] Modified ucp_groups.php to not use $_FILESFyorl2012-08-151-2/+3
| | | | | | | | | | | | | | | | PHPBB3-10939
* | | | [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-221-2/+3
| |/ / |/| | | | | | | | PHPBB3-10990
* | | [feature/pagination-as-list] New parameter for name of start varDrae2012-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Add a new parameter to hold the name of the start variable. This fulfills ticket PHPBB3-8535. PHPBB3-10968
* | | [feature/pagination-as-list] Updates for nils commentsDrae2012-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | Re-remove deprecated functions, change on_page to phpbb_on_page, add null returns, remove globals and pass as params. PHPBB3-10968
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-06 09:04:20 +0000