aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11394' into developDavid King2013-03-044-12/+8
|\ | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11394: [ticket/11394] Relax Migration Tools
| * [ticket/11394] Relax Migration ToolsNathaniel Guse2013-03-044-12/+8
| | | | | | | | | | | | | | Do not throw as many exceptions in the migration tools (when something unexpected occurs but can be safely ignored). PHPBB3-11394
* | Merge remote-tracking branch 'EXreaction/ticket/11393' into developDavid King2013-03-043-2/+33
|\ \ | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11393: [ticket/11393] Give more information on database updater
| * | [ticket/11393] Give more information on database updaterNathaniel Guse2013-03-033-2/+33
| |/ | | | | | | PHPBB3-11393
* | Merge remote-tracking branch 'EXreaction/ticket/11395' into developDavid King2013-03-041-2/+2
|\ \ | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11395: [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
| * | [ticket/11395] Prevent acp_modules::get_modules_info from reincluding filesNathaniel Guse2013-03-031-2/+2
| |/ | | | | | | PHPBB3-11395
* | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-0463-1143/+2430
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 ...
| * | [feature/avatars] Update module_auth of ucp module and fix small issuesMarc Alexander2013-03-041-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | Reduced the check effectively_installed() to just checking for the config entry "allow_avatar_gravatar". Also added the missing update of the module_auth of the ucp_profile avatar mode. PHPBB3-10018
| * | [feature/avatars] Add migrations data file for avatarsMarc Alexander2013-03-041-0/+64
| | | | | | | | | | | | | | | | | | | | | The module_auth of the ucp avatar settings are used for checking if the migration has already been installed. PHPBB3-10018
| * | [feature/avatars] Reduce module auth of ucp avatar settingsMarc Alexander2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Previously the avatar types that need to be enabled were hardcoded into the module auth. This is no longer needed in the new avatar system. PHPBB3-10018
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-04183-3618/+12168
| |\ \ | | |/ | | | | | | | | | Conflicts: phpBB/install/database_update.php
| * | [feature/avatars] Auto-clear avatar dimensions when first changing avatarsMarc Alexander2013-02-282-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | In the remote avatar and gravatar the dimension input boxes will now be cleared when changing the avatar. This will only happen once per page-load. Any input after the first change will not trigger this. PHPBB3-10018
| * | [feature/avatars] Use "Main" as category for avatars in root of galleryMarc Alexander2013-02-192-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change the whole avatar gallery path would show as category. Additionally, the avatars that were selected like that had an incorrect path and didn't show up correctly. With this patch it'll display "Main" as category and properly work. PHPBBB3-10018
| * | [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-196-17/+16
| | | | | | | | | | | | PHPBB3-10018
| * | [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-1911-22/+24
| | | | | | | | | | | | | | | | | | | | | The phpbb_user object might be used for language variables and other things. PHPBB3-10018
| * | [feature/avatars] Document the use of the allowed extensions arrayMarc Alexander2013-02-131-1/+6
| | | | | | | | | | | | PHPBB3-10018
| * | [feature/avatars] Use array for allowed extensions and implode if neededMarc Alexander2013-02-074-4/+9
| | | | | | | | | | | | PHPBB3-10018
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-0779-411/+4450
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | [feature/avatars] Use deprecated for compatibility functionMarc Alexander2013-02-031-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved use of global variables inside the only if statement they are used in. PHPBB3-10018
| * | | [feature/avatars] Correct license, copyright and package infoMarc Alexander2013-02-038-22/+22
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Move list of supported formats to avatar driver classMarc Alexander2013-01-254-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the regex and turning it into an array if necessary seemed like the cleanest approach to achieve this. PHPBB3-10018
| * | | [feature/avatars] Add include of functions_display.php in BC functionMarc Alexander2013-01-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The needed function phpbb_get_avatar() is defined in includes/functions_display.php. Include that file in the backwards compatible function get_user_avatar(). PHPBB3-10018
| * | | [feature/avatars] Add note about when compatibility function was addedMarc Alexander2013-01-221-1/+2
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Add compatibility function for get_user_avatar()Marc Alexander2013-01-222-0/+42
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Move definition of driver_collection to avatars.ymlMarc Alexander2013-01-152-7/+7
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Remove the obsolete request argument for avatar driversMarc Alexander2013-01-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should have been removed earlier when the phpbb_request object was dropped from the arguments to the avatar drivers. PHPBB3-10018
| * | | [feature/avatars] Add missing @var to docblocks in avatar managerMarc Alexander2013-01-091-0/+4
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Remove not needed inline styleMarc Alexander2013-01-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Differentiate tests for get drivers functionsMarc Alexander2013-01-082-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | Tests for get_all_drivers() and get_enabled_drivers() should be different. PHPBB3-10018
| * | | [feature/avatars] Strictly check if avatar list is empty and cache resultMarc Alexander2013-01-081-2/+3
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Pass phpbb_user object to prepare_form_acp()Marc Alexander2013-01-085-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The phpbb_user object might be used for language variables. Pass it as a function argument to prepare_form_acp() instead of using globals. PHPBB3-10018
| * | | [feature/avatars] Pass phpbb_user object to get_custom_html()Marc Alexander2013-01-084-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the phpbb_user object to function get_custom_html(). This object is used in that method. Also fixed incorrect arguments to get_custom_html() in phpbb_get_avatar(). PHPBB3-10018
| * | | [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-0712-46/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Use empty() instead of sizeof()Marc Alexander2013-01-072-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Add function for localizing errorsMarc Alexander2013-01-065-58/+35
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Add missing docblocks to avatar managerMarc Alexander2013-01-051-0/+16
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Change avatar javascript to conform to new coding guidelinesMarc Alexander2013-01-043-9/+9
| | | | | | | | | | | | | | | | PHPBB3-10018
| * | | [feature/avatars] Improve handling of incorrect input for avatarsMarc Alexander2013-01-043-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upload avatar driver will now inform the user if insufficient data has been entered for both remote and local avatar uploads. The local avatar driver (gallery avatar) will also inform the user if he didn't select a category and/or file before submitting. PHPBB3-10018
| * | | [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-0410-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0453-288/+731
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_groups.php
| * | | | [feature/avatars] Inform user of no available local avatarsMarc Alexander2013-01-043-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than showing the user an empty drop-down list for the local avatar categories, inform him/her that there are currently no (local) avatars available. PHPBB3-10018
| * | | | [feature/avatars] Let the server handle http or https for gravatarsMarc Alexander2012-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Add missing explanation to docblock of get_all_drivers()Marc Alexander2012-12-271-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-277-28/+28
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | [feature/avatars] Improve testing to also check for enabled driversMarc Alexander2012-12-271-4/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-24144-2298/+4210
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into developMarc Alexander2012-12-2454-1864/+2298
| | |\ \ \ \
| * | | | | | [feature/avatars] Use callback method in avatar manager's clean rowMarc Alexander2012-12-171-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | | | [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-117-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| * | | | | | Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-09173-937/+3807
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 17:02:34 +0000