aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig
Commit message (Collapse)AuthorAgeFilesLines
* [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/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
| | | | PHPBB3-11667
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-233-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (224) and others # Via Andreas Fischer (23) and others * 'develop' of github.com:phpbb/phpbb3: (385 commits) [ticket/11734] Readd accidently removed language strings of forum permissions [ticket/11620] Whitespace and combine function into test_case [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity [ticket/11620] Changed incorrect global variable [ticket/11620] Minor indentation changes and comment clarity [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed [ticket/11733] Add browse test for feed.php [ticket/11731] Remove static calls to captcha garbage collector [ticket/11728] Replace topic_approved with topic_visibility [ticket/11620] Expected and actual test conditions wrongly swapped [ticket/11620] Space between . in directory import concatenation [ticket/11620] Changes to match merge [ticket/11620] Changes for code guidelines consistency [ticket/11620] Fix a static calls to non-static for session captcha [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick [ticket/11620] Update auth_provider for new interface [ticket/11620] Added garbage_collection_test [ticket/11620] Fixed check_ban_test errors with cache and ban warning message [ticket/11620] Fixed a typo on check_ban_test [ticket/11620] Refactored check_isvalid_test to use session_test_case ...
* Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-231-4/+5
|\ | | | | | | | | | | | | | | | | * EXreaction/ticket/11718: [ticket/11718] Quick test for fixes in ELSEIF [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF Conflicts: tests/template/template_test.php
| * [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIFNathaniel Guse2013-07-191-4/+5
| | | | | | | | PHPBB3-11718
* | [ticket/11707] Twig DEFINE not working as expectedNathaniel Guse2013-07-191-4/+8
|/ | | | PHPBB3-11707
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-1422-0/+2028
PHPBB3-11698