aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-221-1/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-212-5/+136
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/security-171] Add tests for retrieved remote data in version_helperMarc Alexander2014-11-211-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
| | * | | | | | | | | | [ticket/security-171] Sanitize data from composer.jsonMarc Alexander2014-11-211-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
| | * | | | | | | | | | [ticket/security-171] Use type cast helper for json dataMarc Alexander2014-11-211-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Merge pull request #8 from phpbb/ticket/security-169Joas Schilling2014-11-221-1/+7
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/security-169] Stop loop through referer dir in top directory
| | * | | | | | | | | | [ticket/security-169] Stop loop through referer dir in top directoryMarc Alexander2014-11-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-169
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-222-5/+136
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | / / / / / | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge pull request #3157 from marc1706/ticket/13358Joas Schilling2014-11-222-5/+136
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | [ticket/13358] Add class for retrieving remote file data
| | * | | | | | | | [ticket/13358] Correctly create version_helper in acp_extensionsMarc Alexander2014-11-221-1/+1
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The full namespace for the file_downloader is now also being used in version_helper. PHPBB3-13358
| | * | | | | | | [ticket/13358] Use protected and public keywords where applicableMarc Alexander2014-11-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358
| | * | | | | | | [ticket/13358] Do not pass variables by referenceMarc Alexander2014-11-212-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358
| | * | | | | | | [ticket/13358] Fix tests and use exceptions instead of user objectMarc Alexander2014-11-212-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358
| | * | | | | | | [ticket/13358] Add file_downloader to version_helperMarc Alexander2014-11-211-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358
| | * | | | | | | [ticket/13358] Add file_downloader as replacement for get_remote_fileMarc Alexander2014-11-211-0/+137
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-13358
* | | | | | | | 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