aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-10-035-27/+30
|\
| * Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-304-19/+20
| |\
| | * [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-264-19/+20
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-281-0/+7
| |\ \
| | * \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-281-0/+7
| | |\ \
| | | * | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | | * | [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-271-1/+1
| | | * | [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-021-1/+1
| * | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-271-2/+2
| * | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-8/+10
| |\ \ \ \
| | * | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-251-8/+10
* | | | | | [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 branch 'develop-olympus' into developAndreas Fischer2013-09-261-1/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
* | | | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-262-6/+6
| |_|_|/ |/| | |
* | | | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-252-5/+5
|\ \ \ \
| * | | | [ticket/11866] More namespacesJoas Schilling2013-09-261-4/+4
| * | | | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-261-1/+1
* | | | | Merge pull request #1732 from nickvergessen/ticket/11865David King2013-09-251-1/+1
|\ \ \ \ \
| * | | | | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| |/ / / /
* | | | | [ticket/11805] Move page-url generating code into a new functionJoas Schilling2013-09-251-28/+29
* | | | | [ticket/11805] Do not generate the same link twiceJoas Schilling2013-09-251-20/+10
* | | | | [ticket/11805] Allow specifying the page in the route for paginationJoas Schilling2013-09-251-6/+45
|/ / / /
* | | | Merge pull request #1565 from naderman/ticket/11700Nils Adermann2013-09-2545-230/+230
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/11700] Correctly load templates for extensionsNils Adermann2013-09-191-6/+6
| * | | [ticket/11700] Correct ucp_auth_link request interface referencesNils Adermann2013-09-191-3/+3
| * | | [ticket/11700] Replace some leftover phpbb_filesystem usesNils Adermann2013-09-171-1/+1
| * | | [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-171-1/+1
| * | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-174-112/+39
| |\ \ \
| * | | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-171-1/+1
| * | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1632-263/+2103
| |\ \ \ \
| * | | | | [ticket/11700] Get the installer to run with namespacesNils Adermann2013-09-162-28/+28
| * | | | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-1643-219/+219
| * | | | | [ticket/11700] Load the dbms with namespacesNils Adermann2013-07-141-5/+5
| * | | | | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-1418-59/+59
* | | | | | Merge remote-tracking branch 'fredsa/ticket/11606' into developAndreas Fischer2013-09-231-14/+35
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/11606] remove preg_replace() /e modifier in make_clickable()Fred Sauer2013-06-131-14/+35
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-164-112/+39
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/11832] Correct ROOT_PATH variableNathan Guse2013-09-151-1/+1
| * | | | | [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-133-5/+12
| * | | | | [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-131-5/+4
| * | | | | [ticket/11832] Fix smiley pathsNathan Guse2013-09-131-2/+2
| * | | | | [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-131-41/+0
| * | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-135-55/+32
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/1...Nathan Guse2013-09-121-0/+48
| |\ \ \ \ \ \
| * | | | | | | [ticket/11832] Fix build_url and the S_LOGIN_ACTIONNathan Guse2013-09-121-16/+18
| * | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-128-8/+559
| |\ \ \ \ \ \ \
| * | | | | | | | [ticket/11832] Use $phpbb_filesystem instead of the container in append_sidNathan Guse2013-09-101-4/+6
| * | | | | | | | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-091-5/+2