aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15538] Allow array of icons: icon_name => booleanmrgoldy2019-11-301-0/+44
| | | | PHPBB3-15538
* [ticket/15538] 404 SVG and viewBoxmrgoldy2019-11-301-5/+24
| | | | PHPBB3-15538
* [ticket/15538] Drop templates and icons folder, twig file extensionmrgoldy2019-11-304-9/+9
| | | | PHPBB3-15538
* [ticket/15538] Update 404 source path to all/imgsmrgoldy2019-11-271-2/+2
| | | | PHPBB3-15538
* [ticket/15538] Style inheritance for PNG and a default 'no icon'mrgoldy2019-11-261-1/+37
| | | | PHPBB3-15538
* [ticket/15538] Add iconify source classmrgoldy2019-11-181-3/+3
| | | | PHPBB3-15538
* [ticket/15538] Adjust classes to include o-icon-mrgoldy2019-11-141-10/+10
| | | | PHPBB3-15538
* [ticket/15538] Move style icon files to all/templates/macros/mrgoldy2019-11-121-1/+1
| | | | PHPBB3-15538
* [ticket/15538] Remove fa: from iconify functionmrgoldy2019-11-101-3/+3
| | | | PHPBB3-15538
* [ticket/15538] Amend iconfiy to data attributesmrgoldy2019-11-071-2/+2
| | | | PHPBB3-15538
* [ticket/15538] Add iconifymrgoldy2019-11-061-0/+31
| | | | PHPBB3-15538
* [ticket/15538] Amend style name and remove set_stylemrgoldy2019-10-311-4/+4
| | | | PHPBB3-15538
* [ticket/15538] Add icon testsmrgoldy2019-10-315-6/+179
| | | | PHPBB3-15538
* [ticket/15905] Adjust tests for twig extensions for master branchMarc Alexander2019-09-281-3/+5
| | | | PHPBB3-15905
* Merge branch '3.3.x'Marc Alexander2019-09-284-0/+261
|\
| * [ticket/15905] Reset avatar manager enabled drivers propertyMarc Alexander2019-09-281-0/+5
| | | | | | | | PHPBB3-15905
| * [ticket/15905] Add tests for twig extensionsMarc Alexander2019-09-264-0/+256
| | | | | | | | PHPBB3-15905
| * [ticket/15905] Try it without authmrgoldy2019-09-255-15/+5
| | | | | | | | PHPBB3-15905
| * [ticket/15905] Try with existing phpbb extensionmrgoldy2019-09-255-5/+15
| | | | | | | | PHPBB3-15905
| * [ticket/14948] Adjust calls for twig and phpunit updatesMarc Alexander2019-05-094-7/+7
| | | | | | | | PHPBB3-14948
| * [ticket/15508] Remove call to getEnvironment() from parserFrançois-Xavier de Guillebon2019-05-095-5/+5
| | | | | | | | PHPBB3-15508
| * [ticket/14972] Migrate from deprecated getMock() method to createMock()rxu2019-05-085-5/+5
| | | | | | | | PHPBB3-14972
| * Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-09-091-1/+1
| |\
* | | [ticket/14948] Adjust calls for twig and phpunit updatesMarc Alexander2019-01-024-7/+7
| | | | | | | | | | | | PHPBB3-14948
* | | Merge pull request #5090 from deguif/twig-2Marc Alexander2018-12-255-5/+5
|\ \ \ | | | | | | | | | | | | [ticket/15508] Support Twig 2.x
| * | | [ticket/15508] Remove call to getEnvironment() from parserFrançois-Xavier de Guillebon2018-01-165-5/+5
| | | | | | | | | | | | | | | | PHPBB3-15508
* | | | Merge branch '3.2.x' into ticket/15746-masterMarc Alexander2018-08-261-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-08-211-1/+1
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | [ticket/15746] Adjust tests after twig updateMarc Alexander2018-08-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15746
* | | | Merge branch '3.2.x'Tristan Darricau2018-07-081-0/+96
|\| | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/15659] Fix retrieve_block_vars()
| * | | [ticket/15659] Fix retrieve_block_vars()Jakub Senko2018-07-071-0/+96
| |/ / | | | | | | | | | PHPBB3-15659
* | / Merge branch '3.2.x'Marc Alexander2018-01-172-20/+20
|\| | | |/ |/|
| * [ticket/15099] Fix testsJakub Senko2018-01-172-20/+20
| | | | | | | | PHPBB3-15099
* | Merge branch '3.2.x'Marc Alexander2017-11-012-0/+43
|\|
| * [ticket/14994] Refactor template->assign_block_varjaviexin2017-11-012-0/+43
| | | | | | | | | | | | | | | | | | | | Refactor assign_block_var to use the same block selection mechanism as is used in alter_block_array. This allows creating new blocks at any position in the template structure, not only on the last block. Allows selecting a block as outer[2].middle. Added tests. PHPBB3-14994
* | [ticket/15253] Fix rebaseRubén Calvo2017-07-201-5/+0
| | | | | | | | PHPBB3-15253
* | [ticket/15253] Update importsRubén Calvo2017-07-201-1/+3
| | | | | | | | PHPBB3-15253
* | [ticket/15253] Move storage helper to filesystemRubén Calvo2017-07-201-1/+1
| | | | | | | | PHPBB3-15253
* | [ticket/15253] Use storage helper methods instead of filesystem methodsRubén Calvo2017-07-206-11/+10
| | | | | | | | PHPBB3-15253
* | [ticket/14972] Migrate from deprecated getMock() method to createMock()rxu2017-07-175-5/+5
|/ | | | PHPBB3-14972
* Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.xMarc Alexander2017-05-291-0/+31
|\
| * Merge branch 'ticket/15068' of https://github.com/javiexin/phpbb into ↵javiexin2017-05-2126-25/+723
| |\ | | | | | | | | | ticket/15068
| * | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-05-211-0/+31
| | | | | | | | | | | | | | | | | | Added tests. PHPBB3-15068
* | | [ticket/14990] Move dispatcher object to the front of the options arrayrxu2017-04-165-0/+5
| | | | | | | | | | | | PHPBB3-14990
* | | Merge pull request #4612 from javiexin/ticket/14950Marc Alexander2017-04-151-1/+50
|\ \ \ | |_|/ |/| | | | | [ticket/14950] Add possibility to delete a template block
| * | [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new mode to alter_block_array to allow for the deletion of a certain block of template variables. The selection method is the same as for the other modes for alter_block_array. The passed in vararray is ignored, and an out of bounds index is considered an error. Added tests for the new function, fixed. PHPBB3-14950
| * | [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new mode to alter_block_array to allow for the deletion of a certain block of template variables. The selection method is the same as for the other modes for alter_block_array. The passed in vararray is ignored, and an out of bounds index is considered an error. Added tests for the new function, fixed. PHPBB3-14950
| * | [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new mode to alter_block_array to allow for the deletion of a certain block of template variables. The selection method is the same as for the other modes for alter_block_array. The passed in vararray is ignored, and an out of bounds index is considered an error. Added tests for the new function, fixed. PHPBB3-14950
| * | [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-071-0/+42
| |/ | | | | | | | | | | | | | | | | | | Adds a new mode to alter_block_array to allow for the deletion of a certain block of template variables. The selection method is the same as for the other modes for alter_block_array. The passed in vararray is ignored, and an out of bounds index is considered an error. Added tests for the new function. PHPBB3-14950
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-231-2/+129
|\ \