| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1964 from prototech/ticket/12136 | Andreas Fischer | 2014-02-15 | 1 | -4/+7 |
| |\ | | | | | | | | | | | | | [ticket/12136] Use new pagination class in generate_smilies(). * prototech/ticket/12136: [ticket/12136] Use new pagination class in generate_smilies(). | ||||
| | * | [ticket/12136] Use new pagination class in generate_smilies(). | Cesar G | 2014-01-26 | 1 | -4/+7 |
| | | | | | | | | | PHPBB3-12136 | ||||
| * | | Merge remote-tracking branch 'bantu/ticket/12180' into develop | Joas Schilling | 2014-02-12 | 1 | -1/+0 |
| |\ \ | | | | | | | | | | | | | * bantu/ticket/12180: [ticket/12180] Add "Each file MUST end with exactly one newline character" rule | ||||
| | * | | [ticket/12180] Add "Each file MUST end with exactly one newline character" rule | Andreas Fischer | 2014-02-10 | 1 | -1/+0 |
| | | | | | | | | | | | | | PHPBB3-12180 | ||||
| * | | | [ticket/12169] Add new option to display profile fields on memberlist | Joas Schilling | 2014-02-10 | 2 | -1/+6 |
| | | | | | | | | | | | | | PHPBB3-12169 | ||||
| * | | | [ticket/12169] Convert user_from to profile field location | Joas Schilling | 2014-02-10 | 4 | -10/+1 |
| | | | | | | | | | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169 | ||||
| * | | | [ticket/12115] Also port user interests to profile fields | Joas Schilling | 2014-02-06 | 5 | -12/+1 |
| | | | | | | | | | | | | | PHPBB3-12115 | ||||
| * | | | [ticket/12115] Convert user occupation to a profile field | Joas Schilling | 2014-02-06 | 5 | -11/+1 |
| |/ / | | | | | | | PHPBB3-12115 | ||||
| * | | [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development | Joas Schilling | 2014-02-05 | 1 | -1/+1 |
| | | | |||||
| * | | [prep-release-3.1.0-a3] Update version to 3.1.0-a3 | Joas Schilling | 2014-02-05 | 1 | -1/+1 |
| | | | |||||
| * | | [ticket/12159] Fix codesniffer complaints due to profilefields and passwords | Marc Alexander | 2014-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | The two PRs regarding profilefields and passwords manager that were recently merged caused a few codesniffer complaints that are fixed by these changes. PHPBB3-12159 | ||||
| * | | Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop | Nils Adermann | 2014-02-02 | 8 | -1694/+77 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/11201: (50 commits) [ticket/11201] Remove empty calls section from .yml [ticket/11201] Split template file into multiple files [ticket/11201] Remove dependency from types on the manager [ticket/11201] Rename profilefields class to manager [ticket/11201] Fix parameter description [ticket/11201] Use !== null, its faster [ticket/11201] Also translate profile fields in UCP and ACP [ticket/11201] Add parameters and variables to profile field class [ticket/11201] Add commas on last array entry [ticket/11201] Allow translation of profile field name and explanation [ticket/11201] Fix some variable names [ticket/11201] Add tables to constructor in tests [ticket/11201] Add a method to return the translated full name of the type [ticket/11201] Remove db depending code from field class [ticket/11201] Add variables to classes and add constructor doc blocks [ticket/11201] Update copyright in class file [ticket/11201] Add visibility and remove unused variable [ticket/11201] Add some commas at the last array entry [ticket/11201] Cast some variables to integer [ticket/11201] Inject table names rather then using constants ... Conflicts: phpBB/config/services.yml | ||||
| | * | | [ticket/11201] Rename profilefields class to manager | Joas Schilling | 2014-02-02 | 6 | -6/+6 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Use !== null, its faster | Joas Schilling | 2014-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Fix some variable names | Joas Schilling | 2014-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Add a method to return the translated full name of the type | Joas Schilling | 2014-01-18 | 1 | -3/+3 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Update schema files and unit test | Joas Schilling | 2014-01-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Change type from integer to service name | Joas Schilling | 2014-01-17 | 1 | -18/+19 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Move custom template variable assignment to type class | Joas Schilling | 2014-01-17 | 1 | -44/+7 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Move preparation of hidden fields to type class | Joas Schilling | 2014-01-17 | 1 | -43/+5 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Allow manipulating the intended variables with the type class | Joas Schilling | 2014-01-17 | 1 | -99/+6 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Move type specific error messages to type class | Joas Schilling | 2014-01-17 | 1 | -9/+1 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Move field type depending preparation of the options to class | Joas Schilling | 2014-01-17 | 1 | -27/+8 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Move grabbing the input of the language options to type class | Joas Schilling | 2014-01-16 | 1 | -20/+5 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Move language option determination into type class | Joas Schilling | 2014-01-15 | 1 | -26/+4 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Use database type from the type class | Joas Schilling | 2014-01-15 | 1 | -190/+16 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Remove type related code from build_insert_sql_array() | Joas Schilling | 2014-01-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Move get_options to type classes | Joas Schilling | 2014-01-13 | 1 | -16/+7 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Remove global use from admin class | Joas Schilling | 2014-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| | * | | [ticket/11201] Make profile field classes autoloadable | Joas Schilling | 2014-01-10 | 7 | -1213/+10 |
| | | | | | | | | | | | | | PHPBB3-11201 | ||||
| * | | | Merge pull request #1716 from marc1706/feature/passwords | Nils Adermann | 2014-02-02 | 7 | -194/+45 |
| |\ \ \ | |_|/ |/| | | [feature/passwords] Add password hashing manager with support for newer hashing algorithms | ||||
| | * | | [feature/passwords] Correct docblock of phpbb_hash() function | Marc Alexander | 2013-12-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-11610 | ||||
| | * | | [feature/passwords] Get rid of unneeded code complexity | Marc Alexander | 2013-12-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Simplified a little bit of code as pointed out by imkingdavid on github. PHPBB3-11610 | ||||
| | * | | Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords | Marc Alexander | 2013-12-29 | 56 | -752/+871 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml | ||||
| | * | | | [feature/passwords] Use passwords manager service instead of functions | Marc Alexander | 2013-10-13 | 5 | -11/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old functions phpbb_hash() and phpbb_check_hash() have been replaced with the passwords manager service in all front-end related files. The phpBB2 converter and the release_3_0_5_rc1 migration file have not been changed. The same applies to the security/hash_test that still tests the function phpbb_check_hash(). This will however make sure that the old function still works. PHPBB3-11610 | ||||
| | * | | | [feature/passwords] Use passwords.manager service in login_forum_box() | Marc Alexander | 2013-10-13 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, unused variables have been removed from the globals and the request class is now used instead of the request_var() function. PHPBB3-11610 | ||||
| | * | | | [feature/passwords] Use VCHAR_UNI instead of VCHAR_CI for user_passwords | Marc Alexander | 2013-10-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-11610 | ||||
| | * | | | [feature/passwords] Modify forum_password column type for new hash types | Marc Alexander | 2013-10-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-11610 | ||||
| | * | | | [feature/passwords] Remove obsolete hashing functions from functions.php | Marc Alexander | 2013-10-11 | 1 | -110/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | These hashing functions have been worked into the salted md5 driver. PHPBB3-11610 | ||||
| | * | | | [feature/passwords] Mark old hashing functions as deprecated | Marc Alexander | 2013-10-11 | 1 | -24/+6 |
| | | | | | | | | | | | | | | | | | PHPBB3-11610 | ||||
| | * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords | Marc Alexander | 2013-10-03 | 5 | -27/+30 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php | ||||
| | * | | | | [feature/passwords] Use passwords manager in phpBB hash functions | Marc Alexander | 2013-10-02 | 1 | -37/+6 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610 | ||||
| | * | | | | [feature/passwords] Add schema changes to schema_data for new hash types | Marc Alexander | 2013-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11610 | ||||
| * | | | | | Merge remote-tracking branch 'EXreaction/ticket/12006' into develop | Joas Schilling | 2014-01-18 | 1 | -3/+36 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/12006: [ticket/12006] global $phpbb_dispatcher; [ticket/12006] Missing a space [ticket/12006] Add module_auth event [ticket/12006] Test for ext module auth [ticket/12006] Add extension enabled check token to module auth [ticket/12006] Cleanup the module auth function token replacement code | ||||
| | * | | | | | [ticket/12006] global $phpbb_dispatcher; | Nathan Guse | 2014-01-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006 | ||||
| | * | | | | | [ticket/12006] Missing a space | Nathan Guse | 2014-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006 | ||||
| | * | | | | | [ticket/12006] Add module_auth event | Nathan Guse | 2014-01-10 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006 | ||||
| | * | | | | | [ticket/12006] Add extension enabled check token to module auth | Nathan Guse | 2013-12-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006 | ||||
| | * | | | | | [ticket/12006] Cleanup the module auth function token replacement code | Nathan Guse | 2013-12-30 | 1 | -2/+20 |
| | | |_|/ / | |/| | | | | | | | | | | | | | PHPBB3-12006 | ||||
| * | | | | | [ticket/11915] Provide the URL to the attachment when it's uploaded. | Cesar G | 2014-01-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-11915 | ||||
