aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/passwords] Increase test coverage to 100% of methodsMarc Alexander2013-10-101-8/+8
| | | | | | | | Obsolete code that is impossible to hit has been removed and the logic of the salted md5 driver has been changed to correctly implement the phpBB 3.0 phpbb_hash() function. PHPBB3-11610
* [feature/passwords] Increase test coverage to 35 out ouf 36 methodsMarc Alexander2013-10-092-6/+4
| | | | | | | Only one small code part in the salted md5 driver can't be tested right now. Passwords helper and passwords driver helper are now fully covered by tests. PHPBB3-11610
* [feature/passwords] Move check for 8-bit characters to bcrypt driverMarc Alexander2013-10-072-10/+10
| | | | PHPBB3-11610
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-10-0320-245/+313
|\ | | | | | | | | Conflicts: phpBB/includes/functions.php
| * Merge remote-tracking branch 'nickvergessen/ticket/11691' into developDhruv2013-10-023-18/+62
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11691: [ticket/11691] Fix conversion test [ticket/11691] Fix table names and arguments/docs [ticket/11691] Move purge code into new function [ticket/11691] Fix typo in comment [ticket/11691] Add order by to the query [ticket/11691] Fix some minor comments [ticket/11691] Fix some more problems with softdelete update [ticket/11691] Change detection of effectively_installed() [ticket/11691] Stagger user notification reconversion even more [ticket/11691] Stagger the convertion of soft delete updates
| | * [ticket/11691] Fix table names and arguments/docsJoas Schilling2013-09-261-8/+8
| | | | | | | | | | | | PHPBB3-11691
| | * [ticket/11691] Move purge code into new functionJoas Schilling2013-09-261-7/+7
| | | | | | | | | | | | PHPBB3-11691
| | * [ticket/11691] Fix typo in commentJoas Schilling2013-09-261-1/+1
| | | | | | | | | | | | PHPBB3-11691
| | * [ticket/11691] Add order by to the queryJoas Schilling2013-09-261-1/+2
| | | | | | | | | | | | PHPBB3-11691
| | * [ticket/11691] Fix some minor commentsJoas Schilling2013-09-261-4/+3
| | | | | | | | | | | | PHPBB3-11691
| | * [ticket/11691] Fix some more problems with softdelete updateJoas Schilling2013-09-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | * wrong order of arguments on sql_query_limit * avoid "BIGINT UNSIGNED value is out of range" errors * increase limit for the loop PHPBB3-11691
| | * [ticket/11691] Change detection of effectively_installed()Joas Schilling2013-09-261-1/+3
| | | | | | | | | | | | | | | | | | | | | When start is set for a migration, it is not yet effectively installed. So we just continue doing it... PHPBB3-11691
| | * [ticket/11691] Stagger user notification reconversion even moreJoas Schilling2013-09-261-7/+24
| | | | | | | | | | | | PHPBB3-11691
| | * [ticket/11691] Stagger the convertion of soft delete updatesJoas Schilling2013-09-261-3/+23
| | | | | | | | | | | | PHPBB3-11691
| * | [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modulesNathan Guse2013-10-021-2/+2
| | | | | | | | | | | | PHPBB3-11878
| * | Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-3014-217/+238
| |\ \ | | | | | | | | Ticket/11852 filesystem class must not depend on a web request
| | * | [ticket/11852] Add class fileJoas Schilling2013-09-271-0/+175
| | | | | | | | | | | | | | | | PHPBB3-11852
| | * | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-2613-217/+63
| | | | | | | | | | | | | | | | PHPBB3-11852
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-282-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| | * \ \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-282-0/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| | | * | | [prep-release-3.0.12] Update changelog for 3.0.12 release.Andreas Fischer2013-09-281-0/+1
| | | | | |
| | | * | | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11873
| | * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-271-0/+6
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | | * | | [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-273-3/+9
| | | | | |
| * | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments after incorrect merge of previous PR. PHPBB3-11862
| * | | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-8/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11862: [ticket/11862] Correct var names in user_delete() events due to prune-users
| | * | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-251-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prune-users feature modified the names of the used variables in this function. However, the variable names for the two events in this function were not changed to reflect that. This patch will take care of it. PHPBB3-11862
* | | | | | | [feature/passwords] Use passwords manager in phpBB hash functionsMarc Alexander2013-10-021-37/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | | | [feature/passwords] Rename manager methods to check() and hash()Marc Alexander2013-10-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These method names are more straightforward than the previous ones. PHPBB3-11610
* | | | | | | [feature/passwords] Inject passwords manager into auth providersMarc Alexander2013-10-024-18/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The passwords manager will replace the old method of using the functions phpbb_hash() and phpbb_check_hash(). PHPBB3-11610
* | | | | | | [feature/passwords] Do not hash passwords longer than 4096 bytesMarc Alexander2013-10-011-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | | | [feature/passwords] Pass config via service container to driver helperMarc Alexander2013-09-282-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will get rid of the global $config in the driver helper PHPBB3-11610
* | | | | | | [feature/passwords] A few more corrections in methods due to namespacingMarc Alexander2013-09-282-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | | | [feature/passwords] More changes due to namespacingMarc Alexander2013-09-272-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | | | [feature/passwords] Modify passwords files for namespacing changesMarc Alexander2013-09-279-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | | | [feature/passwords] Add schema changes to schema_data for new hash typesMarc Alexander2013-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-09-27420-6524/+9143
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/develop/create_schema_files.php
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-261-1/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11864] Do not call exit after display_progress_bar in acp_forums
| | * | | | | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864
| * | | | | | Merge remote-tracking branch 'cyberalien/ticket/11868' into developAndreas Fischer2013-09-262-6/+6
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11868: [ticket/11868] Add @depends to test [ticket/11868] Add functional test for registration [ticket/11868] Replace phpbb_request_interface references
| | * | | | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-262-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11868
| * | | | | | Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-261-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11816-2: [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
| | * | | | | [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11816
| * | | | | | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-257-33/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/11866 Fix some more namespace issues
| | * | | | | | [ticket/11866] Remove outdated and broken develop scriptJoas Schilling2013-09-261-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
| | * | | | | | [ticket/11866] More namespacesJoas Schilling2013-09-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
| | * | | | | | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-264-4/+4
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | PHPBB3-11866
| * | | | | | Merge pull request #1732 from nickvergessen/ticket/11865David King2013-09-251-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11865] includes/bbcode.php is missing namespace change
| | * | | | | | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11865
| * | | | | | [ticket/11805] Move page-url generating code into a new functionJoas Schilling2013-09-251-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11805