mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-21 06:53:49 +02:00
Code Issues Releases Wiki Activity
29,373 Commits 18 Branches 192 Tags
Commit Graph

161 Commits

Author SHA1 Message Date
Marc Alexander
7a1f4d5008
Merge branch '3.1.x' into 3.2.x 2017-02-23 22:21:20 +01:00
Marc Alexander
9267235f30
Merge pull request #4605 from javiexin/ticket/14943 
[ticket/14943] Fix template loop access by index
 2017-02-23 22:21:16 +01:00
Marc Alexander
bdaa6e4909
Merge branch '3.1.x' into 3.2.x 2017-02-19 21:47:06 +01:00
Marc Alexander
481a592b8d
Merge pull request #4598 from javiexin/ticket/14944 
[ticket/14944] Add search for template loop indexes by key
 2017-02-19 21:47:00 +01:00
javiexin
849fd9df7d [ticket/14944] Add possibility to search for template loop indexes by key 
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.
Remove default parameter value.

PHPBB3-14944
 2017-01-28 21:34:08 +01:00
javiexin
d2ad751851 [ticket/14943] Fix template loop access by index 
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.
If block was empty, the insertion process should create it.
Checking for out of bounds indexes.

PHPBB3-14943
 2017-01-12 21:25:39 +01:00
javiexin
20c03cccdd [ticket/14944] Add possibility to search for template loop indexes by key 
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.

PHPBB3-14944
 2017-01-08 00:00:47 +01:00
Marc Alexander
166320ef9e
Merge branch '3.1.x' into 3.2.x 2017-01-06 15:29:40 +01:00
rxu
49c19a267f [ticket/14958] Optimize Twig extension lang() function 
PHPBB3-14958
 2017-01-05 00:42:27 +07:00
javiexin
45ea013b11 [ticket/14943] Fix template loop access by index 
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.

PHPBB3-14943
 2017-01-01 21:22:29 +01:00
javiexin
c656bd60ef [ticket/14944] Add possibility to search for template loop indexes by key 
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.

PHPBB3-14944
 2016-12-30 18:03:09 +01:00
Tristan Darricau
739081b045 Merge branch '3.1.x' into 3.2.x 2016-12-30 10:04:35 +01:00
javiexin
cff57f9076 [ticket/14944] Add possibility to search for template loop indexes by key 
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code.

PHPBB3-14944
 2016-12-28 12:55:26 +01:00
javiexin
d9991bdaf1 [ticket/14943] Fix template loop access by index 
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.

PHPBB3-14943
 2016-12-28 12:37:53 +01:00
Marc Alexander
a96fc3d87f
[ticket/14867] Revert back to twig 1.26.* and update dependencies 
The revert of twig back to 1.26.* is necessary due to a breaking
change in the way the Filesystem loader returns the paths to
template files.

PHPBB3-14867
 2016-11-16 21:39:29 +01:00
Marc Alexander
4d07f8a134
[ticket/14716] Update dependencies to latest versions 
This addresses some issues with symfony that resulted in
issues when open_basedir restrictions were enabled, as well
as issues with JPEG images in fast-image-size.
The phpBB class extending the twig lexer also had to be
modified to ensure compatibility after BC was broken by
the PR https://github.com/twigphp/Twig/pull/2182 for twig
1.27.

PHPBB3-14716
 2016-11-03 21:36:12 +01:00
Tristan Darricau
b2711371f1
[ticket/14807] s9e/textformatter 0.8.1 
PHPBB3-14807
 2016-10-10 20:07:33 +02:00
Tristan Darricau
7a5fbd0257
[ticket/14807] Updates Twig 
PHPBB3-14807
 2016-10-02 19:24:45 +02:00
lavigor
ff8b5058e0 [ticket/14661] Fix a typo in twig.php 
PHPBB3-14661
 2016-06-05 13:40:40 +03:00
