aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12620] Rename productive to productionTristan Darricau2014-11-204-3/+3
| | | | PHPBB3-12620
* [ticket/12620] Fix functional testsTristan Darricau2014-11-202-0/+2
| | | | PHPBB3-12620
* [ticket/12620] Improve error messageTristan Darricau2014-11-201-1/+1
| | | | PHPBB3-12620
* [ticket/12620] Rename debug to developmentTristan Darricau2014-11-202-1/+1
| | | | PHPBB3-12620
* [ticket/12620] Display error message when the environment isn't availableTristan Darricau2014-11-204-3/+22
| | | | PHPBB3-12620
* [ticket/12620] Allow the user to define multiples environmentsTristan Darricau2014-11-2021-18/+27
| | | | PHPBB3-12620
* [ticket/13063] Fix functional tests errorsTristan Darricau2014-11-201-1/+0
| | | | PHPBB3-13063
* [ticket/13063] Fix coding styleTristan Darricau2014-11-201-5/+4
| | | | PHPBB3-13063
* [ticket/13063] Fix tests after rebaseTristan Darricau2014-11-201-2/+1
| | | | PHPBB3-13063
* [ticket/13063] Remove kernel_request_subscriber service definitionTristan Darricau2014-11-201-9/+0
| | | | PHPBB3-13063
* [ticket/13063] Adds Twig routing extensionTristan Darricau2014-11-203-11/+202
| | | | PHPBB3-13063
* [ticket/13063] Introduces a new \phpbb\routing\router classTristan Darricau2014-11-206-187/+330
| | | | PHPBB3-13063
* Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-181-2/+6
|\ | | | | | | | | * develop-ascraeus: [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
| * Merge pull request #3149 from prototech/ticket/13342Tristan Darricau2014-11-181-2/+6
| |\ | | | | | | | | | | | | | | | | | | [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha * prototech/ticket/13342: [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
| | * [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.Cesar G2014-11-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | The Recaptcha plugin class name does not follow the phpbb_captcha_ prefix convention as all others. Instead it simply uses phpbb_, hence the check for its existence under phpbb/captcha/plugins/ fails. PHPBB3-13342
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-181-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | * develop-ascraeus: [ticket/13315] Check for the includes/captcha/plugins/ directory instead. [ticket/13315] Fix loss of CAPTCHA plugin config value.
| * | Merge pull request #3148 from prototech/ticket/13315Tristan Darricau2014-11-181-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13315] Fix loss of CAPTCHA plugin config value. * prototech/ticket/13315: [ticket/13315] Check for the includes/captcha/plugins/ directory instead. [ticket/13315] Fix loss of CAPTCHA plugin config value.
| | * | [ticket/13315] Check for the includes/captcha/plugins/ directory instead.Cesar G2014-11-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13315
| | * | [ticket/13315] Fix loss of CAPTCHA plugin config value.Cesar G2014-11-161-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | The plugins were moved to phpbb/captcha/plugins/ after this migration was created, thus the check is no longer valid and ends up resetting the value prematurely. PHPBB3-13315
* | | 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 developNils Adermann2014-11-167-30/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 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-167-30/+60
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-167-24/+62
| | | | | | | | | | | | | | | | PHPBB3-13280
| | * | [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"Tristan Darricau2014-11-122-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb. PHPBB3-13280
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-161-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 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-161-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] 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-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 developMarc Alexander2014-11-121-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3139 from prototech/ticket/13239Marc Alexander2014-11-121-0/+8
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/13239] Ensure "Add files" button position is correctly calculated.
| | * | | | [ticket/13239] Ensure "Add files" button position is correctly calculated.Cesar G2014-11-111-0/+8
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13239
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-111-22/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.