aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-221-1/+1
|\
| * [ticket/13358] Correctly create version_helper in acp_extensionsMarc Alexander2014-11-221-1/+1
* | Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-212-5/+136
|\ \ | |/
| * [ticket/13358] Use protected and public keywords where applicableMarc Alexander2014-11-211-3/+3
| * [ticket/13358] Do not pass variables by referenceMarc Alexander2014-11-212-21/+15
| * [ticket/13358] Fix tests and use exceptions instead of user objectMarc Alexander2014-11-212-20/+13
| * [ticket/13358] Add file_downloader to version_helperMarc Alexander2014-11-211-2/+9
| * [ticket/13358] Add file_downloader as replacement for get_remote_fileMarc Alexander2014-11-211-0/+137
* | [ticket/security-171] Add tests for retrieved remote data in version_helperMarc Alexander2014-11-211-5/+8
* | [ticket/security-171] Sanitize data from composer.jsonMarc Alexander2014-11-211-11/+23
* | [ticket/security-171] Use type cast helper for json dataMarc Alexander2014-11-211-9/+7
|/
* Merge pull request #3144 from marc1706/ticket/13337Joas Schilling2014-11-211-1/+1
|\
| * [ticket/13337] Allow empty array passed to sql_in_set()Marc Alexander2014-11-141-1/+1
* | Merge pull request #3023 from Nicofuma/ticket/13133Joas Schilling2014-11-211-4/+28
|\ \
| * | [ticket/13133] Rename $ok variableTristan Darricau2014-11-071-4/+4
| * | [ticket/13133] Allow @vendor_name for includecssTristan Darricau2014-10-081-4/+28
* | | Merge pull request #3149 from prototech/ticket/13342Tristan Darricau2014-11-181-2/+6
|\ \ \
| * | | [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.Cesar G2014-11-161-2/+6
* | | | [ticket/13315] Check for the includes/captcha/plugins/ directory instead.Cesar G2014-11-181-1/+1
* | | | [ticket/13315] Fix loss of CAPTCHA plugin config value.Cesar G2014-11-161-1/+2
|/ / /
* | | Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascr...Nils Adermann2014-11-166-30/+57
|\ \ \
| * | | [ticket/13280] Output escaping for the symfony request objectTristan Darricau2014-11-166-24/+59
| * | | [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"Tristan Darricau2014-11-122-12/+4
* | | | Merge pull request #3136 from marc1706/ticket/13332Tristan Darricau2014-11-161-3/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/13332] Remove useless $result assignmentMarc Alexander2014-11-111-1/+1
| * | | [ticket/13332] Pass user row to passwords manager check methodMarc Alexander2014-11-111-2/+2
| |/ /
* | | Merge pull request #3137 from prototech/ticket/13209Marc Alexander2014-11-132-2/+14
|\ \ \ | |/ / |/| |
| * | [ticket/13209] Gather language field values for boolean CPF's in all steps.Cesar G2014-11-111-1/+1
| * | [ticket/13209] Fix expected request value of CPF language fields.Cesar G2014-11-111-1/+13
* | | Merge pull request #3113 from prototech/ticket/13251Marc Alexander2014-11-091-10/+18
|\ \ \
| * | | [ticket/13251] Escape container parameters defined from config.php.Cesar G2014-11-071-10/+18
* | | | Merge pull request #3120 from Elsensee/ticket/13301Marc Alexander2014-11-091-2/+2
|\ \ \ \
| * | | | [ticket/13301] Fix called function in apche auth moduleOliver Schramm2014-11-091-2/+2
| | |/ / | |/| |
* | | | [ticket/13243] Validate announcement entry for existence in version_helperOliver Schramm2014-11-091-1/+1
|/ / /
* | | Merge pull request #3110 from Elsensee/ticket/13242Joas Schilling2014-11-091-0/+1
|\ \ \
| * | | [ticket/13242] Fix HTML validityOliver Schramm2014-11-051-0/+1
* | | | Merge pull request #3118 from prototech/ticket/13270Tristan Darricau2014-11-071-0/+31
|\ \ \ \
| * | | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.Cesar G2014-11-071-0/+31
| | |/ / | |/| |
* | | | [ticket/13303] Speed up migration dependency calculation.Cesar G2014-11-071-1/+9
|/ / /
* | | [ticket/13280] Only run sanitizer for server superglobal and modify testsMarc Alexander2014-11-041-3/+3
* | | [ticket/13280] Seperate server sanitizer call and add commentMarc Alexander2014-11-041-0/+2
* | | [ticket/13280] Add additional sanitizer for ampersands in server superglobalMarc Alexander2014-11-031-0/+6
* | | [ticket/13280] Properly format the current page and add sanitizer to testsMarc Alexander2014-11-031-3/+3
|/ /
* | Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-028-10/+183
|\ \
| * \ Merge remote-tracking branch 'github-security/ticket/security-164-alt' into p...Nils Adermann2014-11-022-1/+4
| |\ \
| | * | [ticket/security-164] Correctly format page_nameMarc Alexander2014-11-011-1/+1
| | * | [ticket/security-164] Sanitize all global variables in symfony_request classMarc Alexander2014-11-011-0/+3
| * | | Merge branch 'ticket/13271' into prep-release-3.1.1Nils Adermann2014-11-021-1/+1
| |\ \ \
| | * | | [ticket/13271] Disable CC sender feature for anonymous usersNils Adermann2014-11-021-1/+1
| | |/ /
| * | | [prep-release-3.1.1] Add 3.1.1 migration fileNils Adermann2014-11-021-0/+32