Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-16 | 1 | -2/+4 | |
|\ \ \ | |/ / | ||||||
| * | | [ticket/13838] Fix coding style | Nicofuma | 2015-05-14 | 1 | -2/+4 | |
| |/ | | | | | | | PHPBB3-13838 | |||||
* | | Merge branch '3.1.x' | Andreas Fischer | 2015-02-22 | 1 | -1/+1 | |
|\ \ | |/ | | | | | | | * 3.1.x: [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN | |||||
| * | [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN | Cesar G | 2015-02-19 | 1 | -1/+1 | |
| | | | | | | | | PHPBB3-13551 | |||||
* | | [ticket/13450] Type-hint return value of $phpbb_container->get() | Gaëtan Muller | 2015-01-12 | 2 | -0/+2 | |
|/ | | | | PHPBB3-13450 | |||||
* | 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 | |||||
* | | [ticket/13332] Remove useless $result assignment | Marc Alexander | 2014-11-11 | 1 | -1/+1 | |
| | | | | | | | | PHPBB3-13332 | |||||
* | | [ticket/13332] Pass user row to passwords manager check method | Marc Alexander | 2014-11-11 | 1 | -2/+2 | |
| | | | | | | | | PHPBB3-13332 | |||||
* | | [ticket/13301] Fix called function in apche auth module | Oliver Schramm | 2014-11-09 | 1 | -2/+2 | |
|/ | | | | PHPBB3-13301 | |||||
* | [ticket/13248] Correctly pass provider name | Marc Alexander | 2014-11-01 | 1 | -1/+1 | |
| | | | | PHPBB3-13248 | |||||
* | [ticket/13248] Allow specifying different auth provider in provider collection | Marc Alexander | 2014-11-01 | 1 | -3/+5 | |
| | | | | PHPBB3-13248 | |||||
* | [ticket/13248] Use auth provider collection for getting provider | Marc Alexander | 2014-11-01 | 1 | -3/+3 | |
| | | | | PHPBB3-13248 | |||||
* | [ticket/13085] Fix typo in oauth.php | n-aleha | 2014-09-21 | 1 | -1/+1 | |
| | | | | PHPBB3-13085 | |||||
* | [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth | Tristan Darricau | 2014-08-12 | 1 | -2/+11 | |
| | | | | PHPBB3-12975 | |||||
* | [ticket/11854] Fix the factory in \phpbb\auth\provider\db | Tristan Darricau | 2014-08-11 | 1 | -2/+12 | |
| | | | | PHPBB3-11854 | |||||
* | [ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins | Tristan Darricau | 2014-08-11 | 1 | -7/+1 | |
| | | | | PHPBB3-11854 | |||||
* | [ticket/12557] Fix php file description | n-aleha | 2014-08-07 | 1 | -1/+1 | |
| | | | | PHPBB3-12557 | |||||
* | [ticket/12557] Fix doc block errors found by Sami | n-aleha | 2014-08-03 | 1 | -2/+3 | |
| | | | | PHPBB3-12557 | |||||
* | [ticket/12557] Fix doc block errors found by Sami | n-aleha | 2014-08-03 | 2 | -9/+9 | |
| | | | | | | More corrections. PHPBB3-12557 | |||||
* | [ticket/12557] Fix doc block errors found by Sami pt1 | n-aleha | 2014-08-03 | 2 | -11/+11 | |
| | | | | PHPBB3-12557 | |||||
* | [ticket/12557] Fix doc block errors found by Sami | n-aleha | 2014-08-03 | 1 | -2/+4 | |
| | | | | PHPBB3-12557 | |||||
* | Merge remote-tracking branch 'github-nicofuma/ticket/12446' into ↵ | Nils Adermann | 2014-07-04 | 1 | -2/+2 | |
|\ | | | | | | | | | | | | | develop-ascraeus * github-nicofuma/ticket/12446: [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts | |||||
| * | [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts | Tristan Darricau | 2014-06-26 | 1 | -2/+2 | |
| | | | | | | | | PHPBB3-12446 | |||||
* | | Merge pull request #2598 from Nicofuma/ticket/12716 | Joas Schilling | 2014-06-27 | 1 | -1/+1 | |
|\ \ | |/ |/| | | | | | | | | | | | | | [ticket/12716] Add the missing parameters in the call of clearToken * Nicofuma/ticket/12716: [ticket/12716] Use a string as session_id [ticket/12716] Add regression test [ticket/12716] Add the missing parameters in the call of clearToken | |||||
| * | [ticket/12716] Add the missing parameters in the call of clearToken | Tristan Darricau | 2014-06-15 | 1 | -1/+1 | |
| | | | | | | | | PHPBB3-12716 | |||||
* | | [ticket/12726] Ensure PHP files do not contain any unused use statements | Tristan Darricau | 2014-06-22 | 1 | -1/+1 | |
| | | | | | | | | PHPBB3-12726 | |||||
* | | [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy | Tristan Darricau | 2014-06-16 | 1 | -1/+1 | |
| | | | | | | | | PHPBB3-12721 | |||||
* | | [ticket/12715] Cleanup comments in \phpbb\auth\provider\* | Tristan Darricau | 2014-06-15 | 6 | -17/+16 | |
|/ | | | | PHPBB3-12715 | |||||
* | [ticket/12352] Update file headers to fit new format | Marc Alexander | 2014-06-01 | 1 | -5/+7 | |
| | | | | PHPBB3-12352 | |||||
* | [ticket/12352] Use custom provider collection for auth providers | Marc Alexander | 2014-06-01 | 1 | -0/+63 | |
| | | | | | | | | | | | Using this custom provider collection, we can properly check whether the configured auth provider does exist. The method get_provider() has been added for returning the default auth provider or the standard db auth provider if the specified one does not exist. Additionally, the method get_provider() will throw an RuntimeException if none of the above exist. PHPBB3-12352 | |||||
* | [ticket/12352] Remove usages of user_pass_convert column | Marc Alexander | 2014-06-01 | 2 | -4/+3 | |
| | | | | PHPBB3-12352 | |||||
* | [ticket/12352] Remove code for converting passwords in db auth provider | Marc Alexander | 2014-06-01 | 1 | -66/+1 | |
| | | | | PHPBB3-12352 | |||||
* | [ticket/12352] Revert to db auth provider if default does not exist | Marc Alexander | 2014-06-01 | 1 | -1/+2 | |
| | | | | | | | | This will make sure that we will not encounter a non-existing auth provider. We will revert to the default db auth provider if the one set in the config does not exist in our auth provider collection. PHPBB3-12352 | |||||
* | [ticket/12594] Remove @package tags and update file headers | Yuriy Rusko | 2014-05-27 | 14 | -75/+102 | |
| | | | | PHPBB3-12594 | |||||
* | [ticket/12282] Use interface for type hinting | Joas Schilling | 2014-04-01 | 5 | -12/+12 | |
| | | | | PHPBB3-12282 | |||||
* | [ticket/12156] Add missing passwords manager to oauth | Marc Alexander | 2014-02-03 | 1 | -2/+11 | |
| | | | | PHPBB3-12156 | |||||
* | Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords | Marc Alexander | 2013-12-29 | 14 | -121/+10 | |
|\ | | | | | | | | | Conflicts: phpBB/config/services.yml | |||||
| * | [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files. | Andreas Fischer | 2013-10-30 | 14 | -112/+0 | |
| | | | | | | | | PHPBB3-11980 | |||||
| * | [ticket/11981] Fix code sniffer complaints | Marc Alexander | 2013-10-28 | 3 | -9/+8 | |
| | | | | | | | | PHPBB3-11981 | |||||
| * | [ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception. | Andreas Fischer | 2013-10-11 | 1 | -1/+3 | |
| | | | | | | | | PHPBB3-11908 | |||||
* | | [feature/passwords] Fix indentation in auth providers | Marc Alexander | 2013-12-28 | 2 | -2/+2 | |
| | | | | | | | | PHPBB3-11610 | |||||
* | | [feature/passwords] Integrate convert_flag with db auth provider | Marc Alexander | 2013-10-25 | 1 | -1/+1 | |
| | | | | | | | | PHPBB3-11610 | |||||
* | | [feature/passwords] Inject passwords manager into auth providers | Marc Alexander | 2013-10-02 | 3 | -18/+44 | |
|/ | | | | | | | The passwords manager will replace the old method of using the functions phpbb_hash() and phpbb_check_hash(). PHPBB3-11610 | |||||
* | [ticket/11700] Fix some more incorrectly changed comments | Nils Adermann | 2013-09-19 | 2 | -3/+3 | |
| | | | | PHPBB3-11700 | |||||
* | [ticket/11700] Get functional tests running after develop merge | Nils Adermann | 2013-09-17 | 1 | -1/+1 | |
| | | | | PHPBB3-11700 | |||||
* | [ticket/11700] Fix leftover backslashes in comments | Nils Adermann | 2013-09-16 | 1 | -1/+1 | |
| | | | | PHPBB3-11700 | |||||
* | [ticket/11700] Fix a few more comments | Nils Adermann | 2013-09-16 | 1 | -1/+1 | |
| | | | | PHPBB3-11700 | |||||
* | [ticket/11700] The word "them" in a comment is not a class | Nils Adermann | 2013-09-16 | 1 | -1/+1 | |
| | | | | PHPBB3-11700 | |||||
* | [ticket/11700] Actually "one" in comments is not a class | Nils Adermann | 2013-09-16 | 1 | -1/+1 | |
| | | | | PHPBB3-11700 |