aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-1/+1
|\
| * Merge pull request #3154 from cyberalien/ticket/13349Marc Alexander2014-11-181-1/+1
| |\ | | | | | | | | | [ticket/13349] Fix breadcrumb arrow entity
| | * [ticket/13349] Fix breadcrumb arrow entitycyberalien2014-11-181-1/+1
| | | | | | | | | | | | PHPBB3-13349
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-0/+2
|\ \ \ | |/ /
| * | Merge pull request #3151 from nickvergessen/ticket/13298Marc Alexander2014-11-181-0/+2
| |\ \ | | | | | | | | | | | | [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php
| | * | [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.phpJoas Schilling2014-11-171-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13298
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-1/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3152 from prototech/ticket/13277Marc Alexander2014-11-181-1/+2
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/13277] Force IE to not cache AJAX requests.
| | * | [ticket/13277] Force IE to not cache AJAX requests.Cesar G2014-11-181-1/+2
| | |/ | | | | | | | | | | | | | | | | | | Caching causes problems, such as the inability to move a forum/CPF/module in the same direction by more than one row. PHPBB3-13277
* | | Merge branch 'develop-ascraeus' into developCesar G2014-11-182-0/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13023] Add template event posting_editor_buttons_custom_tags_before Conflicts: phpBB/styles/subsilver2/template/posting_buttons.html
| * | Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeusCesar G2014-11-183-11/+19
| |\ \ | | |/ | |/| | | | | | | * Nicofuma/ticket/13023: [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
| | * [ticket/13023] Add template event posting_editor_buttons_custom_tags_beforeTristan Darricau2014-11-163-11/+19
| | | | | | | | | | | | PHPBB3-13023
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-1715-14/+24
|\ \ \ | |/ /
| * | Merge pull request #3145 from bantu/ticket/13338Joas Schilling2014-11-1715-14/+24
| |\ \ | | | | | | | | | | | | [ticket/13338] Make all tests run on their own. Avoid _test suffix for abstract test case classes.
| | * | [ticket/13338] Add include statements for dependencies.Andreas Fischer2014-11-176-0/+8
| | | | | | | | | | | | | | | | PHPBB3-13338
| | * | [ticket/13338] Do not use the _test.php suffix for abstract test case classes.Andreas Fischer2014-11-178-14/+14
| | | | | | | | | | | | | | | | PHPBB3-13338
| | * | [ticket/13338] Move insert_config_array_test to functions_acp, add deps.Andreas Fischer2014-11-171-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13338
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-171-6/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-170-0/+0
| |\ \ \
| | * \ \ Merge pull request #3146 from bantu/ticket/13341Joas Schilling2014-11-171-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/13341] Change coverage to whitelist to prevent errors with temp ...
| * | \ \ \ Merge pull request #3147 from bantu/ticket/13341-ascraeusJoas Schilling2014-11-171-6/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/13341] Change coverage to whitelist to prevent errors with temp files
| | * | | | Merge pull request #3146 from bantu/ticket/13341Andreas Fischer2014-11-141-6/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13341] Change coverage to whitelist to prevent errors with temp ... * bantu/ticket/13341: [ticket/13341] Change coverage to whitelist to prevent errors with temp files. Conflicts: phpunit.xml.dist
| | | * | | [ticket/13341] Change coverage to whitelist to prevent errors with temp files.Andreas Fischer2014-11-141-3/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4f95deefc9d456c5a2d0f6338f6dcecc0829652 suggests that this can lead to issues with classes having the same name. However, this does not seem to be a problem with the current version of PHPUnit we are using. Despite https://phpunit.de/manual/4.1/en/code-coverage-analysis.html saying that addUncoveredFilesFromWhitelist="true" is optional, this seems to be on by default in PHPUnit 4.1.0. As a result, all files are considered for code coverage; which is what we want. processUncoveredFilesFromWhitelist is however false (by default) and as such even files that are considered for code coverage are not processed through PHP when not used in actual tests. Since it is already impossible to test multiple classes with the same name in the same test run (without process isolation), because that would already lead to "cannot redeclare class" errors, it is also impossible for "cannot redeclare class" errors to happen in test coverage. PHPBB3-13341
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-1616-147/+164
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13280] Output escaping for the symfony request object [ticket/13280] Add new tests [ticket/13280] Make the tests failing [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
| * | | | Merge remote-tracking branch 'github-nicofuma/ticket/13280' into ↵Nils Adermann2014-11-1616-147/+164
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nicofuma/ticket/13280: [ticket/13280] Output escaping for the symfony request object [ticket/13280] Add new tests [ticket/13280] Make the tests failing [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
| | * | | | [ticket/13280] Output escaping for the symfony request objectTristan Darricau2014-11-1612-56/+116
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13280
| | * | | | [ticket/13280] Add new testsTristan Darricau2014-11-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13280
| | * | | | [ticket/13280] Make the tests failingTristan Darricau2014-11-124-100/+78
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13280
| | * | | | [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"Tristan Darricau2014-11-124-38/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb. PHPBB3-13280
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-162-4/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13332] Fix auth provider tests [ticket/13332] Remove useless $result assignment [ticket/13332] Pass user row to passwords manager check method
| * | | | | Merge pull request #3136 from marc1706/ticket/13332Tristan Darricau2014-11-162-4/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13332] Pass user row to passwords manager check method * marc1706/ticket/13332: [ticket/13332] Fix auth provider tests [ticket/13332] Remove useless $result assignment [ticket/13332] Pass user row to passwords manager check method
| | * | | | [ticket/13332] Fix auth provider testsMarc Alexander2014-11-121-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13332
| | * | | | [ticket/13332] Remove useless $result assignmentMarc Alexander2014-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13332
| | * | | | [ticket/13332] Pass user row to passwords manager check methodMarc Alexander2014-11-111-2/+2
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13332
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-133-5/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3141 from bantu/ticket/13325Marc Alexander2014-11-133-5/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13325] Make installing composer dependencies in tests folder optional.
| | * | | | [ticket/13325] Make installing composer dependencies in tests folder optional.Andreas Fischer2014-11-122-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19 here. Remove __init__ include. Composer classmap autoloading ensures classes can be loaded. PHPBB3-13325
| | * | | | [ticket/13325] Remove whitespace at end of line.Andreas Fischer2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13325
| | * | | | [ticket/13325] Update / Fix composer.lock hash.Andreas Fischer2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13325
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3125 from lavigor/ticket/13318Marc Alexander2014-11-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13318] login_username needs to have the multibyte parameter set to true
| | * | | | | [ticket/13318] login_username needs to have the multibyte parameter set to truelavigor2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for usernames with UTF-8 characters. PHPBB3-13318
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-132-2/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3137 from prototech/ticket/13209Marc Alexander2014-11-132-2/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13209] Fix loss of CPF language field values when switching steps
| | * | | | | | [ticket/13209] Gather language field values for boolean CPF's in all steps.Cesar G2014-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user can move back and forth between all three steps and as such the lang field data should be expected in all steps. PHPBB3-13209
| | * | | | | | [ticket/13209] Fix expected request value of CPF language fields.Cesar G2014-11-111-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple languages can be edited, thus the expected value is an array. PHPBB3-13209
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-125-36/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-120-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge pull request #3142 from bantu/ticket/13331Joas Schilling2014-11-124-42/+69
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches
| * | \ \ \ \ \ \ Merge pull request #3143 from bantu/ticket/13331-ascraeusJoas Schilling2014-11-125-36/+39
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 17:04:21 +0000