aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/avatar
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3064 from marc1706/ticket/13197Joas Schilling2014-11-211-8/+32
|\ | | | | | | [ticket/13197] Also delete group avatar from users that have it set
| * [ticket/13197] Fix tabbingMarc Alexander2014-11-091-4/+4
| | | | | | | | PHPBB3-13197
| * [ticket/13197] Correctly format sql queryMarc Alexander2014-11-091-2/+2
| | | | | | | | PHPBB3-13197
| * [ticket/13197] Also delete group avatar from users that have it setMarc Alexander2014-10-251-7/+31
| | | | | | | | PHPBB3-13197
* | Merge branch 'naderman-ticket/13232' into prep-release-3.1.0Joas Schilling2014-10-281-2/+2
|\ \
| * | [ticket/13232] Fix more issues with TTL and global cache fileJoas Schilling2014-10-281-2/+2
| |/ | | | | | | PHPBB3-13232
* | [ticket/13227] Properly handle curlwrapper headers in remote avatarsNils Adermann2014-10-271-1/+17
|/ | | | | | | Read a bit of the file to ensure header values are populated and then handle headers in the nested array structure too. PHPBB3-13227
* Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-115-4/+44
|\ | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| * [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-072-2/+39
| | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
| * [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-073-2/+5
| | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822
* | [ticket/12941] Fix remaining Sami complaints.Andreas Fischer2014-08-091-1/+0
|/ | | | PHPBB3-12941
* [ticket/11148] Use mimetype guesser for uploaded avatarsMarc Alexander2014-06-231-2/+28
| | | | PHPBB3-11148
* [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacyTristan Darricau2014-06-161-1/+1
| | | | PHPBB3-12721
* [ticket/12715] Cleanup comments in \phpbb\avatar\driver\*Tristan Darricau2014-06-155-26/+27
| | | | PHPBB3-12715
* Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into ↵Nils Adermann2014-06-091-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/10073: (36 commits) [ticket/10073] Fix button descriptions [ticket/10073] Do not check disable boxes by default [ticket/10073] Store values with config_text in the ACP [ticket/10073] Move config values to config_text [ticket/10073] Fix request usage [ticket/10073] Deduplicate template variable names [ticket/10073] Get service from container [ticket/10073] Fix more "Contact Us" strings [ticket/10073] Move template code into the template [ticket/10073] Make contact page available when board is disabled [ticket/10073] Change name of the ACP module [ticket/10073] Deduplicate posting buttons code in ACP [ticket/10073] Use phpbb_validate_email to verify email address [ticket/10073] Add tests for new validate_email() [ticket/10073] Split email validation from email ban and taken checks [ticket/10073] Deduplicate the if statement [ticket/10073] Fallback to board_contact when contact page is disabled [ticket/10073] Remove language string from rebase conflict [ticket/10073] Add ACP module to add bbcode text for contact admin info [ticket/10073] Add new configs to the schema ...
| * [ticket/10073] Split email validation from email ban and taken checksJoas Schilling2014-05-291-1/+2
| | | | | | | | PHPBB3-10073
* | [ticket/12666] Use "None" for images in root of gallery avatar pathMarc Alexander2014-06-051-3/+3
| | | | | | | | | | | | | | "None" serves no real purpose right now. After this it will be used instead of "Main" for images in the root of the gallery avatar path. PHPBB3-12666
* | [ticket/12457] Default to first category if none is selected in gallery avatarMarc Alexander2014-06-031-1/+1
|/ | | | | | | If any category exists, the key() function should always return the first key of the $avatar_list array. PHPBB3-12457
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-277-30/+49
| | | | PHPBB3-12594
* Merge branch 'ticket/8960-olympus' into ticket/8960Marc Alexander2014-04-161-1/+1
| | | | | Conflicts: phpBB/includes/acp/acp_board.php
* [ticket/11859] Make avatar drivers return template filenameMarc Alexander2013-11-275-11/+32
| | | | | | | | The service name might not follow the expected naming scheme which would cause abnormally long filenames and confusion for authors that might add more avatar drivers. PHPBB3-11859
* Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-131-20/+18
|\ | | | | [ticket/11525] Only remove group or user prefix from given avatar data
| * [ticket/11525] Use foreach instead of array_walk in method clean_row()Marc Alexander2013-11-131-23/+9
| | | | | | | | | | | | | | | | This approach is cleaner and probably even faster the previous ways that included using array_walk() or array_map() and other helper functions and methods. PHPBB3-11525
| * [ticket/11525] Prefix id parameter with 'g' again when its a group avatarJoas Schilling2013-11-101-3/+10
| | | | | | | | PHPBB3-11525
| * [ticket/11525] Fix doc blocksJoas Schilling2013-11-101-4/+7
| | | | | | | | PHPBB3-11525
| * [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-241-6/+8
| | | | | | | | | | | | | | | | | | | | | | 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 pull request #1819 from marc1706/ticket/11534Nathan Guse2013-11-041-0/+31
|\ \ | | | | | | [ticket/11534] Check remote avatar content type if possible
| * | [ticket/11534] Check remote avatar content type if possibleMarc Alexander2013-10-241-0/+31
| |/ | | | | | | | | | | | | This should make sure that error pages like 404 or 503 pages are not treated as remote avatar images. PHPBB3-11534
* | [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.Andreas Fischer2013-10-307-56/+0
| | | | | | | | PHPBB3-11980
* | [ticket/11857] Use passed service collection instead of container in managerMarc Alexander2013-10-271-11/+19
|/ | | | | | | | The service collection that was already passed to the avatar manager should be used in the avatar manager method get_driver() instead of the container itself. PHPBB3-11857
* [ticket/11930] Update docblock of avatar driver constructorMarc Alexander2013-10-211-0/+1
| | | | PHPBB3-11930
* [ticket/11930] Modify order of properties to fit constructor methodMarc Alexander2013-10-211-7/+7
| | | | PHPBB3-11930
* [ticket/11930] Move path_helper in front of optional cache argumentMarc Alexander2013-10-211-1/+1
| | | | | | Optional method arguments should be after any mandatory ones. PHPBB3-11930
* [ticket/11930] Use \phpbb\path_helper for avatar URLsMarc Alexander2013-10-173-3/+10
| | | | | | | This will ensure that avatars still properly display on extension pages supplied via app.php. PHPBB3-11930
* [ticket/11700] Correctly load avatar templates for namespaced driversNils Adermann2013-09-192-2/+2
| | | | PHPBB3-11700
* [ticket/11700] Correctly handle avatar drivers with namespacesNils Adermann2013-09-191-3/+3
| | | | PHPBB3-11700
* [ticket/11700] Use underscores in avatar driver template file namesNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Load avatar explanations correctly from namespacesNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Correctly generate lang key from avatar driver classNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/11706] Use @ to suppress errors for getimagesize in remote avatarMarc Alexander2013-07-141-1/+1
| | | | | | | | PHPBB3-11706
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-167-37/+51
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-4/+4
| | | | | | | | PHPBB3-11700
* | [ticket/11700] With namespaces interface will no longer be a valid classnameNils Adermann2013-07-141-1/+1
|/ | | | PHPBB3-11700
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-147-0/+1281
PHPBB3-11698