aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11784] Remove naming redundancy for event listenersMatt Friedman2013-08-131-1/+1
| | | | PHPBB3-11784
* [ticket/11777] Require a suffix of '_listener' on extension template listenersrechosen2013-08-121-1/+1
| | | | | | | | To further mirror the file name and location requirements for php template event listeners, require extension template event listener files to follow the '<event name>_listener.html' naming format. PHPBB3-11777
* [ticket/11777] Rename the extension template listener subdirectory to 'event/'rechosen2013-08-121-6/+7
| | | | | | | | | Per suggestion of EXreaction and nickvergessen, do not look for extension template event listeners in styles/[style]/template/events/ but in styles/[style]/template/event/ (without the trailing 's') to match the way phpBB looks for php template event listeners. PHPBB3-11777
* [ticket/11777] Add subdirectory 'events/' to the template event search pathrechosen2013-08-121-3/+8
| | | | | | | | Makes the twig template engine look in the events/ subdirectory instead of the main styles/[style]/template/ directory for extension template events. Note that it does _not_ look recursively! PHPBB3-11777
* Merge remote-tracking branch 'EXreaction/ticket/11701' into developJoas Schilling2013-08-092-10/+11
|\ | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11701: [ticket/11701] New line at EOF [ticket/11701] Test events in loops [ticket/11701] Refix regex for appending |length [ticket/11701] Fix regex for appending |length [ticket/11701] Fix loops var check [ticket/11701] Remove useless str_replace [ticket/11701] Loop variables are not passed correctly to events
| * [ticket/11701] Refix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| | | | | | | | PHPBB3-11701
| * [ticket/11701] Fix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| | | | | | | | PHPBB3-11701
| * [ticket/11701] Fix loops var checkNathaniel Guse2013-07-231-2/+6
| | | | | | | | PHPBB3-11701
| * [ticket/11701] Remove useless str_replaceNathaniel Guse2013-07-231-3/+0
| | | | | | | | PHPBB3-11701
| * [ticket/11701] Loop variables are not passed correctly to eventsNathaniel Guse2013-07-232-7/+7
| | | | | | | | PHPBB3-11701
* | [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-1426-0/+2919
PHPBB3-11698