aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html
| * Merge pull request #3108 from Elsensee/ticket/13284Joas Schilling2014-11-211-1/+1
| |\ | | | | | | | | | [ticket/13284] Message body not included in email
| | * [ticket/13284] Set message body in topic form too, so it will be sentOliver Schramm2014-11-041-1/+1
| | | | | | | | | | | | PHPBB3-13284
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3068 from marc1706/ticket/13204Joas Schilling2014-11-211-1/+1
| |\ \ | | | | | | | | | | | | [ticket/13204] Tell user that password was incorrect when exceeding attempts
| | * | [ticket/13204] Tell user that password was incorrect when exceeding attemptsMarc Alexander2014-11-021-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | At the end of the login method, the captcha was entered correctly and only the password was incorrect. Therefore, just tell the user that the password was incorrect. He will see that he still needs to enter a captcha. PHPBB3-13204
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-8/+32
|\ \ \ | |/ /
| * | Merge pull request #3064 from marc1706/ticket/13197Joas Schilling2014-11-211-8/+32
| |\ \ | | | | | | | | | | | | [ticket/13197] Also delete group avatar from users that have it set
| | * | [ticket/13197] Fix tabbingMarc Alexander2014-11-091-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13197
| | * | [ticket/13197] Correctly format sql queryMarc Alexander2014-11-091-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13197
| | * | [ticket/13197] Also delete group avatar from users that have it setMarc Alexander2014-10-251-7/+31
| | | | | | | | | | | | | | | | PHPBB3-13197
* | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 18:06:59 +0000