aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/passwords] Increase test coverage to 35 out ouf 36 methodsMarc Alexander2013-10-094-14/+111
| | | | | | | 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] Add tests for unique_id() method in helperMarc Alexander2013-10-091-5/+16
| | | | PHPBB3-11610
* [feature/passwords] Move check for 8-bit characters to bcrypt driverMarc Alexander2013-10-072-10/+10
| | | | PHPBB3-11610
* [feature/passwords] Fix hash_test for use of passwords managerMarc Alexander2013-10-031-1/+4
| | | | PHPBB3-11610
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-10-0338-337/+388
|\ | | | | | | | | Conflicts: phpBB/includes/functions.php
| * Merge remote-tracking branch 'nickvergessen/ticket/11691' into developDhruv2013-10-024-19/+63
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 conversion testJoas Schilling2013-10-011-1/+1
| | | | | | | | | | | | PHPBB3-11691
| | * [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
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-10-020-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11879] Replace .live() with .on() Conflicts: phpBB/styles/prosilver/template/forum_fn.js
| | * \ Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympusAndreas Fischer2013-10-021-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11879: [ticket/11879] Replace .live() with .on()
| | | * | [ticket/11879] Replace .live() with .on()Vjacheslav Trushkin2013-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11879
| * | | | Merge pull request #1744 from EXreaction/ticket/11878Joas Schilling2013-10-011-2/+2
| |\ \ \ \ | | | | | | | | | | | | [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modules
| | * | | | [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-3027-292/+285
| |\ \ \ \ | | | | | | | | | | | | 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] Move tests to folder with new class nameJoas Schilling2013-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11852
| | * | | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-2626-290/+108
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11852
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2013-09-303-15/+18
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11876] Replace MD5 with SHA256. [ticket/11876] Move checksum generation from build PHP files to phing build.xml
| | * | | | [ticket/11876] Replace MD5 with SHA256.Andreas Fischer2013-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11876
| | * | | | [ticket/11876] Move checksum generation from build PHP files to phing build.xmlAndreas Fischer2013-09-303-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also removes paths from the checksum files. PHPBB3-11876
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-301-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. Conflicts: build/build.xml
| | * | | | [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.Andreas Fischer2013-09-301-1/+1
| | | | | |
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-283-0/+16
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-283-0/+16
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | | |
| | | * | | Merge branch 'ticket/11873' into prep-release-3.0.12Andreas Fischer2013-09-282-0/+15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11873: [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| | | | * | | [ticket/11873] Add unit test for large password input.Joas Schilling2013-09-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The password should be rejected quite fast. PHPBB3-11873
| | | | * | | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | | |/ / / | | | | | | | | | | | | | | | | | | PHPBB3-11873
| * | | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-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] Add prepending backslash to class namespacesMarc Alexander2013-10-025-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | | | [feature/passwords] Fix tests after changes to phpBB hashing functionsMarc Alexander2013-10-022-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | | | [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-022-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These method names are more straightforward than the previous ones. PHPBB3-11610
* | | | | | | [feature/passwords] Inject passwords manager into auth providersMarc Alexander2013-10-026-20/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2710-26/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610