aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-09-27266-2666/+4840
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-261-4/+4
| |\
| | * [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-191-4/+4
| * | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-261-1/+1
| * | [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-251-2/+2
| * | [ticket/11700] Return class names with leading backslash in finderNils Adermann2013-09-251-1/+1
| * | [ticket/11700] Fix unresolvable condition in migrationJoas Schilling2013-09-251-1/+1
| * | [ticket/11700] Fix extension loading with namespacesNils Adermann2013-09-196-13/+20
| * | [ticket/11700] Change search backend db entry to namespacesNils Adermann2013-09-191-0/+30
| * | [ticket/11700] Correctly load avatar templates for namespaced driversNils Adermann2013-09-192-2/+2
| * | [ticket/11700] Correctly handle avatar drivers with namespacesNils Adermann2013-09-191-3/+3
| * | [ticket/11700] Fix some more incorrectly changed commentsNils Adermann2013-09-1914-15/+15
| * | [ticket/11700] Replace some leftover phpbb_filesystem usesNils Adermann2013-09-171-2/+2
| * | [ticket/11700] Get functional tests running after develop mergeNils Adermann2013-09-172-2/+2
| * | [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-173-14/+16
| * | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-176-15/+247
| |\ \ | | |/
| | * [ticket/11832] get_url() from phpbb_template_asset should return web pathNathan Guse2013-09-152-4/+9
| | * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-134-15/+78
| | * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-131-1/+1
| | |\
| | * | [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-132-12/+60
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1311-28/+673
| | |\ \
| | * \ \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/1...Nathan Guse2013-09-122-12/+35
| | |\ \ \
| | * \ \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1214-0/+1679
| | |\ \ \ \
| | * | | | | [ticket/11832] Changing comments to say app.php rather than index.phpNathan Guse2013-09-121-3/+3
| | * | | | | [ticket/11832] Fix the web path correctionsNathan Guse2013-09-121-10/+34
| | * | | | | [ticket/11832] More extensive testingNathan Guse2013-09-101-5/+7
| | * | | | | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-091-7/+27
| | * | | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-091-0/+69
| * | | | | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-172-7/+8
| * | | | | | [ticket/11700] Correctly convert old acm type to namespaced class nameNils Adermann2013-09-161-1/+1
| * | | | | | [ticket/11700] Use underscores in avatar driver template file namesNils Adermann2013-09-161-1/+1
| * | | | | | [ticket/11700] namespacify phpbb_permissions classNils Adermann2013-09-161-13/+15
| * | | | | | [ticket/11700] Load avatar explanations correctly from namespacesNils Adermann2013-09-161-1/+1
| * | | | | | [ticket/11700] Correctly generate lang key from avatar driver classNils Adermann2013-09-161-1/+1
| * | | | | | [ticket/11700] Fix leftover backslashes in commentsNils Adermann2013-09-1613-18/+18
| * | | | | | [ticket/11700] And some last comments with backslashesNils Adermann2013-09-1611-30/+30
| * | | | | | [ticket/11700] Fix a few more commentsNils Adermann2013-09-1614-20/+20
| * | | | | | [ticket/11700] The word "them" in a comment is not a classNils Adermann2013-09-161-1/+1
| * | | | | | [ticket/11700] Actually "one" in comments is not a classNils Adermann2013-09-163-5/+5
| * | | | | | [ticket/11700] Fix authentication acp after develop mergeNils Adermann2013-09-165-23/+31
| * | | | | | [ticket/11700] Fix installation after develop mergeNils Adermann2013-09-165-9/+17
| * | | | | | [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-1612-52/+68
| * | | | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1689-1625/+3508
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-132-12/+35
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| | | | |_|/ | | | |/| |
| | | * | | [ticket/11824] Change copyright year in migration fileDavid King2013-09-061-1/+1
| | | * | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-032-12/+35