geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-28 16:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,594 Commits 25 Branches 275 Tags
3d1e5f64936608fbf567ae0cdc15b9b028595212
Commit Graph

74 Commits

Author SHA1 Message Date
Fabien Potencier 3d1e5f6493 bumped version to 2.11 2019-05-17 08:23:38 +02:00
Fabien Potencier f597addf79 bumped version to 2.10.1-DEV 2019-05-14 14:04:22 +02:00
Fabien Potencier 5240e21982 prepared the 2.10.0 release 2019-05-14 14:03:52 +02:00
Fabien Potencier cf733f4f96 bumped version to 2.10 2019-05-03 10:33:50 +02:00
Fabien Potencier 6463d6377d bumped version to 2.9.1-DEV 2019-04-28 07:58:23 +01:00
Fabien Potencier 82a1c055c8 prepared the 2.9.0 release 2019-04-28 07:57:38 +01:00
Fabien Potencier 1047421df5 bumped version to 2.9 2019-04-24 16:59:53 +02:00
Fabien Potencier ca07526840 bumped version to 2.8.2-DEV 2019-04-16 19:15:29 +02:00
Fabien Potencier 91cc2594d3 prepared the 2.8.1 release 2019-04-16 19:14:24 +02:00
Fabien Potencier d15d794edf fixed bad merge 2019-04-16 17:49:34 +02:00
Fabien Potencier a90d984587 Merge branch '1.x' into 2.x 
* 1.x:
  fixed various small bugs
  bumped version to 1.39.1-DEV
  prepared the 1.39.0 release
 2019-04-16 17:41:34 +02:00
Fabien Potencier d2cd4d9cfa fixed various small bugs 2019-04-16 17:33:43 +02:00
Fabien Potencier 330b524733 bumped version to 2.8.1-DEV 2019-04-16 14:36:57 +02:00
Fabien Potencier 26517b0e87 prepared the 2.8.0 release 2019-04-16 14:36:25 +02:00
Fabien Potencier f8b076b949 bumped version to 1.39.1-DEV 2019-04-16 14:35:41 +02:00
Fabien Potencier 44890db076 prepared the 1.39.0 release 2019-04-16 14:35:10 +02:00
Fabien Potencier 71a769afdf revert 1.x merge 2019-04-11 12:09:41 +02:00
Fabien Potencier ebbac72097 Merge branch '1.x' into 2.x 
* 1.x:
  fixed compat with PHP 5
 2019-04-11 12:09:17 +02:00
Fabien Potencier d0a3c239e2 fixed compat with PHP 5 2019-04-11 12:09:12 +02:00
Fabien Potencier cf98f334e8 Merge branch '1.x' into 2.x 
* 1.x:
  added the possibility to give a nice name to string templates
  added the possibility to give a nice name to string templates
 2019-04-11 09:58:10 +02:00
Fabien Potencier d7e2e5418c added the possibility to give a nice name to string templates 2019-04-11 09:55:43 +02:00
Thomas Landauer 40fd7c4f86 added the possibility to give a nice name to string templates 2019-04-11 09:55:26 +02:00
Fabien Potencier 67ffbe5b7e Merge branch '1.x' into 2.x 
* 1.x:
  fixed "include" with "ignore missing" when an error loading occurs in the included template (again)
  fixed "include" with "ignore missing" when an error loading occurs in the included template
 2019-04-06 16:41:57 +02:00
Fabien Potencier 8ea68e06e4 fixed "include" with "ignore missing" when an error loading occurs in the included template (again) 2019-04-06 16:10:33 +02:00
Fabien Potencier 9acd647214 bumped version to 2.8 2019-04-03 15:57:27 +02:00
Fabien Potencier 10cb211d93 bumped version to 1.39 2019-04-03 10:28:54 +02:00
Christian Flothmann cee2971024 fix major version in Environment 2019-03-25 12:40:05 +01:00
Fabien Potencier 7597a742b7 bumped version to 2.7.5-DEV 2019-03-23 15:29:24 +01:00
Fabien Potencier ed9c49220e prepared the 2.7.4 release 2019-03-23 15:28:58 +01:00
Fabien Potencier 37d4180766 bumped version to 1.38.5-DEV 2019-03-23 15:27:48 +01:00
Fabien Potencier 7732e9e701 prepared the 1.38.4 release 2019-03-23 15:27:19 +01:00
Fabien Potencier e6d2f8b33d bumped version to 2.7.4-DEV 2019-03-21 15:53:34 +01:00
Fabien Potencier 52b9a5bd41 prepared the 2.7.3 release 2019-03-21 15:53:02 +01:00
Fabien Potencier deab8a7745 bumped version to 1.38.4-DEV 2019-03-21 15:50:42 +01:00
Fabien Potencier 5df0ef0ca2 prepared the 1.38.3 release 2019-03-21 15:50:13 +01:00
Fabien Potencier 6d35153bd2 updated CHANGELOG 2019-03-15 17:32:56 +01:00
Fabien Potencier b24d52565a fixed BC break on Environment::resolveTemplate() 2019-03-15 17:25:18 +01:00
Fabien Potencier ab0374f82c bumped version to 2.7.3-DEV 2019-03-12 19:48:55 +01:00
Fabien Potencier 70c59531da prepared the 2.7.2 release 2019-03-12 19:48:26 +01:00
Fabien Potencier dae3b1cead bumped version to 1.38.3-DEV 2019-03-12 19:46:15 +01:00
Fabien Potencier 874adbd922 prepared the 1.38.2 release 2019-03-12 19:45:24 +01:00
Fabien Potencier b59a77e884 bumped version to 2.7.2-DEV 2019-03-12 16:47:45 +01:00
Fabien Potencier c0dd4dc5f4 prepared the 2.7.1 release 2019-03-12 16:45:07 +01:00
Fabien Potencier b0d8cd7788 bumped version to 1.38.2-DEV 2019-03-12 16:43:49 +01:00
Fabien Potencier 88fc6d1454 prepared the 1.38.1 release 2019-03-12 16:43:04 +01:00
Fabien Potencier 2fe2f2d8bb bumped version to 2.7.1-DEV 2019-03-12 13:47:01 +01:00
Fabien Potencier 57bd838bb7 prepared the 2.7.0 release 2019-03-12 13:46:23 +01:00
Fabien Potencier 47297c2ae9 bumped version to 1.38.1-DEV 2019-03-12 13:43:05 +01:00
Fabien Potencier 754b8dfc00 prepared the 1.38.0 release 2019-03-12 13:42:04 +01:00
Fabien Potencier 34cccc77f0 Merge branch '1.x' into 2.x 
* 1.x:
  removed one usage of Template vs TemplateWrapper
 2019-03-12 11:17:32 +01:00