Commit Graph

57 Commits

Author SHA1 Message Date
Fabien Potencier 620613ced8 Merge branch '1.x'
* 1.x: (23 commits)
  changed a test to make it more robust
  bumped version to 1.24.3-DEV
  prepared the 1.24.2 release
  updated CHANGELOG
  Floor - use cast and not intval
  fixed CS
  Do not mix indention levels
  fixed typo
  Add Visual Studio Code to the list of IDE integrations
  Fixed all deprecation notices by using
  [Doc] Fixed small error in code example
  Update macro.rst
  Update use.rst
  Fix exception message for static method and object without req. params.
  add named macro end-tag documentation
  fixed CS
  Fix load cache
  Minor rst syntax tweaks
  Reset blocks also in doLeaveNode
  fix a case where the autoescaping does not work as expected
  ...
2016-09-18 18:58:25 -07:00
Javier Eguiluz b42ddb3989 Minor rst syntax tweaks 2016-06-13 10:25:29 +02:00
Shaun 02a7bd6d7e Remove reference to String loader in docs 2015-07-06 15:43:15 -04:00
Fabien Potencier fe67c5ba3a Merge branch '1.x'
* 1.x:
  updated CHANGELOG
  reverted unexpected change
  fixed previous merge
  Organize and show value types
  Added label for "Whitespace Control" section
  Added note about case sensitivity of logic operators
  Fixed CS
  Fixed error guessing for nested templates
  Travis no longer supports hhvm-nightly
  fixed CS
  Added an example for "and" on if statment
  Updated exception messages for null vars in Twig_Template::getAttribute().
  Use stubs for profiles. Fixes #1660

Conflicts:
	doc/api.rst
2015-06-07 01:29:09 +02:00
Fabien Potencier d0b71307d6 fixed previous merge 2015-06-07 01:22:13 +02:00
Kevin Simper 0a46d06069 Organize and show value types 2015-06-07 01:19:31 +02:00
Fabien Potencier 56e515b64e Merge branch '1.x'
* 1.x:
  Fix two failed unit tests on Windows:
  updated CHANGELOG
  Reduce the name of the cache directories to 1 character
  clean ups
  bumped version to 1.18.2-DEV
  prepared the 1.18.1 release
  updated CHANGELOG
  Cleanup API - make the compiler happy
  Fixed memory leaks
  tweaked docs about the C extension
  removed an obsolete recipe

Conflicts:
	CHANGELOG
	doc/api.rst
	doc/recipes.rst
	ext/twig/php_twig.h
	lib/Twig/Environment.php
	lib/Twig/NodeTraverser.php
	lib/Twig/Template.php