Tristan Darricau
5cdbef860d [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer 
PHPBB3-13616
 2016-04-03 16:22:07 +02:00
Tristan Darricau
97bbf2d2b8 [ticket/14457] Handle the case where there isn't any 'definition' bag 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
99ace63e62 [ticket/14457] Don't set CSS to JS and JS to CSS 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
f7c5098c60 [ticket/14457] CS 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
f253a853b8 [ticket/14457] Fix twig/twig::assign_display 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
d34ffda9c1 [ticket/14457] Uses a random placeholder to inject css and js 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Marc Alexander
94f87d9318 [ticket/14446] Add predefined placeholder variables to twig definition 
PHPBB3-14446
 2016-02-02 17:13:47 +01:00
Tristan Darricau
e91b1fa464 [ticket/13717] Fix tests 
PHPBB3-13717
 2016-01-25 00:31:45 +01:00
Tristan Darricau
52b3d54805 [ticket/13717] Set the assets after rendering the whole template 
The goal being to be able to call INCLUDECSS/JS from anywhere in any tempalte or event

PHPBB3-13717
 2016-01-25 00:31:45 +01:00
Marc Alexander
73e6e5b77f [ticket/13454] Remove unused variables 
This is the first part of the changes. More to come.

PHPBB3-13454
 2016-01-06 13:51:19 +01:00
Tristan Darricau
4c00474845 [ticket/12633] Doesn't use DEBUG to debug templates events 
Check the templates events on runtime only when Twig debug is on

PHPBB3-12633
 2015-09-18 21:23:34 +02:00
Nicofuma
8e5e954438 [ticket/13645] Move the feeds to controllers 
PHPBB3-13645
 2015-08-23 22:36:10 +02:00
Tristan Darricau
5f905f67ee [ticket/14099] Fix the assets 
PHPBB3-14099
 2015-08-18 21:03:03 +02:00
Tristan Darricau
a83bcaa8ac [ticket/14099] Fix tests 
PHPBB3-14099
 2015-08-14 15:52:35 +02:00
Marc Alexander
01097a24b5 Merge branch '3.1.x' 
Conflicts:
	tests/template/template_includecss_test.php
 2015-07-08 22:54:26 +02:00
Matt Friedman
498a516017 [ticket/13995] Remove deprecated projection media type 
PHPBB3-13995
 2015-07-07 20:09:01 -07:00
Nils Adermann
f958d05aed Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2015-05-30 10:58:40 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
Joas Schilling
3b91b243b0 Merge branch '3.1.x' 2015-05-16 13:40:07 +02:00
Oliver Schramm
cddecec146 Merge pull request #3591 from Nicofuma/ticket/12632 
[ticket/12632] Add twig.debug and twig.auto_reload in config.yml
 2015-05-16 00:30:19 +02:00
Nicofuma
62e13e945c [ticket/13838] Fix coding style 
PHPBB3-13838
 2015-05-14 15:43:44 +02:00
MateBartus
281f2ef2da [ticket/13804] Remove unnecessary array_merge 
PHPBB3-13804
 2015-05-11 16:59:26 +02:00
MateBartus
7b301e22f3 [ticket/13804] Make template's user dependency optional 
PHPBB3-13804
 2015-05-05 19:16:49 +02:00
Nicofuma
51376a4391 [ticket/13638] Inject $filesystem in \phpbb\template\asset 
PHPBB3-13638
 2015-05-05 17:07:11 +02:00
Nicofuma
f097f84f16 [ticket/13638] Handle assets outside of phpbb_root_path 
PHPBB3-13638
 2015-05-04 23:23:40 +02:00
Nicofuma
3b631cb40d [ticket/13638] Prepend the assets path phpbb root 
PHPBB3-13638
 2015-05-04 23:23:18 +02:00
Tristan Darricau
f821130c3a [ticket/12632] Add twig.debug and twig.auto_reload in config.yml 
PHPBB3-13206
PHPBB3-12632
 2015-05-04 14:43:58 +02:00
MateBartus
9a99c9e4b1 [ticket/13762] Replace user service with lang in twig extension 
PHPBB3-13762
 2015-05-02 13:37:13 +02:00
MateBartus
4bdef6fd21 [ticket/13697] Moving filesystem related functions to filesystem service 
* 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
 2015-04-16 13:24:10 +02:00
Tristan Darricau
cf39cfc593 [ticket/13132] Twig: Add loops content to the root context 
PHPBB3-13132
 2015-03-05 21:38:59 +01:00