aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13154] Wrong variable name in the comment blockbrunoais2014-12-191-1/+1
| | | | PHPBB3-13154
* [ticket/13154] space before @varbrunoais2014-12-191-1/+1
| | | | | | Not a tab. PHPBB3-13154
* [ticket/13154] Forgot the $this->brunoais2014-12-171-1/+1
| | | | PHPBB3-13154
* [ticket/13154] Adding phpBB dispatcher to notifications managerbrunoais2014-12-171-1/+6
| | | | PHPBB3-13154
* [ticket/13154] Allow filtering the list of users to be notifiedbrunoais2014-12-171-0/+20
| | | | PHPBB3-13154
* [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.phprxu2014-11-301-1/+1
| | | | PHPBB3-13405
* [ticket/13393] Call user->lang function directlyOliver Schramm2014-11-271-1/+1
| | | | PHPBB3-13393
* Merge pull request #3075 from Senky/ticket/11613Marc Alexander2014-11-261-1/+1
|\ | | | | | | [ticket/11613] Cookies do not work for netbios domain
| * [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-221-1/+1
| | | | | | | | PHPBB3-11613
* | [ticket/13381] Fix header intendation of v312.phpJoas Schilling2014-11-251-10/+10
| | | | | | | | PHPBB3-13381
* | [prep-release-3.1.2] Add migration to update version to 3.1.2Joas Schilling2014-11-241-0/+31
| |
* | [prep-release-3.1.2] Add migration for 3.1.2-RC1Joas Schilling2014-11-221-0/+32
| |
* | Merge pull request #10 from phpbb/ticket/security-171Joas Schilling2014-11-222-20/+33
|\ \ | | | | | | | | | [ticket/security-171] Use type cast helper for json data
| * \ 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 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 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 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 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 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 pull request #3060 from marc1706/ticket/13211Nils Adermann2014-10-257-33/+325
| |\ \ \ \ | | | | | | | | | | | | [ticket/13211] Add log wrapper for writing database updater to log file
* | | | | | [ticket/13316] Ensure Recaptcha image uses https when necessary.Cesar G2014-11-211-2/+4
| |_|_|/ / |/| | | | | | | | | | | | | | PHPBB3-13316
* | | | | 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 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
* | | | | | | 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
* | | | | | | | [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 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 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