aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [feature/passwords] A few more corrections in methods due to namespacingMarc Alexander2013-09-282-7/+7
* [feature/passwords] More changes due to namespacingMarc Alexander2013-09-272-10/+12
* [feature/passwords] Modify passwords files for namespacing changesMarc Alexander2013-09-2710-26/+44
* [feature/passwords] Add schema changes to schema_data for new hash typesMarc Alexander2013-09-271-1/+1
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-09-27590-7499/+10910
|\
| * Merge branch 'develop-olympus' into developAndreas Fischer2013-09-271-2/+2
| |\
| | * [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.Andreas Fischer2013-09-271-3/+3
| | * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-272-2/+8
| | |\
| | | * [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-274-5/+11
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-261-1/+0
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympusAndreas Fischer2013-09-261-1/+0
| | |\ \
| | | * | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
| | |/ /
| * | | Merge remote-tracking branch 'cyberalien/ticket/11868' into developAndreas Fischer2013-09-264-7/+59
| |\ \ \
| | * | | [ticket/11868] Add @depends to testVjacheslav Trushkin2013-09-261-0/+3
| | * | | Merge pull request #3 from nickvergessen/ticket/cyberalien/11868Vjacheslav Trushkin2013-09-261-0/+49
| | |\ \ \
| | | * | | [ticket/11868] Add functional test for registrationJoas Schilling2013-09-261-0/+49
| | |/ / /
| | * | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-263-7/+7
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-263-5/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-193-5/+8
| * | | | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-258-34/+10
| |\ \ \ \
| | * | | | [ticket/11866] Only single backslash in .md filesJoas Schilling2013-09-261-1/+1
| | * | | | [ticket/11866] Remove outdated and broken develop scriptJoas Schilling2013-09-261-24/+0
| | * | | | [ticket/11866] More namespacesJoas Schilling2013-09-262-5/+5
| | * | | | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-265-5/+5
| * | | | | Merge pull request #1732 from nickvergessen/ticket/11865David King2013-09-252-3/+3
| |\ \ \ \ \
| | * | | | | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| | * | | | | [ticket/11865] Add bbcodes to functional posting testsJoas Schilling2013-09-261-2/+2
| | |/ / / /
| * | | | | Merge pull request #1673 from nickvergessen/ticket/11805Nathan Guse2013-09-254-13/+170
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/11805] Move page-url generating code into a new functionJoas Schilling2013-09-251-28/+29
| | * | | | [ticket/11805] Rename test to match the function nameJoas Schilling2013-09-251-1/+1
| | * | | | [ticket/11805] Add unit tests for paginationJoas Schilling2013-09-252-0/+123
| | * | | | [ticket/11805] Do not generate the same link twiceJoas Schilling2013-09-251-20/+10
| | * | | | [ticket/11805] Fix "jump to page" feature for pagination in routesJoas Schilling2013-09-251-3/+7
| | * | | | [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-25477-2119/+2985
| |\ \ \ \
| | * | | | [ticket/11700] Undo migrations migration, as not an issue for new installsNils Adermann2013-09-251-55/+0
| | * | | | [ticket/11700] Update migrations table for namespacesNils Adermann2013-09-251-0/+55
| | * | | | [ticket/11700] Only replace phpbb_search in strings that matchNils Adermann2013-09-251-1/+1
| | * | | | [ticket/11700] Use spaces, not tabsNils Adermann2013-09-252-17/+17
| | * | | | [ticket/11700] Return class names with leading backslash in finderNils Adermann2013-09-251-1/+1
| | * | | | Merge pull request #3 from nickvergessen/ticket/naderman/11700Nils Adermann2013-09-252-2/+7
| | |\ \ \ \
| | | * | | | [ticket/11700] Escape Backslashes from schema_data.sql for MySQLiJoas Schilling2013-09-251-1/+6
| | | * | | | [ticket/11700] Fix unresolvable condition in migrationJoas Schilling2013-09-251-1/+1
| | |/ / / /
| | * | | | [ticket/11700] No need to escape \ in SQL stringNils Adermann2013-09-191-1/+1
| | * | | | [ticket/11700] Correctly load templates for extensionsNils Adermann2013-09-192-7/+7
| | * | | | [ticket/11700] Get unit tests to run again with namespacesNils Adermann2013-09-194-5/+9
| | * | | | [ticket/11700] Fix extension loading with namespacesNils Adermann2013-09-1923-46/+72
| | * | | | [ticket/11700] Change search backend db entry to namespacesNils Adermann2013-09-192-1/+31
| | * | | | [ticket/11700] Fix redirection in common.php until fs dependency on request i...Nils Adermann2013-09-191-0/+6
| | * | | | [ticket/11700] Correctly load avatar templates for namespaced driversNils Adermann2013-09-192-2/+2