Commit Graph

13 Commits

Author SHA1 Message Date
bzick
bd5557925d Merge remote-tracking branch 'remotes/origin/master' into develop
# Conflicts:
#	src/Fenom.php
2015-06-03 11:36:19 +03:00
Pavel Belousov
fd777eb606 Update ignore.md
Добавил описание модификатора `:ignore, его логично упомянуть в этом файле.
2015-05-05 19:33:46 +03:00
bzick
83fbfb1fca Merge branch 'origin/master'
Conflicts:
	src/Fenom/Template.php
	tests/cases/Fenom/SandboxTest.php
2015-02-22 11:32:11 +03:00
Pavel Belousov
89f9da8c9d fix typo 2015-02-14 04:16:51 +03:00
bzick
ed860a49cb Add range support. Tag {for} now deprecated 2015-02-12 12:13:35 +03:00
bzick
bc73e5b733 Merge branch 'master' into develop
Conflicts:
	docs/ru/syntax.md
	sandbox/fenom.php
2015-01-02 22:48:56 +03:00
bzick
e0a3cc3a0d Docs 2014-10-31 00:24:56 +03:00
Pavel Belousov
435fd15a67 Исправил опечатки 2014-09-08 01:17:48 +04:00
bzick
bb8d351e93 Merge branch 'origin/master'
Conflicts:
	docs/ru/tags/raw.md
2014-08-08 16:04:37 +04:00
bzick
72b4e36585 Translate tags's documentation 2014-08-06 22:42:42 +04:00
bzick
6329765572 Update dosc and add tags {set} and {add} 2014-08-05 17:49:42 +04:00
Pavel Belousov
c5217075ca опечатка в слове {/autoescape} 2014-08-05 00:40:58 +04:00
bzick
5972884c80 Add russian docs 2014-08-01 12:12:19 +04:00