336d69c166
fixed CS
2019-08-07 20:54:50 +02:00
d0c0f7e3b0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed the "empty" test on Traversable instances
avoid confusion between .. and ..
2019-08-07 17:07:59 +02:00
b202fe3809
fixed the "empty" test on Traversable instances
2019-08-07 17:02:01 +02:00
2a32f38be7
fixed phpdocs
2019-08-07 16:22:21 +02:00
472cb913fd
feature #3094 Add extra argument to filter column (DarkBee)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add extra argument to filter column
Added optional argument to `twig_array_column`, `$index_key`, to reflect proper arguments for underlaying `PHP` function `column`
Commits
-------
7ca47f2e
2019-08-07 16:21:35 +02:00
6ce9beb9fd
moved css_class function to html_classes filter
2019-08-07 16:09:15 +02:00
2200d837ef
Added support for css_class function
2019-08-07 15:57:33 +02:00
debc5c3ca5
fixed wrong registration
2019-08-07 15:44:55 +02:00
220e75065a
added the data_uri filter
2019-08-07 14:42:44 +02:00
87391f5692
bumped version
2019-08-07 14:00:00 +02:00
03dbdb9683
Merge branch '1.x' into 2.x
...
* 1.x:
Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
2019-08-02 10:10:18 +02:00
d0550b7a68
Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
2019-08-01 16:18:22 +02:00
7ca47f2edd
Update CoreExtension.php
...
Added optional argument to `twig_array_column`, `$index_key`, to reflect proper arguments for underlaying `PHP` function `column`
2019-07-24 14:07:14 +02:00
744af47848
Merge branch '1.x' into 2.x
...
* 1.x:
updated CHANGELOG
tweaked code
Extend opcache check if it is enabled
2019-07-12 09:12:46 +03:00
5c8c41853b
tweaked code
2019-07-12 09:11:27 +03:00
6e68bd0815
Extend opcache check if it is enabled
...
When trying to deploy October on shared hosting (www.websupport.sk) I received following error when accessing the frontend pages - ErrorException:> Zend OPcache API is restricted by "restrict_api" configuration directive.
Backend was working normally.
I propose the following change to check not only if the opcache_invalidate exists but also if opcache is enabled.
The change was also needed in octobercms files, but to correspond I am also proposing to add it directly to twig.
2019-07-12 09:09:42 +03:00
95352743eb
fixed using macros in arrow functions
2019-07-03 20:17:43 +02:00
1190d3d420
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
[1.x] Patch split filter
[doc] "map" filter: fix args order (value, key)
2019-06-25 12:53:42 +02:00
5e74239e8c
fixed CS
2019-06-25 07:36:40 +02:00
4c4df962ee
[1.x] Patch split filter
2019-06-25 07:34:58 +02:00
86dc3ba3bb
bumped version to 2.11.4-DEV
2019-06-18 17:37:46 +02:00
699ed23425
prepared the 2.11.3 release
2019-06-18 17:37:11 +02:00
5c9ec4d4a3
bumped version to 1.42.3-DEV
2019-06-18 17:36:05 +02:00
21707d6ebd
prepared the 1.42.2 release
2019-06-18 17:35:16 +02:00
29ad145dd8
fixed the filter filter
2019-06-14 07:36:32 +02:00
b957ff6f29
Merge branch '1.x' into 2.x
...
* 1.x:
Don't clear PHP buffer when an error occurs with debug=true
Remove duplicate phpdoc
2019-06-10 19:37:27 +02:00
0390a9d846
bug #3059 Don't clear PHP buffer when an error occurs with debug=true (lyrixx)
...
This PR was squashed before being merged into the 1.x branch (closes #3059 ).
Discussion
----------
Don't clear PHP buffer when an error occurs with debug=true
fixes #3058
Commits
-------
c910e71f
2019-06-10 19:37:02 +02:00
c910e71f5a
Don't clear PHP buffer when an error occurs with debug=true
2019-06-10 19:36:53 +02:00
2c1c00ba0e
Remove duplicate phpdoc
2019-06-10 12:15:10 +02:00
197528f45c
fixed macro auto-import when a template contains only macros
2019-06-06 10:15:08 +02:00
1a3dc0aab0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed end of constructor node logic
2019-06-06 10:08:52 +02:00
8a29b42df9
fixed end of constructor node logic
2019-06-06 10:03:25 +02:00
5f517f0b80
bumped version to 2.11.3-DEV
2019-06-05 13:17:48 +02:00
84a463403d
prepared the 2.11.2 release
2019-06-05 13:17:07 +02:00
95212c93e8
bug #3054 Fix typo (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix typo
closes #3051
Commits
-------
57c51301
2019-06-05 13:12:51 +02:00
57c51301c9
fixed macro auto-import
2019-06-05 13:11:42 +02:00
09c6116938
bumped version to 2.12
2019-06-05 05:13:06 +02:00
3cd635bf91
bumped version to 2.11.2-DEV
2019-06-04 13:33:20 +02:00
0418e17113
prepared the 2.11.1 release
2019-06-04 13:32:47 +02:00
e0ee3b5e44
bumped version to 1.42.2-DEV
2019-06-04 13:31:48 +02:00
6713476037
prepared the 1.42.1 release
2019-06-04 13:31:08 +02:00
43bc74a7d0
Merge branch '1.x' into 2.x
...
* 1.x:
added support for "Twig\Markup" instances in the "in" test (again)
2019-06-03 18:38:09 +02:00
2218cfe26b
added support for "Twig\Markup" instances in the "in" test (again)
2019-06-03 18:20:29 +02:00
4497083325
Fixed: Endless loop if more than one parent without the macro exists
2019-06-03 15:30:23 +02:00
3fde1536d3
Merge branch '1.x' into 2.x
...
* 1.x:
allowed string operators as variables names in assignments
2019-06-03 12:15:17 +02:00
5835c2344f
allowed string operators as variables names in assignments
2019-06-03 11:58:56 +02:00
21ecf010a3
fixed macro inheritance
2019-06-03 11:11:17 +02:00
0a5d8cf037
bumped version to 2.11.1-DEV
2019-05-31 08:22:20 +02:00
c344879ae5
prepared the 2.11.0 release
2019-05-31 08:21:42 +02:00
0a63973675
bumped version to 1.42.1-DEV
2019-05-31 08:20:41 +02:00
Fabien Potencier
Grégoire Pineau
Nicolas Grekas
DarkBee
vosco88
Adrian Suter
Tim van Dijen
Savas Ziplies