aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/feed
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-162-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.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
| * Merge remote-tracking branch 'nickvergessen/ticket/11733' into developAndreas Fischer2013-07-231-1/+1
| |\ | | | | | | | | | | | | | | | * nickvergessen/ticket/11733: [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed [ticket/11733] Add browse test for feed.php
| | * [ticket/11733] Fix "Illegal offset type" Warning caused by overall feedJoas Schilling2013-07-231-1/+1
| | | | | | | | | | | | PHPBB3-11733
| * | [ticket/11728] Replace topic_approved with topic_visibilityJoas Schilling2013-07-221-1/+1
| |/ | | | | | | PHPBB3-11728
| * [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-201-1/+1
| | | | | | | | | | | | | | Due to the move to soft-delete, the topic_replies column no longer exists in the topics table. Instead, the column topic_posts_approved should be used. PHPBB3-11717
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-1612-38/+62
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-3/+3
|/ | | | PHPBB3-11700
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-1412-0/+1427
PHPBB3-11698
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-19 21:03:09 +0000