aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-210-0/+0
|\ | | | | | | | | | | * develop-olympus: [ticket/13531] Send 404 Not Found. [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
| * Merge pull request #3316 from bantu/ticket/13531Nils Adermann2015-01-212-0/+103
| |\ | | | | | | [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
| | * [ticket/13531] Send 404 Not Found.Andreas Fischer2015-01-211-1/+15
| | | | | | | | | | | | PHPBB3-13531
| | * [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).Marc Alexander2015-01-212-0/+89
| |/ | | | | | | PHPBB3-13531
* | Merge pull request #3314 from VSEphpbb/ticket/13133Tristan Darricau2015-01-201-4/+4
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13133] Fix variable name in set_custom_style() * VSEphpbb/ticket/13133: [ticket/13133] Fix variable name in set_custom_style()
| * | [ticket/13133] Fix variable name in set_custom_style()Matt Friedman2015-01-201-4/+4
| | | | | | | | | | | | PHPBB3-13133
* | | Merge pull request #3315 from nickvergessen/ticket/13530Tristan Darricau2015-01-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13530] Fix undefined variables * nickvergessen/ticket/13530: [ticket/13530] Fix undefined variables
| * | | [ticket/13530] Fix undefined variablesJoas Schilling2015-01-202-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13530
* | | | Merge pull request #3313 from nickvergessen/ticket/13528Tristan Darricau2015-01-201-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | [ticket/13528] Return correct translation instead of is_set() * nickvergessen/ticket/13528: [ticket/13528] Return correct translation instead of is_set()
| * | | [ticket/13528] Return correct translation instead of is_set()Joas Schilling2015-01-201-1/+1
| |/ / | | | | | | | | | PHPBB3-13528
* | | Merge pull request #3293 from Nicofuma/ticket/13489Joas Schilling2015-01-2012-32/+155
|\ \ \ | | | | | | | | | | | | [ticket/13489] Disable the event dispatcher in the migrator
| * | | [ticket/13489] Fix service configurationTristan Darricau2015-01-206-50/+45
| | | | | | | | | | | | | | | | PHPBB3-13489
| * | | [ticket/13489] Update migrationsTristan Darricau2015-01-143-20/+57
| | | | | | | | | | | | | | | | PHPBB3-13489
| * | | [ticket/13489] Fix testsTristan Darricau2015-01-143-5/+11
| | | | | | | | | | | | | | | | PHPBB3-13489
| * | | [ticket/13489] Disable the event dispatcher in the migratorTristan Darricau2015-01-143-6/+91
| | | | | | | | | | | | | | | | PHPBB3-13489
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-200-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables. Conflicts: phpBB/includes/acp/acp_update.php
| * | | Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-4/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13527] Escape information received from version server * bantu/ticket/13527: [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables.
| | * | | [ticket/13527] Apply htmlspecialchars() to data from version server.Andreas Fischer2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13527
| | * | | [ticket/13527] Remove two unused variables.Andreas Fischer2015-01-201-3/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13527
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-200-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/13526] Correctly validate the ucp_pm_options form key.
| * | | | Merge pull request #3311 from bantu/ticket/13526Andreas Fischer2015-01-201-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13526] Correctly validate the ucp_pm_options form key. * bantu/ticket/13526: [ticket/13526] Correctly validate the ucp_pm_options form key.
| | * | | | [ticket/13526] Correctly validate the ucp_pm_options form key.Joas Schilling2015-01-201-1/+5
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13526
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/13519] Correctly validate imagick path as path and not string Conflicts: phpBB/includes/acp/acp_attachments.php
| * | | Merge pull request #3306 from marc1706/ticket/13519Andreas Fischer2015-01-201-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | [ticket/13519] Correctly validate imagick path as path and not string * marc1706/ticket/13519: [ticket/13519] Correctly validate imagick path as path and not string
| | * | [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13519
* | | | Merge pull request #3138 from prototech/ticket/12642Joas Schilling2015-01-201-19/+19
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/12642] Ensure CPF type specific options are set when editing booleans.
| * | | | [ticket/12642] Ensure CPF type specific options are set when editing booleans.Cesar G2014-11-111-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepare_hidden_fields is expected to return null if the option is not sent in the request. The boolean method returns false instead, which results in the options being set as false in hidden fields when accessing the first edit step. When checking the "Default value" option, there is also a failure to check whether the "Field type" option is set to checkbox, thus resulting in this option getting lost as well. PHPBB3-12642
* | | | | Merge pull request #3226 from prototech/ticket/13420Joas Schilling2015-01-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
| * | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.Cesar G2014-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13420
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2015-01-200-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Conflicts: .travis.yml
| * | | | | Merge pull request #3310 from bantu/ticket/13523Joas Schilling2015-01-202-2/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13523] Install PHPUnit manually instead of from PEAR.
| | * | | | | [ticket/13523] Install PHPUnit manually instead of from PEAR.Andreas Fischer2015-01-202-2/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pear.phpunit.de channel has been shut down in 2014. PHPBB3-13523
* | | | | | Merge pull request #3278 from rxu/ticket/13492Joas Schilling2015-01-202-1/+73
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13492] Fix IDN support for custom BBCode URL tokens
| * | | | | | [ticket/13492] Add the migration to update custom bbcodes with IDN regexpsrxu2015-01-202-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the $utf8 checking regexp removing the curly braces. PHPBB3-13492
| * | | | | | [ticket/13492] Add IDN support for custom BBCode URL tokensrxu2015-01-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom BBCode URL tokens does not support IDN. Custom BBCodes added earlier than IDN has been applied are unaffected. PHPBB3-13492
* | | | | | | Merge pull request #3308 from nickvergessen/ticket/13504Andreas Fischer2015-01-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13504] Fix invalid variable $user * nickvergessen/ticket/13504: [ticket/13504] Fix invalid variable $user
| * | | | | | | [ticket/13504] Fix invalid variable $userJoas Schilling2015-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13504
* | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10985] Add fix to properly inherit style during update process Conflicts: phpBB/includes/bbcode.php
| * | | | | | Merge pull request #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | [ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
| | * | | | | [ticket/10985] Add fix to properly inherit style during update processJakub Senko2014-09-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10985
* | | | | | | Merge pull request #3296 from PayBas/ticket/13431Joas Schilling2015-01-191-28/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13431] Fix responsive RTL media queries for <IE11
| * | | | | | | [ticket/13431] Fix responsive RTL media queries for <IE11PayBas2015-01-161-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13431
* | | | | | | | Merge pull request #3294 from PayBas/ticket/13507Joas Schilling2015-01-191-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13507] Fix horizontal scrollbar for large images in posts
| * | | | | | | | [ticket/13507] Fix horizontal scrollbar for large images in postsPayBas2015-01-161-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13507
* | | | | | | | Merge pull request #3055 from marc1706/ticket/13192Tristan Darricau2015-01-193-23/+63
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13192] Add method for generating valid user page links based on mod_rewrite * marc1706/ticket/13192: [ticket/13192] Add test for app.php in external subfolder [ticket/13192] Use ltrim() instead of preg_replace() [ticket/13192] Order test cases consistently [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root [ticket/13192] Pass correct parameters and rename method to get_valid_page [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals [ticket/13192] Use get_valid_user_page method in build_url function [ticket/13192] Add method for generating valid user page links
| * | | | | | | | [ticket/13192] Add test for app.php in external subfolderMarc Alexander2015-01-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| * | | | | | | | [ticket/13192] Use ltrim() instead of preg_replace()Marc Alexander2015-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| * | | | | | | | [ticket/13192] Order test cases consistentlyMarc Alexander2015-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| * | | | | | | | [ticket/13192] Remove app.php on mod rewrite even if app.php is outside rootMarc Alexander2015-01-042-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| * | | | | | | | [ticket/13192] Pass correct parameters and rename method to get_valid_pageMarc Alexander2014-10-213-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 13:14:22 +0000