forums/phpBB/phpbb/template/twig/node/includeasset.php, branch master

[ticket/15508] Remove call to getEnvironment() from parser

2019-05-09T19:30:12+00:00

PHPBB3-15508

[ticket/15542] Only add assets version for relative paths

2018-10-29T21:57:53+00:00

PHPBB3-15542

[ticket/15542] Always append assets versions to assets

2018-10-29T15:07:48+00:00

PHPBB3-15542

[ticket/14446] Add predefined placeholder variables to twig definition

2016-02-02T16:13:47+00:00

PHPBB3-14446

[ticket/13717] Set the assets after rendering the whole template

2016-01-24T23:31:45+00:00

The goal being to be able to call INCLUDECSS/JS from anywhere in any tempalte or event

PHPBB3-13717

[ticket/13638] Inject $filesystem in \phpbb\template\asset

2015-05-05T15:07:11+00:00

PHPBB3-13638

[ticket/12715] Cleanup comments in \phpbb\template\*

2014-06-15T17:15:06+00:00

PHPBB3-12715

[ticket/12594] Remove @package tags and update file headers

2014-05-27T18:51:13+00:00

PHPBB3-12594

[ticket/11852] Split filesystem and path_helper into 2 classes

2013-09-26T13:34:44+00:00

PHPBB3-11852

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-17T14:56:50+00:00

* 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