432f295baa
added a deprecation notice when using the spaceless tag
2019-03-10 09:05:07 +01:00
a65a807afa
Merge branch '1.x' into 2.x
...
* 1.x:
added a note about the performance of the spaceless filter
2019-03-10 09:00:42 +01:00
68bbf5eb85
added a note about the performance of the spaceless filter
2019-03-10 08:59:57 +01:00
fbb79d7752
removed dead code
2019-03-07 14:29:23 +01:00
64f7c02431
deprecated the spaceless tag
2019-03-07 11:02:32 +01:00
65ea4c5296
Merge branch '1.x' into 2.x
...
* 1.x:
Revert "re-implemented the spaceless tag to reuse the filter tag logic"
fixed CS
re-implemented the spaceless tag to reuse the filter tag logic
added a spaceless filter
removed unneeded usage of spaceless in tests
2019-03-07 10:59:18 +01:00
83efde6a4d
Revert "re-implemented the spaceless tag to reuse the filter tag logic"
...
This reverts commit 743767bce8
2019-03-07 10:58:47 +01:00
9956811bbc
feature #2872 Add spaceless filter (fabpot)
...
This PR was squashed before being merged into the 1.x branch (closes #2872 ).
Discussion
----------
Add spaceless filter
Commits
-------
a22a5c4b743767bcb823898e1ba79416
2019-03-07 10:24:21 +01:00
a22a5c4bd1
fixed CS
2019-03-07 10:20:57 +01:00
743767bce8
re-implemented the spaceless tag to reuse the filter tag logic
2019-03-07 10:18:51 +01:00
b823898ee1
added a spaceless filter
2019-03-07 10:18:51 +01:00
1ba7941656
removed unneeded usage of spaceless in tests
2019-03-07 08:03:42 +01:00
29a2e18e14
Merge branch '1.x' into 2.x
...
* 1.x:
fixed some issues
2019-03-06 22:09:35 +01:00
5d79776175
bug #2871 Fix some issues (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix some issues
Commits
-------
c58fa840
2019-03-06 22:09:17 +01:00
c58fa84054
fixed some issues
2019-03-06 22:08:00 +01:00
8254d07064
removed @internal tag on Twig\Template as the whole class is marked as internal
2019-03-06 18:46:56 +01:00
6ead78b202
Merge branch '1.x' into 2.x
...
* 1.x:
removed @internal tag on Twig\Template as the whole class is marked as internal
2019-03-06 18:44:06 +01:00
586d5cb411
removed @internal tag on Twig\Template as the whole class is marked as internal
2019-03-06 18:43:55 +01:00
1705b7a233
Merge branch '1.x' into 2.x
...
* 1.x:
removed some unneded phpdocs
2019-03-06 18:22:53 +01:00
19fd71eadd
removed some unneded phpdocs
2019-03-06 18:22:06 +01:00
fa8e07f754
fixed more un-namespaced classes
2019-03-06 18:19:14 +01:00
2717a4769b
fixed more un-namespaced classes
2019-03-06 18:17:28 +01:00
71e8e981c4
Merge branch '1.x' into 2.x
...
* 1.x:
fixed more un-namespaced classes
2019-03-06 18:10:47 +01:00
9b8c3a2344
fixed more un-namespaced classes
2019-03-06 18:10:39 +01:00
786eb012e0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed phpdocs
2019-03-06 15:58:01 +01:00
f75d9891b2
fixed phpdocs
2019-03-06 15:57:47 +01:00
47b5238c67
Merge branch '1.x' into 2.x
...
* 1.x:
moved some more PSR0 class names to namespaced ones
2019-03-06 14:02:19 +01:00
690f53f98c
minor #2869 Move some more PSR0 class names to namespaced ones (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Move some more PSR0 class names to namespaced ones
Commits
-------
4eb0c9da
2019-03-06 14:00:13 +01:00
4eb0c9da8e
moved some more PSR0 class names to namespaced ones
2019-03-06 13:58:28 +01:00
c5a9406e68
fixed typo
2019-03-06 13:28:15 +01:00
1958e6daf4
Merge branch '1.x' into 2.x
...
* 1.x:
fixed wrong usage of Error() constructor
2019-03-06 13:23:02 +01:00
e6b805c80d
fixed wrong usage of Error() constructor
2019-03-06 13:22:09 +01:00
3fbe43f965
fixed usage of ::class
2019-03-06 13:13:35 +01:00
bc479235b6
Merge branch '1.x' into 2.x
...
* 1.x:
removed mock usage in profile tests
2019-03-06 12:34:12 +01:00
dbb2183cce
minor #2868 Remove mock usage in profile tests (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Remove mock usage in profile tests
Commits
-------
3ae1e0b0
2019-03-06 12:32:50 +01:00
3ae1e0b0f2
removed mock usage in profile tests
2019-03-06 12:31:31 +01:00
5d263c0a38
updated CHANGELOG
2019-03-05 20:11:52 +01:00
2702126349
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked docs
Add max value to random function
2019-03-05 20:11:37 +01:00
f16405f797
tweaked docs
2019-03-05 20:08:13 +01:00
5a2c4f2220
feature #2698 Add max value to random function (SpacePossum)
...
This PR was merged into the 1.x branch.
Discussion
----------
Add max value to random function
Commits
-------
50b27061
2019-03-05 20:06:35 +01:00
4d781b323d
feature #2181 added deprecations for 2.x (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
added deprecations for 2.x
To be merged when we feel like there is enough changes for 3.0.
Commits
-------
379f0c35
2019-03-05 17:58:46 +01:00
0360afb1c1
Merge branch '1.x' into 2.x
...
* 1.x:
fixed typo
2019-03-05 13:47:04 +01:00
edb99c2e99
fixed typo
2019-03-05 13:46:34 +01:00
379f0c3553
added soe missing deprecations
2019-03-05 11:53:39 +01:00
2d52000798
added missing deprecated entry in the docs
2019-03-05 11:12:33 +01:00
5001301df9
Merge branch '1.x' into 2.x
...
* 1.x:
fixed doc markup
2019-03-05 11:11:07 +01:00
eaa29417ba
fixed doc markup
2019-03-05 11:07:38 +01:00
712c9d326c
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked deprecations messages to use namespaced classes
2019-03-05 10:40:39 +01:00
52e211732f
tweaked deprecations messages to use namespaced classes
2019-03-05 10:38:16 +01:00
84cb693f23
updated CHANGELOG
2019-03-05 10:32:09 +01:00
Fabien Potencier