aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13316] Ensure Recaptcha image uses https when necessary.Cesar G2014-11-211-2/+4
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-13316
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3144 from marc1706/ticket/13337Joas Schilling2014-11-211-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13337] Do not use SQL IN comparison with empty array
| | * | | | [ticket/13337] Allow empty array passed to sql_in_set()Marc Alexander2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is_array() will evaluate to true even if the array is just an empty array. Make sure we also expect an empty array passed to sql_in_set(). PHPBB3-13337
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3023 from Nicofuma/ticket/13133Joas Schilling2014-11-211-4/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13133] Allow @vendor_name for includecss
| | * | | | | [ticket/13133] Rename $ok variableTristan Darricau2014-11-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13133
| | * | | | | [ticket/13133] Allow @vendor_name for includecssTristan Darricau2014-10-081-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13133
* | | | | | | [ticket/12620] Fix functionnal testsTristan Darricau2014-11-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Fix rebaseTristan Darricau2014-11-205-103/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Add a test using a custom DI extension in an extensionTristan Darricau2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Use the container to get the environment nameTristan Darricau2014-11-203-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Fix testsTristan Darricau2014-11-201-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Creates one di extension per phpBB extensionTristan Darricau2014-11-203-90/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Adds a yaml config fileTristan Darricau2014-11-204-27/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Uses a cache directory per environmentTristan Darricau2014-11-202-15/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Add the support of the environments for the ext servicesTristan Darricau2014-11-201-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We look for an environment.yml file in the config/PHPBB_ENVIRONMENT/ directory of the extensionss. If the directory does not exist we look for the environment.yml file in the 'default' environment and finally for the services.yml file in the config/ directory. PHPBB3-12620
* | | | | | | [ticket/12620] Use PHPBB_ENVIRONMENTTristan Darricau2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Split the environments into differents foldersTristan Darricau2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Display error message when the environment isn't availableTristan Darricau2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [ticket/12620] Allow the user to define multiples environmentsTristan Darricau2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12620
* | | | | | | [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] Introduces a new \phpbb\routing\router classTristan Darricau2014-11-205-181/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | [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 developNils Adermann2014-11-166-30/+57
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-166-30/+57
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-166-24/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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 pull request #1880 from nicolas-grekas/developTristan Darricau2014-11-112-22/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback * nicolas-grekas/develop: [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback [feature/patchwork-utf8] Remove utf8_str_replace [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
| * | | | | | | [feature/patchwork-utf8] Remove utf8_str_replaceNicolas Grekas2014-11-081-4/+4
| | | | | | | |
| * | | | | | | [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallbackNicolas Grekas2014-11-081-18/+16
| | | | | | | |
* | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-10/+18
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3113 from prototech/ticket/13251Marc Alexander2014-11-091-10/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13251] Escape container parameters defined from config.php.
| | * | | | | | | [ticket/13251] Escape container parameters defined from config.php.Cesar G2014-11-071-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13251
* | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /