Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' | Marc Alexander | 2015-07-08 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: tests/template/template_includecss_test.php | ||||
| * | [ticket/13995] Remove deprecated projection media type | Matt Friedman | 2015-07-07 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-13995 | ||||
* | | Merge branch '3.1.x' | Nils Adermann | 2015-05-30 | 13 | -13/+0 |
|\ \ | |/ | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock | ||||
| * | Merge pull request #3560 from Nicofuma/ticket/13790 | Nils Adermann | 2015-05-30 | 13 | -13/+0 |
| |\ | | | | | | | [ticket/13790] Update phpcs | ||||
| | * | [ticket/13790] Update phpcs | Tristan Darricau | 2015-05-19 | 13 | -13/+0 |
| | | | | | | | | | | | | PHPBB3-13790 | ||||
* | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-16 | 5 | -7/+15 |
|\ \ \ | |/ / | |||||
| * | | [ticket/13838] Fix coding style | Nicofuma | 2015-05-14 | 5 | -7/+15 |
| |/ | | | | | | | PHPBB3-13838 | ||||
* | | Merge pull request #3591 from Nicofuma/ticket/12632 | Oliver Schramm | 2015-05-16 | 1 | -1/+1 |
|\ \ | | | | | | | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.yml | ||||
| * | | [ticket/12632] Add twig.debug and twig.auto_reload in config.yml | Tristan Darricau | 2015-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | PHPBB3-13206 PHPBB3-12632 | ||||
* | | | [ticket/13804] Remove unnecessary array_merge | MateBartus | 2015-05-11 | 1 | -6/+1 |
| | | | | | | | | | | | | PHPBB3-13804 | ||||
* | | | [ticket/13804] Make template's user dependency optional | MateBartus | 2015-05-05 | 2 | -3/+43 |
| | | | | | | | | | | | | PHPBB3-13804 | ||||
* | | | [ticket/13638] Inject $filesystem in \phpbb\template\asset | Nicofuma | 2015-05-05 | 3 | -9/+29 |
| | | | | | | | | | | | | PHPBB3-13638 | ||||
* | | | [ticket/13638] Handle assets outside of phpbb_root_path | Nicofuma | 2015-05-04 | 1 | -3/+15 |
| | | | | | | | | | | | | PHPBB3-13638 | ||||
* | | | [ticket/13638] Prepend the assets path phpbb root | Nicofuma | 2015-05-04 | 1 | -2/+2 |
|/ / | | | | | | | PHPBB3-13638 | ||||
* | | [ticket/13762] Replace user service with lang in twig extension | MateBartus | 2015-05-02 | 1 | -6/+6 |
| | | | | | | | | PHPBB3-13762 | ||||
* | | [ticket/13697] Moving filesystem related functions to filesystem service | MateBartus | 2015-04-16 | 1 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697 | ||||
* | | [ticket/13132] Twig: Add loops content to the root context | Tristan Darricau | 2015-03-05 | 1 | -0/+6 |
| | | | | | | | | PHPBB3-13132 | ||||
* | | [ticket/13139] Fix tests | Nicofuma | 2015-02-03 | 1 | -0/+7 |
| | | | | | | | | PHPBB3-13139 | ||||
* | | [ticket/10388] Update deprecation comment | Matt Friedman | 2015-01-31 | 1 | -1/+2 |
| | | | | | | | | PHPBB3-10388 | ||||
* | | [ticket/10388] Update deprecation date for addslashes | Matt Friedman | 2015-01-29 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-10388 | ||||
* | | [ticket/10388] Use TWIG escape JS filter instead of addslashes | Matt Friedman | 2015-01-29 | 2 | -5/+5 |
| | | | | | | | | PHPBB3-10388 | ||||
* | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2015-01-20 | 1 | -4/+4 |
|\ \ | |/ | | | | | | | * develop-ascraeus: [ticket/13133] Fix variable name in set_custom_style() | ||||
| * | [ticket/13133] Fix variable name in set_custom_style() | Matt Friedman | 2015-01-20 | 1 | -4/+4 |
| | | | | | | | | PHPBB3-13133 | ||||
| * | Merge pull request #3099 from Senky/ticket/13266 | Joas Schilling | 2014-12-27 | 1 | -0/+5 |
| |\ | | | | | | | | | | [ticket/13266] Enabling twig dump function if DEBUG is defined | ||||
| | * | [ticket/13266] Enable twig dump function | Jakub Senko | 2014-11-01 | 1 | -0/+5 |
| | | | | | | | | | | | | PHPBB3-13266 | ||||
* | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -4/+28 |
|\ \ \ | |/ / | |||||
| * | | [ticket/13133] Rename $ok variable | Tristan Darricau | 2014-11-07 | 1 | -4/+4 |
| | | | | | | | | | | | | PHPBB3-13133 | ||||
| * | | [ticket/13133] Allow @vendor_name for includecss | Tristan Darricau | 2014-10-08 | 1 | -4/+28 |
| |/ | | | | | | | PHPBB3-13133 | ||||
* | | Merge branch 'develop-ascraeus' into develop | Andreas Fischer | 2014-09-23 | 1 | -3/+3 |
|\ \ | |/ | | | | | | | * develop-ascraeus: [ticket/13070] Use old 'template' class for template class hook | ||||
| * | [ticket/13070] Use old 'template' class for template class hook | Marc Alexander | 2014-09-22 | 1 | -3/+3 |
| | | | | | | | | PHPBB3-13070 | ||||
* | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-09-02 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | [ticket/12661] Add template test | Pico88 | 2014-08-24 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-12661 | ||||
| * | [ticket/12661] Load extensions templates from "all" folder by render() | Pico88 | 2014-08-24 | 1 | -0/+4 |
| | | | | | | | | PHPBB3-12661 | ||||
* | | [ticket/12957] Removed unused use | Tristan Darricau | 2014-08-10 | 1 | -3/+0 |
| | | | | | | | | PHPBB3-12957 | ||||
* | | [ticket/12957] Update the constructions of the template engine | Tristan Darricau | 2014-08-10 | 2 | -0/+6 |
| | | | | | | | | PHPBB3-12957 | ||||
* | | [ticket/11649] Fix coding style | Tristan Darricau | 2014-08-09 | 1 | -7/+9 |
| | | | | | | | | PHPBB3-11649 | ||||
* | | [ticket/11649] Expose Twig through the container | Tristan Darricau | 2014-08-09 | 2 | -30/+39 |
|/ | | | | PHPBB3-11649 | ||||
* | [ticket/12557] Template fixes | n-aleha | 2014-08-03 | 4 | -6/+7 |
| | | | | PHPBB3-12557 | ||||
* | [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop | Joas Schilling | 2014-07-25 | 1 | -20/+58 |
| | | | | | | | | We do not set S_NUM_ROWS while adding a row, to reduce the complexity If we would set it on adding, each subsequent adding would cause n modifications, resulting in a O(n!) complexity, rather then O(n) PHPBB3-12892 | ||||
* | [ticket/12781] Template regex for IF catch too many things | Tristan Darricau | 2014-06-27 | 1 | -1/+1 |
| | | | | PHPBB3-12781 | ||||
* | [ticket/12715] Cleanup comments in \phpbb\template\* | Tristan Darricau | 2014-06-15 | 19 | -124/+132 |
| | | | | PHPBB3-12715 | ||||
* | Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 | Yuriy Rusko | 2014-05-28 | 1 | -6/+26 |
|\ | |||||
| * | [ticket/12509] Add example in doc block | Tristan Darricau | 2014-05-27 | 1 | -0/+4 |
| | | | | | | | | PHPBB3-12509 | ||||
| * | [ticket/12509] Fix doc block | Tristan Darricau | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-12509 | ||||
| * | [ticket/12509] Fix the call to set_custom_file in adm/index and messenger | Tristan Darricau | 2014-05-13 | 1 | -3/+11 |
| | | | | | | | | PHPBB3-12509 | ||||
| * | [ticket/12509] Add an option to set the path of custom file for extensions | Tristan Darricau | 2014-05-13 | 1 | -5/+13 |
| | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12509 PHPBB3-12509 | ||||
* | | [ticket/12594] Remove @package tags and update file headers | Yuriy Rusko | 2014-05-27 | 27 | -85/+194 |
|/ | | | | PHPBB3-12594 | ||||
* | [ticket/12382] Allow nested loops in included files. | Nils Adermann | 2014-05-03 | 1 | -4/+11 |
| | | | | | | They have to reference the fully qualified loop name in BEGIN and END. PHPBB3-12382 | ||||
* | Merge remote-tracking branch 'rxu3/ticket/12224' into develop | Joas Schilling | 2014-03-10 | 3 | -0/+34 |
|\ | | | | | | | | | | | * rxu3/ticket/12224: [ticket/12224] Add assign_block_vars_array() test. [ticket/12224] Add template wrapper method to assign block arrays | ||||
| * | [ticket/12224] Add template wrapper method to assign block arrays | rxu | 2014-02-23 | 3 | -0/+34 |
| | | | | | | | | | | | | | | | | | | | | | | Add one more wrapper template method for the function assign_block_vars() which takes a 2-dimensional array as a parameter and calls assign_block_vars() in a loop to assign the whole block loop at once. This can make the core a little bit more expendable from the point of developing extensions as it allows to pass the data to events before it's being assigned to template. PHPBB3-12224 |