aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * Merge remote-tracking branch 'erikfrerejean/ticket/11283' into developAndreas Fischer2013-01-031-1/+1
| |\ | | | | | | | | | | | | * erikfrerejean/ticket/11283: [ticket/11283] Extension manager follow symlinks.
| | * [ticket/11283] Extension manager follow symlinks.Erik FreĢ€rejean2012-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All extensions are located in the `phpBB/ext` directory, however the `phpbb_extension_manager::all_available()` method only looks into actual directories and ignores symlinks. Add the `RecursiveDirectoryIterator::FOLLOW_SYMLINKS` flag to the `new RecursiveDirectoryIterator` call so that you can store extensions in a different location and use symlinks so that phpBB can recognise them. PHPBB3-11283
| * | Merge PR #1153 branch 'marc1706/ticket/10805' into developOleg Pudeyev2013-01-021-1/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/10805: [ticket/10805] Compare phpbbAlertTimer against null [ticket/10805] Clear loading alert timeout after ajax request finished
| | * | [ticket/10805] Compare phpbbAlertTimer against nullMarc Alexander2013-01-021-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10805
| | * | [ticket/10805] Clear loading alert timeout after ajax request finishedMarc Alexander2013-01-011-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout for the "request timed out" popup should be cleared if it finished. Since it is currently not cleared, the timeout alert appears as an extra overlay if another ajaxified function is ran within 5 seconds of the initial function call. This patch will take care of clearing the timeout if either the success (function return_handler()) or error (function error_handler()) functions are called. PHPBB3-10805
| * | | Merge PR #1176 branch 'marc1706/ticket/11302' into developOleg Pudeyev2013-01-022-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/11302: [ticket/11302] Correctly select first timezone or selected timezone
| | * | | [ticket/11302] Correctly select first timezone or selected timezoneMarc Alexander2013-01-022-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While registering, we should default to a given timezone. By selecting the first timezone by default, this is fulfilled. This doesn't happen currently, as only the "Select a timezone" selection appears. If a user selects a timezone during the registration process we should also make sure that the selected element is still selected; even if we have to return to the registration page, i.e. if there was an error while submitting the form. This is currently not the case. With this patch the javascript code will behave correctly. Additionally, a duplicate inclusion of timezone.js has been removed as it was not needed. PHPBB3-11302
| * | | Merge remote-tracking branch 'p/ticket/11305' into developIgor Wiedler2013-01-0220-87/+163
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11305: [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. [ticket/11305] Extract hook finder from cache service.
| | * | | [ticket/11305] Mock container for cache driver in functional create_user()Igor Wiedler2013-01-021-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create_user has calls to fetch the cache driver from the container. This PR mocks the container and returns a null cache driver in that case. PHPBB3-11305
| | * | | [ticket/11305] Check for $cache being null before using it in db drivers.Oleg Pudeyev2013-01-0210-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason why db drivers must have a cache to work. They query the database, that part works without caches. PHPBB3-11305
| | * | | [ticket/11305] Define hook finder as a service on the container.Oleg Pudeyev2013-01-024-3/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-11305
| | * | | [ticket/11305] Adjust comment.Oleg Pudeyev2013-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11305
| | * | | [ticket/11305] Use phpbb_create_default_container.Oleg Pudeyev2013-01-021-12/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11305
| | * | | [ticket/11305] Create a normal container during final installation step.Oleg Pudeyev2013-01-022-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The final step calls a bunch of code which expects a full phpBB runtime environment. Also, by this step everything should be configured and database schema set up. Therefore, in the final step replace installer container with a normal phpBB container. PHPBB3-11305
| | * | | [ticket/11305] Retrieve cache driver from container rather than cache service.Oleg Pudeyev2013-01-024-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only covers some of the call sites. PHPBB3-11305
| | * | | [ticket/11305] Extract hook finder from cache service.Oleg Pudeyev2013-01-025-33/+90
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Unlike most other things in cache service, hook finder does not need a database connection. PHPBB3-11305
| * | | Merge PR #1175 branch 'igorw/ticket/11306' into developOleg Pudeyev2013-01-024-36/+60
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Igor Wiedler # Via Igor Wiedler * igorw/ticket/11306: [ticket/11306] Add docblocks to all container related functions [ticket/11306] Introduce phpbb_create_default_container
| | * | | [ticket/11306] Add docblocks to all container related functionsIgor Wiedler2013-01-021-0/+41
| | | | | | | | | | | | | | | | | | | | PHPBB3-11306
| | * | | [ticket/11306] Introduce phpbb_create_default_containerIgor Wiedler2013-01-024-36/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Extracts default container construction to factory function, removing boilerplate duplication for container construction. PHPBB3-11306
| * | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-314-46/+77
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11037: [ticket/11037] Fix unit tests. [ticket/11037] Update services.yml. [ticket/11037] Add/update docblocks. [ticket/11037] Eliminate globals from cache service.
| | * | | [ticket/11037] Fix unit tests.Oleg Pudeyev2012-12-292-4/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11037
| | * | | [ticket/11037] Update services.yml.Oleg Pudeyev2012-12-261-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11037
| | * | | [ticket/11037] Add/update docblocks.Oleg Pudeyev2012-12-261-0/+33
| | | | | | | | | | | | | | | | | | | | PHPBB3-11037
| | * | | [ticket/11037] Eliminate globals from cache service.Oleg Pudeyev2012-12-241-42/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-11037
| * | | | Merge remote-tracking branch 'p/ticket/11188' into developAndreas Fischer2012-12-311-5/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11188: [ticket/11188] Reduce waste. [ticket/11188] add result count query for author search [ticket/11188] add count query to postgres search
| | * | | | [ticket/11188] Reduce waste.Oleg Pudeyev2012-12-301-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
| | * | | | [ticket/11188] add result count query for author searchDhruv2012-12-301-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
| | * | | | [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-311-0/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/11293] Add a note that mysqli should be in front of mysql.
| | * | | | Merge remote-tracking branch 'p/ticket/11293' into develop-olympusAndreas Fischer2012-12-311-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11293: [ticket/11293] Add a note that mysqli should be in front of mysql.
| | | * | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if both are available. PHPBB3-11293
| * | | | | | Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-2919-49/+63
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11259: [ticket/11259] htmlspecialchars($phpbb_admin_path) [ticket/11259] adm_relative_path -> phpbb_adm_relative_path [ticket/11259] Also make adm_relative_path available in the container [ticket/11259] Make phpbb_admin_path available everywhere Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | * | | | | | [ticket/11259] htmlspecialchars($phpbb_admin_path)Nathan Guse2012-12-105-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11259
| | * | | | | | [ticket/11259] adm_relative_path -> phpbb_adm_relative_pathNathan Guse2012-12-096-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can assume they properly format their config settings, right? PHPBB3-11259
| | * | | | | | [ticket/11259] Also make adm_relative_path available in the containerNathan Guse2012-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11259
| | * | | | | | [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-0916-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11259
| * | | | | | | Merge PR #1162 branch 'develop-olympus' into developOleg Pudeyev2012-12-291-9/+33
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11291] phing: Also add checkreturn="true" to composer execution. [ticket/11291] phing: Add checkreturn="true" to all new commands. [ticket/11291] phing: Exclude vendor folder from diffs. [ticket/11291] phing packaging: Export composer.phar and install dependencies. [ticket/11291] phing: Remove no longer needed create-package target. [ticket/11291] phing: The package target does not depend on composer. [ticket/11291] phing: Adjust directory format of composer exec. [ticket/11291] phing: Add description for composer target. [ticket/11291] phing: Add --dev to composer install. [ticket/11291] phing: Correct dependencies of composer target. [ticket/11291] phing: Make sure composer is available before calling it.
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-21 05:35:00 +0000