Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/13154] Wrong variable name in the comment block | brunoais | 2014-12-19 | 1 | -1/+1 |
| | | | | PHPBB3-13154 | ||||
* | [ticket/13154] space before @var | brunoais | 2014-12-19 | 1 | -1/+1 |
| | | | | | | Not a tab. PHPBB3-13154 | ||||
* | [ticket/13154] Forgot the $this-> | brunoais | 2014-12-17 | 1 | -1/+1 |
| | | | | PHPBB3-13154 | ||||
* | [ticket/13154] Adding phpBB dispatcher to notifications manager | brunoais | 2014-12-17 | 1 | -1/+6 |
| | | | | PHPBB3-13154 | ||||
* | [ticket/13154] Allow filtering the list of users to be notified | brunoais | 2014-12-17 | 1 | -0/+20 |
| | | | | PHPBB3-13154 | ||||
* | [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php | rxu | 2014-11-30 | 1 | -1/+1 |
| | | | | PHPBB3-13405 | ||||
* | [ticket/13393] Call user->lang function directly | Oliver Schramm | 2014-11-27 | 1 | -1/+1 |
| | | | | PHPBB3-13393 | ||||
* | Merge pull request #3075 from Senky/ticket/11613 | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
|\ | | | | | | | [ticket/11613] Cookies do not work for netbios domain | ||||
| * | [ticket/11613] Allow cookies to work on netbios domains | Jakub Senko | 2014-11-22 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11613 | ||||
* | | [ticket/13381] Fix header intendation of v312.php | Joas Schilling | 2014-11-25 | 1 | -10/+10 |
| | | | | | | | | PHPBB3-13381 | ||||
* | | [prep-release-3.1.2] Add migration to update version to 3.1.2 | Joas Schilling | 2014-11-24 | 1 | -0/+31 |
| | | |||||
* | | [prep-release-3.1.2] Add migration for 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -0/+32 |
| | | |||||
* | | Merge pull request #10 from phpbb/ticket/security-171 | Joas Schilling | 2014-11-22 | 2 | -20/+33 |
|\ \ | | | | | | | | | | [ticket/security-171] Use type cast helper for json data | ||||
| * \ | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-22 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-21 | 2 | -5/+136 |
| |\ \ \ | |||||
| * | | | | [ticket/security-171] Add tests for retrieved remote data in version_helper | Marc Alexander | 2014-11-21 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | SECURITY-171 | ||||
| * | | | | [ticket/security-171] Sanitize data from composer.json | Marc Alexander | 2014-11-21 | 1 | -11/+23 |
| | | | | | | | | | | | | | | | | | | | | SECURITY-171 | ||||
| * | | | | [ticket/security-171] Use type cast helper for json data | Marc Alexander | 2014-11-21 | 1 | -9/+7 |
| | | | | | | | | | | | | | | | | | | | | SECURITY-171 | ||||
* | | | | | Merge pull request #8 from phpbb/ticket/security-169 | Joas Schilling | 2014-11-22 | 1 | -1/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/security-169] Stop loop through referer dir in top directory | ||||
| * | | | | | [ticket/security-169] Stop loop through referer dir in top directory | Marc Alexander | 2014-11-09 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-169 | ||||
* | | | | | | Merge pull request #3157 from marc1706/ticket/13358 | Joas Schilling | 2014-11-22 | 2 | -5/+136 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | [ticket/13358] Add class for retrieving remote file data | ||||
| * | | | | | [ticket/13358] Correctly create version_helper in acp_extensions | Marc Alexander | 2014-11-22 | 1 | -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 applicable | Marc Alexander | 2014-11-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| * | | | | [ticket/13358] Do not pass variables by reference | Marc Alexander | 2014-11-21 | 2 | -21/+15 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| * | | | | [ticket/13358] Fix tests and use exceptions instead of user object | Marc Alexander | 2014-11-21 | 2 | -20/+13 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| * | | | | [ticket/13358] Add file_downloader to version_helper | Marc Alexander | 2014-11-21 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| * | | | | [ticket/13358] Add file_downloader as replacement for get_remote_file | Marc Alexander | 2014-11-21 | 1 | -0/+137 |
| | |/ / | |/| | | | | | | | | | | PHPBB3-13358 | ||||
* | | | | Merge pull request #3108 from Elsensee/ticket/13284 | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13284] Message body not included in email | ||||
| * | | | | [ticket/13284] Set message body in topic form too, so it will be sent | Oliver Schramm | 2014-11-04 | 1 | -1/+1 |
| | |/ / | |/| | | | | | | | | | | PHPBB3-13284 | ||||
* | | | | Merge pull request #3068 from marc1706/ticket/13204 | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13204] Tell user that password was incorrect when exceeding attempts | ||||
| * | | | | [ticket/13204] Tell user that password was incorrect when exceeding attempts | Marc Alexander | 2014-11-02 | 1 | -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/13197 | Joas Schilling | 2014-11-21 | 1 | -8/+32 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13197] Also delete group avatar from users that have it set | ||||
| * | | | | [ticket/13197] Fix tabbing | Marc Alexander | 2014-11-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13197 | ||||
| * | | | | [ticket/13197] Correctly format sql query | Marc Alexander | 2014-11-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13197 | ||||
| * | | | | [ticket/13197] Also delete group avatar from users that have it set | Marc Alexander | 2014-10-25 | 1 | -7/+31 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13197 | ||||
| * | | | | Merge pull request #3060 from marc1706/ticket/13211 | Nils Adermann | 2014-10-25 | 7 | -33/+325 |
| |\ \ \ \ | | | | | | | | | | | | | [ticket/13211] Add log wrapper for writing database updater to log file | ||||
* | | | | | | [ticket/13316] Ensure Recaptcha image uses https when necessary. | Cesar G | 2014-11-21 | 1 | -2/+4 |
| |_|_|/ / |/| | | | | | | | | | | | | | | PHPBB3-13316 | ||||
* | | | | | Merge pull request #3144 from marc1706/ticket/13337 | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13337] Do not use SQL IN comparison with empty array | ||||
| * | | | | | [ticket/13337] Allow empty array passed to sql_in_set() | Marc Alexander | 2014-11-14 | 1 | -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/13133 | Joas Schilling | 2014-11-21 | 1 | -4/+28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13133] Allow @vendor_name for includecss | ||||
| * | | | | | | [ticket/13133] Rename $ok variable | Tristan Darricau | 2014-11-07 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13133 | ||||
| * | | | | | | [ticket/13133] Allow @vendor_name for includecss | Tristan Darricau | 2014-10-08 | 1 | -4/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13133 | ||||
* | | | | | | | Merge pull request #3149 from prototech/ticket/13342 | Tristan Darricau | 2014-11-18 | 1 | -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 G | 2014-11-16 | 1 | -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 G | 2014-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13315 | ||||
* | | | | | | | | [ticket/13315] Fix loss of CAPTCHA plugin config value. | Cesar G | 2014-11-16 | 1 | -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 Adermann | 2014-11-16 | 6 | -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 object | Tristan Darricau | 2014-11-16 | 6 | -24/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13280 | ||||
| * | | | | | | | [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280" | Tristan Darricau | 2014-11-12 | 2 | -12/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb. PHPBB3-13280 | ||||
* | | | | | | | | Merge pull request #3136 from marc1706/ticket/13332 | Tristan Darricau | 2014-11-16 | 1 | -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 |