aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-1818-20/+0
|\
| * [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-0318-20/+0
* | Merge pull request #1964 from prototech/ticket/12136Andreas Fischer2014-02-151-4/+7
|\ \
| * | [ticket/12136] Use new pagination class in generate_smilies().Cesar G2014-01-261-4/+7
* | | Merge remote-tracking branch 'bantu/ticket/12180' into developJoas Schilling2014-02-121-1/+0
|\ \ \
| * | | [ticket/12180] Add "Each file MUST end with exactly one newline character" ruleAndreas Fischer2014-02-101-1/+0
* | | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-102-1/+6
* | | | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-104-10/+1
* | | | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-065-12/+1
* | | | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-065-11/+1
|/ / /
* | | [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
* | Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into developNils Adermann2014-02-028-1694/+77
|\ \
| * | [ticket/11201] Rename profilefields class to managerJoas Schilling2014-02-026-6/+6
| * | [ticket/11201] Use !== null, its fasterJoas Schilling2014-01-201-1/+1
| * | [ticket/11201] Fix some variable namesJoas Schilling2014-01-181-1/+1
| * | [ticket/11201] Add a method to return the translated full name of the typeJoas Schilling2014-01-181-3/+3
| * | [ticket/11201] Update schema files and unit testJoas Schilling2014-01-171-2/+2
| * | [ticket/11201] Change type from integer to service nameJoas Schilling2014-01-171-18/+19
| * | [ticket/11201] Move custom template variable assignment to type classJoas Schilling2014-01-171-44/+7
| * | [ticket/11201] Move preparation of hidden fields to type classJoas Schilling2014-01-171-43/+5
| * | [ticket/11201] Allow manipulating the intended variables with the type classJoas Schilling2014-01-171-99/+6
| * | [ticket/11201] Move type specific error messages to type classJoas Schilling2014-01-171-9/+1
| * | [ticket/11201] Move field type depending preparation of the options to classJoas Schilling2014-01-171-27/+8
| * | [ticket/11201] Move grabbing the input of the language options to type classJoas Schilling2014-01-161-20/+5
| * | [ticket/11201] Move language option determination into type classJoas Schilling2014-01-151-26/+4
| * | [ticket/11201] Use database type from the type classJoas Schilling2014-01-151-190/+16
| * | [ticket/11201] Remove type related code from build_insert_sql_array()Joas Schilling2014-01-141-1/+1
| * | [ticket/11201] Move get_options to type classesJoas Schilling2014-01-131-16/+7
| * | [ticket/11201] Remove global use from admin classJoas Schilling2014-01-101-1/+1
| * | [ticket/11201] Make profile field classes autoloadableJoas Schilling2014-01-107-1213/+10
* | | Merge pull request #1716 from marc1706/feature/passwordsNils Adermann2014-02-027-194/+45
|\ \ \ | |_|/ |/| |
| * | [feature/passwords] Correct docblock of phpbb_hash() functionMarc Alexander2013-12-291-1/+1
| * | [feature/passwords] Get rid of unneeded code complexityMarc Alexander2013-12-291-1/+1
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwordsMarc Alexander2013-12-2956-752/+871
| |\ \
| * | | [feature/passwords] Use passwords manager service instead of functionsMarc Alexander2013-10-135-11/+26
| * | | [feature/passwords] Use passwords.manager service in login_forum_box()Marc Alexander2013-10-131-3/+5
| * | | [feature/passwords] Use VCHAR_UNI instead of VCHAR_CI for user_passwordsMarc Alexander2013-10-131-1/+1
| * | | [feature/passwords] Modify forum_password column type for new hash typesMarc Alexander2013-10-131-1/+1
| * | | [feature/passwords] Remove obsolete hashing functions from functions.phpMarc Alexander2013-10-111-110/+0
| * | | [feature/passwords] Mark old hashing functions as deprecatedMarc Alexander2013-10-111-24/+6
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-10-035-27/+30
| |\ \ \
| * | | | [feature/passwords] Use passwords manager in phpBB hash functionsMarc Alexander2013-10-021-37/+6
| * | | | [feature/passwords] Add schema changes to schema_data for new hash typesMarc Alexander2013-09-271-1/+1
* | | | | Merge remote-tracking branch 'EXreaction/ticket/12006' into developJoas Schilling2014-01-181-3/+36
|\ \ \ \ \
| * | | | | [ticket/12006] global $phpbb_dispatcher;Nathan Guse2014-01-171-1/+1
| * | | | | [ticket/12006] Missing a spaceNathan Guse2014-01-101-1/+1
| * | | | | [ticket/12006] Add module_auth eventNathan Guse2014-01-101-0/+14
| * | | | | [ticket/12006] Add extension enabled check token to module authNathan Guse2013-12-301-1/+2