aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-092-22/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13052] Use request class instead of $_POST and request_var() [ticket/13052] Fix appearances with multiple parameters [ticket/13052] Remove additional parameter from check_form_key()
| * | | | | | | | | | | | [ticket/13052] Use request class instead of $_POST and request_var()Joas Schilling2014-09-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13052
| * | | | | | | | | | | | [ticket/13052] Fix appearances with multiple parametersJoas Schilling2014-09-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13052
| * | | | | | | | | | | | [ticket/13052] Remove additional parameter from check_form_key()Joas Schilling2014-09-091-17/+9
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13052
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-071-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2925 from nickvergessen/ticket/12983Marc Alexander2014-09-071-6/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
| | * | | | | | | | | | | [ticket/12983] Correctly validate sorting options in the UCPJoas Schilling2014-09-051-6/+18
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12983
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
| * | | | | | | | | | | Merge pull request #2918 from marc1706/ticket/13031Tristan Darricau2014-09-061-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13031] Only use mimetype guesser guess if it helps us * marc1706/ticket/13031: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
| | * | | | | | | | | | | [ticket/13031] Guess with all mimetype guessers and pick best guessMarc Alexander2014-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13031
| | * | | | | | | | | | | [ticket/13031] Only use mimetype guesser guess if it helps usMarc Alexander2014-09-031-1/+6
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we already have a mimetype and the guesser's guess is the default fallback, we should keep the already existing mimetype the browser supplied. Otherwise, platforms that might not support mimetype guessers will cause us to always have the mimetype set to application/octet-stream on images. This will prevent users from uploading images. PHPBB3-13031
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-051-142/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2748 from carlo94it/ticket/12765Marc Alexander2014-09-051-142/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | [ticket/12765] Use db_tools instead of generating queries at moment
| | * | | | | | | | | | [ticket/12765] Execute query directly from db toolsCarlo2014-08-101-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12765
| | * | | | | | | | | | [ticket/12765] Use db_tools instead of generating queries at momentCarlo2014-08-101-142/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12765
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-301-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2826 from brunoais/ticket/12928Marc Alexander2014-08-301-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12928] core.mcp_reports_gather_query_before
| | * | | | | | | | | | | [ticket/12928] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12928
| | * | | | | | | | | | | [ticket/12928] core.mcp_reports_gather_query_beforebrunoais2014-08-081-0/+21
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.mcp_reports_gather_query_before event to mcp backend. PHPBB3-12928
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-297-18/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Dhruv Goel (1) and Marc Alexander (1) * develop-ascraeus: [ticket/12966] Sort by post_time and post_id where applicable [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| * | | | | | | | | | | Merge pull request #2865 from marc1706/ticket/12966Dhruv Goel2014-08-297-18/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| | * | | | | | | | | | | [ticket/12966] Sort by post_time and post_id where applicableMarc Alexander2014-08-237-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was not applied to the search as this would require a larger rewrite of the search methods. PHPBB3-12966
* | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
| * | | | | | | | | | | | [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblockMarc Alexander2014-08-241-1/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13010
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-214-19/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12999] Remove @author tags
| * | | | | | | | | | | Merge pull request #2894 from Nicofuma/ticket/12999Andreas Fischer2014-08-214-19/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12999] Remove @author tags * Nicofuma/ticket/12999: [ticket/12999] Remove @author tags
| | * | | | | | | | | | | [ticket/12999] Remove @author tagsTristan Darricau2014-08-194-19/+0
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12999
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2112-86/+86
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2885 from Nicofuma/ticket/12990Marc Alexander2014-08-2112-86/+86
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12990] Use the full services name for the notification's types
| | * | | | | | | | | | | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12990
| | * | | | | | | | | | | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1612-87/+87
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12990
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | [ticket/12998] Fix use of $lang in mcp_warn.phpTristan Darricau2014-08-191-2/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12998
* | | | | | | | | | | [ticket/12974] Update nightly build version to 3.2.0-a1-devJoas Schilling2014-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12974
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 Conflicts: phpBB/styles/subsilver2/style.cfg
| * | | | | | | | | | [prep-release-3.1.0-RC3] Update phpBB Version for RC4 developmentJoas Schilling2014-08-121-1/+1
| | | | | | | | | | |
| * | | | | | | | | | [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3Joas Schilling2014-08-111-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-114-77/+84
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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 Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html
| * | | | | | | | | | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-114-77/+84
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-074-77/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-1115-6000/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | | | | | | | | | Merge pull request #2842 from Nicofuma/ticket/11854Marc Alexander2014-08-1115-6000/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11854] Move captchas to phpbb/ and use DI for plugins
| | * | | | | | | | | | | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-115-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854
| | * | | | | | | | | | | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-1115-6000/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854
* | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #2845 from rxu/ticket/12942Marc Alexander2014-08-111-1/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12942] Add core.add_form_key core event
| | * | | | | | | | | | | | [ticket/12942] Add core.add_form_key core eventrxu2014-08-111-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.add_form_key core event to allow extensions modifying form key. PHPBB3-12942
* | | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #2867 from prototech/ticket/12967Marc Alexander2014-08-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12967] Fix undefined variable phpbb_dispatcher error.
| | * | | | | | | | | | | | | [ticket/12967] Fix undefined variable phpbb_dispatcher error.Cesar G2014-08-111-0/+1
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12967
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 09:17:54 +0000