aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig/twig.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
| | | | PHPBB3-14457
* [ticket/13804] Remove unnecessary array_mergeMateBartus2015-05-111-6/+1
| | | | PHPBB3-13804
* [ticket/13804] Make template's user dependency optionalMateBartus2015-05-051-3/+21
| | | | PHPBB3-13804
* [ticket/13132] Twig: Add loops content to the root contextTristan Darricau2015-03-051-0/+6
| | | | PHPBB3-13132
* Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-4/+4
|\ | | | | | | | | * develop-ascraeus: [ticket/13133] Fix variable name in set_custom_style()
| * [ticket/13133] Fix variable name in set_custom_style()Matt Friedman2015-01-201-4/+4
| | | | | | | | PHPBB3-13133
| * Merge pull request #3099 from Senky/ticket/13266Joas Schilling2014-12-271-0/+5
| |\ | | | | | | | | | [ticket/13266] Enabling twig dump function if DEBUG is defined
| | * [ticket/13266] Enable twig dump functionJakub Senko2014-11-011-0/+5
| | | | | | | | | | | | PHPBB3-13266
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+28
|\ \ \ | |/ /
| * | [ticket/13133] Rename $ok variableTristan Darricau2014-11-071-4/+4
| | | | | | | | | | | | PHPBB3-13133
| * | [ticket/13133] Allow @vendor_name for includecssTristan Darricau2014-10-081-4/+28
| |/ | | | | | | PHPBB3-13133
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-021-0/+4
|\ \ | |/
| * [ticket/12661] Add template testPico882014-08-241-1/+1
| | | | | | | | PHPBB3-12661
| * [ticket/12661] Load extensions templates from "all" folder by render()Pico882014-08-241-0/+4
| | | | | | | | PHPBB3-12661
* | [ticket/11649] Expose Twig through the containerTristan Darricau2014-08-091-29/+10
|/ | | | PHPBB3-11649
* [ticket/12715] Cleanup comments in \phpbb\template\*Tristan Darricau2014-06-151-4/+2
| | | | PHPBB3-12715
* Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594Yuriy Rusko2014-05-281-6/+26
|\
| * [ticket/12509] Add example in doc blockTristan Darricau2014-05-271-0/+4
| | | | | | | | PHPBB3-12509
| * [ticket/12509] Fix doc blockTristan Darricau2014-05-131-1/+1
| | | | | | | | PHPBB3-12509
| * [ticket/12509] Fix the call to set_custom_file in adm/index and messengerTristan Darricau2014-05-131-3/+11
| | | | | | | | PHPBB3-12509
| * [ticket/12509] Add an option to set the path of custom file for extensionsTristan Darricau2014-05-131-5/+13
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12509 PHPBB3-12509
* | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-4/+7
|/ | | | PHPBB3-12594
* [ticket/12100] Re-order arguments in template environment constructorMatt Friedman2014-01-271-1/+1
| | | | PHPBB3-12100
* [ticket/12100] Ensure enabled extensions are fresh in Twig environmentMatt Friedman2014-01-271-1/+1
| | | | PHPBB3-12100
* [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.Andreas Fischer2013-10-301-8/+0
| | | | PHPBB3-11980
* [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-261-11/+11
| | | | PHPBB3-11852
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-171-10/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-131-10/+15
| | | | | | | | PHPBB3-11832
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-214/+85
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/11727] Template loader support for safe directories to load files fromNathan Guse2013-09-021-7/+15
| | | | | | | | PHPBB3-11727
| * [ticket/11628] Create base template class with common functionsNathan Guse2013-08-281-179/+1
| | | | | | | | | | | | E.g. assign_vars PHPBB3-11628
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-281-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | * [ticket/11701] Loop variables are not passed correctly to eventsNathaniel Guse2013-07-231-2/+2
| | | | | | | | | | | | PHPBB3-11701
| * | [ticket/11628] Make get_template_vars protectedNathaniel Guse2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | Remove all references to it and the hacky code in messenger that was using it PHPBB3-11628
| * | [ticket/11628] Fix a bug I noticed in template->destroyNathaniel Guse2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | Should not be setting $this->context = array()! PHPBB3-11628
| * | [ticket/11628] Remove the one usage of get_style_path()Nathaniel Guse2013-07-241-16/+2
| | | | | | | | | | | | | | | | | | Makes the code easier to follow PHPBB3-11628
| * | [ticket/11628] Shorten an if to an inline statementNathaniel Guse2013-07-241-9/+2
| | | | | | | | | | | | PHPBB3-11628
| * | [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-241-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was set to default 'template/' to append template/ to all the paths, but every location was actually just setting it to '' to not append anything. So removed the option entirely (additional paths can be appended to the paths being sent to the function already) PHPBB3-11628
| * | [ticket/11628] Remove set_style_names function, moved to set_custom_styleNathaniel Guse2013-07-241-21/+6
| | | | | | | | | | | | PHPBB3-11628
| * | [ticket/11628] Set admin namespace in the constructorNathaniel Guse2013-07-241-13/+6
| | | | | | | | | | | | PHPBB3-11628
| * | [ticket/11628] Change set_custom_style $template path to default to stringNathaniel Guse2013-07-241-3/+3
| | | | | | | | | | | | | | | | | | | | | Rather than default to false and compare === false ? 'template/' : value just assign this default in the arguments PHPBB3-11628
| * | [ticket/11628] Remove third parameter ($names) from set_custom_styleNathaniel Guse2013-07-241-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | This was basically duplicating functionality. $names would be used if not empty, else array($name) would be used. Merged functionality into the first argument PHPBB3-11628
| * | [ticket/11628] Return $this from set_style, set_custom_styleNathaniel Guse2013-07-241-4/+4
| | | | | | | | | | | | PHPBB3-11628
| * | [ticket/11628] Move setting core namespace to set_style()Nathaniel Guse2013-07-241-15/+15
| | | | | | | | | | | | PHPBB3-11628
| * | [ticket/11628] Remove $this->names, $this->style_names from phpbb_templateNathaniel Guse2013-07-241-16/+3
| | | | | | | | | | | | | | | | | | These are not used anywhere PHPBB3-11628
| * | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-241-1/+106
| |/ | | | | | | PHPBB3-11628
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-29/+31
|/ | | | PHPBB3-11700
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-141-0/+465
PHPBB3-11698
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-26 04:09:03 +0000