aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-065-12/+1
| | | | PHPBB3-12115
* [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-065-11/+1
| | | | PHPBB3-12115
* [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future developmentJoas Schilling2014-02-051-1/+1
|
* [prep-release-3.1.0-a3] Update version to 3.1.0-a3Joas Schilling2014-02-051-1/+1
|
* [ticket/12159] Fix codesniffer complaints due to profilefields and passwordsMarc Alexander2014-02-031-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 developNils Adermann2014-02-028-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 managerJoas Schilling2014-02-026-6/+6
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Use !== null, its fasterJoas Schilling2014-01-201-1/+1
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Fix some variable namesJoas Schilling2014-01-181-1/+1
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Add a method to return the translated full name of the typeJoas Schilling2014-01-181-3/+3
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Update schema files and unit testJoas Schilling2014-01-171-2/+2
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Change type from integer to service nameJoas Schilling2014-01-171-18/+19
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Move custom template variable assignment to type classJoas Schilling2014-01-171-44/+7
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Move preparation of hidden fields to type classJoas Schilling2014-01-171-43/+5
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Allow manipulating the intended variables with the type classJoas Schilling2014-01-171-99/+6
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Move type specific error messages to type classJoas Schilling2014-01-171-9/+1
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Move field type depending preparation of the options to classJoas Schilling2014-01-171-27/+8
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Move grabbing the input of the language options to type classJoas Schilling2014-01-161-20/+5
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Move language option determination into type classJoas Schilling2014-01-151-26/+4
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Use database type from the type classJoas Schilling2014-01-151-190/+16
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Remove type related code from build_insert_sql_array()Joas Schilling2014-01-141-1/+1
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Move get_options to type classesJoas Schilling2014-01-131-16/+7
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Remove global use from admin classJoas Schilling2014-01-101-1/+1
| | | | | | | | PHPBB3-11201
| * [ticket/11201] Make profile field classes autoloadableJoas Schilling2014-01-107-1213/+10
| | | | | | | | PHPBB3-11201
* | Merge pull request #1716 from marc1706/feature/passwordsNils Adermann2014-02-027-194/+45
|\ \ | | | | | | [feature/passwords] Add password hashing manager with support for newer hashing algorithms
| * | [feature/passwords] Correct docblock of phpbb_hash() functionMarc Alexander2013-12-291-1/+1
| | | | | | | | | | | | PHPBB3-11610
| * | [feature/passwords] Get rid of unneeded code complexityMarc Alexander2013-12-291-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/passwordsMarc Alexander2013-12-2956-752/+871
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | [feature/passwords] Use passwords manager service instead of functionsMarc Alexander2013-10-135-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 Alexander2013-10-131-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_passwordsMarc Alexander2013-10-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11610
| * | | [feature/passwords] Modify forum_password column type for new hash typesMarc Alexander2013-10-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11610
| * | | [feature/passwords] Remove obsolete hashing functions from functions.phpMarc Alexander2013-10-111-110/+0
| | | | | | | | | | | | | | | | | | | | | | | | These hashing functions have been worked into the salted md5 driver. PHPBB3-11610
| * | | [feature/passwords] Mark old hashing functions as deprecatedMarc Alexander2013-10-111-24/+6
| | | | | | | | | | | | | | | | PHPBB3-11610
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-10-035-27/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| * | | | [feature/passwords] Use passwords manager in phpBB hash functionsMarc Alexander2013-10-021-37/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11610
| * | | | [feature/passwords] Add schema changes to schema_data for new hash typesMarc Alexander2013-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11610
* | | | | Merge remote-tracking branch 'EXreaction/ticket/12006' into developJoas Schilling2014-01-181-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 Guse2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | [ticket/12006] Missing a spaceNathan Guse2014-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | [ticket/12006] Add module_auth eventNathan Guse2014-01-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | [ticket/12006] Add extension enabled check token to module authNathan Guse2013-12-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | [ticket/12006] Cleanup the module auth function token replacement codeNathan Guse2013-12-301-2/+20
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-12006
* | | | | [ticket/11915] Provide the URL to the attachment when it's uploaded.Cesar G2014-01-171-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11915
* | | | | [ticket/11915] Provide the attachment file size to the template.Cesar G2014-01-172-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11915
* | | | | Merge pull request #1938 from prototech/ticket/12077Nathan Guse2014-01-171-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | [ticket/12077] Ensure that valid upload methods are presented to user in language packs page.
| * | | | [ticket/12077] Fix another strict standards error.Cesar G2013-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12077
| * | | | [ticket/12077] Fix strict standards error.Cesar G2013-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12077
* | | | | Merge remote-tracking branch 'Marc/ticket/11997' into developJoas Schilling2014-01-081-63/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11997: (23 commits) [ticket/11997] Use functional test cases that should always work [ticket/11997] Fix redirect tests for mod rewrite [ticket/11997] Add user's page dir to redirect path and fix unit tests for it [ticket/11997] Remove obsolete function get_controller_redirect_url() [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs [ticket/11997] Do not check if file or dir we redirect to exist [ticket/11997] Modifiy tests after adding path_helper clean_url method [ticket/11997] Add clean_url() method to path_helper [ticket/11997] Allow redirects to parent folders like previously [ticket/11997] Move expected redirect returns to controller and output to HTML [ticket/11997] Fix tests for path_helper's get_controller_redirect_url() [ticket/11997] Use get_controller_redirect_url() in redirect() function [ticket/11997] Add method for controller redirect URLs to path helper [ticket/11997] Undo changes to phpbb_own_realpath() [ticket/11997] Remove obsolete failover_flag in function redirect() [ticket/11997] Add functional test for redirects in controller [ticket/11997] Fix missing global [ticket/11997] Fix redirects from inside controllers [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths ...
| * | | | | [ticket/11997] Add user's page dir to redirect path and fix unit tests for itMarc Alexander2013-12-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user's page directory needs to be added to the redirect URL for proper redirects outside of the forum root. Fix the unit tests accordingly. PHPBB3-11997