aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-271-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | | | | | [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-273-3/+9
| | | | | | | |
* | | | | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments after incorrect merge of previous PR. PHPBB3-11862
* | | | | | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-8/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11862: [ticket/11862] Correct var names in user_delete() events due to prune-users
| * | | | | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-251-8/+10
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prune-users feature modified the names of the used variables in this function. However, the variable names for the two events in this function were not changed to reflect that. This patch will take care of it. PHPBB3-11862
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-261-1/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11864] Do not call exit after display_progress_bar in acp_forums
| * | | | | | | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864
* | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11868' into developAndreas Fischer2013-09-262-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11868: [ticket/11868] Add @depends to test [ticket/11868] Add functional test for registration [ticket/11868] Replace phpbb_request_interface references
| * | | | | | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-262-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11868
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-261-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11816-2: [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
| * | | | | | | [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-191-4/+4
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-11816
* | | | | | | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-257-33/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/11866 Fix some more namespace issues
| * | | | | | | [ticket/11866] Remove outdated and broken develop scriptJoas Schilling2013-09-261-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
| * | | | | | | [ticket/11866] More namespacesJoas Schilling2013-09-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
| * | | | | | | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-264-4/+4
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-11866
* | | | | | | Merge pull request #1732 from nickvergessen/ticket/11865David King2013-09-251-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11865] includes/bbcode.php is missing namespace change
| * | | | | | | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11865
* | | | | | | [ticket/11805] Move page-url generating code into a new functionJoas Schilling2013-09-251-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11805
* | | | | | | [ticket/11805] Do not generate the same link twiceJoas Schilling2013-09-251-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to generate the prev/next links twice PHPBB3-11805
* | | | | | | [ticket/11805] Fix "jump to page" feature for pagination in routesJoas Schilling2013-09-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11805
* | | | | | | [ticket/11805] Allow specifying the page in the route for paginationJoas Schilling2013-09-251-6/+45
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of "app.php?controller=news&start=10" authors might prefer having the pagination in the route. So the sample link from above would be the same as "app.php?controller=news/page/2". With this patch that is easily possible. What you do is, you specify the $base_url and $start_name as follows: $base_url = $controller_helper->url('news/page/%d'); $start_name = '/page/%d'; // Part of the url that will be removed // for page 1 Now this will generate: "news" for start = 0 "news/page/1" will work aswell, but will not be created "news/page/2" for start = 10 PHPBB3-11805
* | | | | | Merge pull request #1565 from naderman/ticket/11700Nils Adermann2013-09-25326-1526/+2321
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [WIP][ticket/11700] Namespaces
| * | | | | [ticket/11700] Undo migrations migration, as not an issue for new installsNils Adermann2013-09-251-55/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Update migrations table for namespacesNils Adermann2013-09-251-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Only replace phpbb_search in strings that matchNils Adermann2013-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Use spaces, not tabsNils Adermann2013-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Return class names with leading backslash in finderNils Adermann2013-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Escape Backslashes from schema_data.sql for MySQLiJoas Schilling2013-09-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Fix unresolvable condition in migrationJoas Schilling2013-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] No need to escape \ in SQL stringNils Adermann2013-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Correctly load templates for extensionsNils Adermann2013-09-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Fix extension loading with namespacesNils Adermann2013-09-196-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class loader now expects all classes to be prefixed with a backslash when resolving paths PHPBB3-11700
| * | | | | [ticket/11700] Change search backend db entry to namespacesNils Adermann2013-09-192-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Fix redirection in common.php until fs dependency on request ↵Nils Adermann2013-09-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is removed PHPBB3-11700
| * | | | | [ticket/11700] Correctly load avatar templates for namespaced driversNils Adermann2013-09-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Correct ucp_auth_link request interface referencesNils Adermann2013-09-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Correctly handle avatar drivers with namespacesNils Adermann2013-09-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Fix some more incorrectly changed commentsNils Adermann2013-09-1914-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Add file headers to develop scripts for namespaceNils Adermann2013-09-192-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Replace some leftover phpbb_filesystem usesNils Adermann2013-09-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Get functional tests running after develop mergeNils Adermann2013-09-173-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-175-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1713-133/+308
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving) Conflicts: phpBB/common.php phpBB/config/services.yml phpBB/includes/bbcode.php phpBB/includes/functions.php phpBB/includes/functions_messenger.php phpBB/install/index.php phpBB/phpbb/filesystem.php phpBB/phpbb/template/twig/environment.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/dbal/migrator_test.php tests/extension/manager_test.php tests/extension/metadata_manager_test.php tests/filesystem/clean_path_test.php tests/mock/extension_manager.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * | | | | [ticket/11700] Add back accidently deleted file in cache dirNils Adermann2013-09-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-177-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Correctly convert old acm type to namespaced class nameNils Adermann2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Use underscores in avatar driver template file namesNils Adermann2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] namespacify phpbb_permissions classNils Adermann2013-09-161-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Correct service definitions with namespacesNils Adermann2013-09-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | [ticket/11700] Load avatar explanations correctly from namespacesNils Adermann2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700