aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1565 from naderman/ticket/11700Nils Adermann2013-09-2545-230/+230
|\ | | | | [WIP][ticket/11700] Namespaces
| * [ticket/11700] Correctly load templates for extensionsNils Adermann2013-09-191-6/+6
| | | | | | | | PHPBB3-11700
| * [ticket/11700] Correct ucp_auth_link request interface referencesNils Adermann2013-09-191-3/+3
| | | | | | | | PHPBB3-11700
| * [ticket/11700] Replace some leftover phpbb_filesystem usesNils Adermann2013-09-171-1/+1
| | | | | | | | PHPBB3-11700
| * [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-171-1/+1
| | | | | | | | PHPBB3-11700
| * Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-174-112/+39
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-171-1/+1
| | | | | | | | | | | | PHPBB3-11700
| * | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1632-263/+2103
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | [ticket/11700] Get the installer to run with namespacesNils Adermann2013-09-162-28/+28
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-1643-219/+219
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Load the dbms with namespacesNils Adermann2013-07-141-5/+5
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-1418-59/+59
| | | | | | | | | | | | | | | | PHPBB3-11700
* | | | Merge remote-tracking branch 'fredsa/ticket/11606' into developAndreas Fischer2013-09-231-14/+35
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * fredsa/ticket/11606: [ticket/11606] remove preg_replace() /e modifier in make_clickable()
| * | | [ticket/11606] remove preg_replace() /e modifier in make_clickable()Fred Sauer2013-06-131-14/+35
| | | | | | | | | | | | | | | | PHPBB3-11606
* | | | Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-164-112/+39
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11832: [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)
| * | | [ticket/11832] Correct ROOT_PATH variableNathan Guse2013-09-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11832
| * | | [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-133-5/+12
| | | | | | | | | | | | | | | | PHPBB3-11832
| * | | [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-131-5/+4
| | | | | | | | | | | | | | | | PHPBB3-11832
| * | | [ticket/11832] Fix smiley pathsNathan Guse2013-09-131-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11832
| * | | [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-131-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now symfony_request is also a service (removed the function phpbb_create_symfony_request). Inject symfony request into filesystem Cleanup for the tests PHPBB3-11832
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-135-55/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (22) and others # Via Nathan Guse (10) and others * 'develop' of github.com:phpbb/phpbb3: (39 commits) [ticket/11843] Added newlines and included numbers in the DEFINE vars test [ticket/11843] Add checking DEFINE variables with underscores to template_test [ticket/11843] The twig lexer fixes DEFINE variables with underscores again [ticket/11727] Fix indentation [ticket/11727] Fix indentation [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11816] Test !$DEFINITION [ticket/11822] Use namespace lookup order for asset loading [ticket/11727] Template loader support for safe directories to load files from [ticket/11816] Fix define/loop checks in IF statements containing parenthesis [ticket/11373] Use inheritdoc [ticket/11637] generate_text_for_display on search.php [ticket/11744] Cast to int [ticket/11744] Inheritdoc ...
| * \ \ \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ↵Nathan Guse2013-09-121-0/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11832 * remotes/imkingdavid/ticket/11824: [ticket/11824] Revert changes in functions.php [ticket/11824] Reorganize test file [ticket/11824] Update language string for board settings [ticket/11824] Revert changes to functions_content.php [ticket/11824] Add tests for urls with mod_rewrite enabled [ticket/11824] Correct a comment [ticket/11824] Change copyright year in migration file [ticket/11824] Remove unused globals [ticket/11824] Fix smilies [ticket/11824] Fix logic [ticket/11824] Add option for mod_rewrite
| * | | | | [ticket/11832] Fix build_url and the S_LOGIN_ACTIONNathan Guse2013-09-121-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-128-8/+559
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Andreas Fischer (2) and others * 'develop' of github.com:phpbb/phpbb3: (189 commits) [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [feature/oauth] Fix tabindex [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment [feature/oauth] OAuth service exception [feature/oauth] A few more minor changes [feature/oauth] Changes due to code review [feature/oauth] Fix redirects [feature/oauth] Fix issues on ucp_login_link from review ...
| * | | | | | [ticket/11832] Use $phpbb_filesystem instead of the container in append_sidNathan Guse2013-09-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-091-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-091-44/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path PHPBB3-11832
* | | | | | | [ticket/11795] Move PM popup JS to forum_fn.jsVjacheslav Trushkin2013-09-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move PM popup JavaScript from overall_header to forum_fn.js Use TWIG to escape PM popup URL PHPBB3-11795
* | | | | | | [ticket/11795] Get rid of pagination JS variablesVjacheslav Trushkin2013-09-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pagination variables to data attributes Replace A_BASE_URL with BASE_URL and use TWIG to escape it PHPBB3-11795
* | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-0/+48
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | [ticket/11824] Revert changes in functions.phpDavid King2013-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will be added in another PR PHPBB3-11824
| * | | | | [ticket/11824] Revert changes to functions_content.phpDavid King2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will be fixed in another PR PHPBB3-11824
| * | | | | [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| * | | | | [ticket/11824] Remove unused globalsDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| * | | | | [ticket/11824] Fix smiliesDavid King2013-09-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| * | | | | [ticket/11824] Fix logicDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| * | | | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-032-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
* | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-1227-222/+2006
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (188) and others # Via Andreas Fischer (41) and others * 'develop' of github.com:phpbb/phpbb3: (435 commits) [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [feature/oauth] Fix tabindex [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [feature/oauth] Fix bug on ucp_auth_link related to error display ...
| * \ \ \ \ \ Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-23/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Group join approved notification
| | * | | | | | [ticket/11745] Group request approved notificationNathan Guse2013-07-271-23/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| * | | | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-122-34/+25
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | [ticket/11744] Group join request notification
| | * | | | | | [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-262-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | | [ticket/11744] Group join request notificationNathan Guse2013-07-262-31/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-122-0/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11829] Use report_closed to determine status in MCP report_details Conflicts: phpBB/styles/prosilver/template/mcp_post.html
| | * | | | | | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-042-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829
| * | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-103-2/+1302
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | [ticket/develop/11832] Fix path detectionVjacheslav Trushkin2013-09-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up path, do not count first / PHPBB3-11832
| | * | | | | | Merge pull request #1618 from VSEphpbb/ticket/11747Nathan Guse2013-09-051-1/+76
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11747] UCP Prefs Core and Template Events
| | | * | | | | | [ticket/11747] ucp_prefs_post core eventsMatt Friedman2013-07-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11747
| | | * | | | | | [ticket/11747] ucp_prefs_view core eventsMatt Friedman2013-07-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11747
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-07 15:51:58 +0000