2015-05-16 16:12:48 +02:00
Fabien Potencier 72cc7d8081 removed obsolete docs 2015-03-02 18:32:57 +01:00
Fabien Potencier cb732490a3 removed an obsolete recipe 2015-03-02 18:29:18 +01:00
Fabien Potencier 886b863dcb removed the Autoloader as Composer provide one 2015-03-02 17:40:39 +01:00
Fabien Potencier 6c3febca9e removed pre-1.8 autoescape tag syntax, removed true as a valid autoescape strategy 2015-03-02 17:40:38 +01:00
Fabien Potencier bb30b98706 udpated the docs for 2.0 2015-03-02 17:40:20 +01:00
Fabien Potencier 4408caae0c added a profiler 2015-01-20 03:04:00 +01:00
Fabien Potencier 01ab6f317b added some more tests for the filename autoescape strategy 2015-01-14 07:56:45 +01:00
Fabien Potencier 4481bf5f38 added an escaping strategy based on the template filename extension 2015-01-13 16:33:59 +01:00
Fabien Schurter 882f44b0d3 Correct base template name
The base template name used in $loader1 and $loader2 is actually
"base.html", not "base.twig".
2014-10-16 09:32:46 +02:00
Fabien Potencier d12f7afbbe made it clear that Twig_Loader_String must not be used by end users 2014-10-11 22:30:59 +02:00
Philipp Rieber a21df952ab [Docs] Some minor fixes: Typos, Notations 2013-11-23 21:51:26 +01:00
Fabien Potencier fd9643071c fixed doc markup (closes #1106) 2013-05-27 08:04:18 +02:00
Bilal Amarni 12a5d026ed [doc] switched a BC call 2013-05-13 13:14:39 +02:00
Fabien Potencier 81af6a1fd1 removed list of built-in items in the docs in favor of a link (easier to maintain and better for discoverability) 2013-01-31 11:19:12 +01:00
Javier Eguiluz aac6cb613c Fixes and minor additions to the docs. 2013-01-31 09:30:58 +01:00
Fabien Potencier cd4ab0fde6 renamed the raw tag to verbatim to avoid confusion with the raw filter 2013-01-05 08:57:34 +01:00
Fabien Potencier 0a7b37b8cc changed the way extension filters/tests/functions/node visitors/globals/token parsers are registered (they were loaded as late as possible, they are now loaded as early as possible) 2012-11-18 10:39:05 +01:00
Fabien Potencier 1881045806 added a note about double-escaping when using a variable for the strategy (closes #868) 2012-10-30 10:27:26 +01:00
Fabien Potencier d59642c949 added missing documentation about Twig_Loader_Chain 2012-10-28 15:19:48 +01:00
Fabien Potencier 244eaf53b3 updated the docs for the new Twig_ExistsLoaderInterface interface 2012-10-19 14:36:16 +02:00
Fabien Potencier 82334f876f merged branch Adel-E/update-api-docs (PR #858)
This PR was merged into the master branch.

Commits
-------

bee4cd1 Update doc to correspond to the following: http://twig.sensiolabs.org/documentation http://twig.sensiolabs.org/doc/filters/escape.html

Discussion
----------

Update api docs

Update doc to correspond to the following:
http://twig.sensiolabs.org/documentation
http://twig.sensiolabs.org/doc/filters/escape.html
2012-10-13 21:01:24 +02:00
eadel bee4cd12db Update doc to correspond to the following:
http://twig.sensiolabs.org/documentation
http://twig.sensiolabs.org/doc/filters/escape.html
2012-10-12 21:51:42 +00:00
Fabien Potencier c38e06ff41 added missing information in the doc 2012-09-16 16:38:44 +02:00
Fabien Potencier 942607245c tweaked documentation 2012-07-22 13:52:31 +02:00
Fabien Potencier c34541dfb3 changed notation of namespaced templates to @namespace/template_path 2012-07-22 13:52:31 +02:00
Fabien Potencier 0eb4d01d92 added namespaced templates support in Twig_Loader_Filesystem 2012-07-22 13:52:31 +02:00
Fabien Potencier c24ea1bcc1 added Twig_Loader_Filesystem::prependPath() 2012-07-22 13:52:09 +02:00
Fabien Potencier 17e2c36a58 refactored the loader documentation 2012-07-14 16:10:03 +02:00
Fabien Potencier e862905708 clarified usage of the string and array loaders 2012-07-13 08:31:08 +02:00
Fabien Potencier 7657c01e65 added support for more escaping strategies (url, css, and html_attr) 2012-06-27 09:26:36 +02:00
Fabien Potencier 0d5dbedef5 fixed escaping when a project defines a function named html or js (closes #724) 2012-06-14 17:00:45 +02:00
Fabien Potencier 5923f0cbad fixed markup in the doc 2012-04-27 17:50:30 +02:00
Fabien Potencier 2a2aeee8e0 tweaked doc 2012-04-27 14:21:26 +02:00
Fabien Potencier 3697ef4a3e added a new recipe 2012-04-27 14:18:22 +02:00
Fabien Potencier 75d97b4a27 made the autoescape tag argument optional (defaults to 'html') 2012-04-25 18:22:58 +02:00
Fabien Potencier 109db731ca changed the autoescape option to also accept a supported escaping strategy (for BC, true is equivalent to html) 2012-04-25 07:12:34 +02:00
Fabien Potencier fbacbe60ad added some more information about unknown variable/attributes in the doc (closes #685) 2012-04-05 22:53:39 +02:00
Tobias Schultze 83a30739b4 typo 2012-01-19 11:11:49 +01:00
Fabien Potencier 96596d5c7f fixed typo in doc (closes #604) 2012-01-19 10:31:26 +01:00
Fabien Potencier 8d00b42e56 changed the documentation to advertize null as begin the null value and none as an alias 2011-10-29 14:53:37 +02:00
Fabien Potencier d65366e772 simplified intro and added a not about the render() method in docs 2011-09-26 11:19:36 +02:00
Fabien Potencier c20116ee8d fixed documentation for the sandbox security policy 2011-01-12 10:39:35 +01:00
Fabien Potencier 3cbcc1f47b removed references to old Twig versions in the doc 2010-12-31 15:40:16 +01:00