Commit Graph

558 Commits

Author SHA1 Message Date
Pavel Belousov
fd777eb606 Update ignore.md
Добавил описание модификатора `:ignore, его логично упомянуть в этом файле.
2015-05-05 19:33:46 +03:00
Ivan Shalganov
7f05e13725 Merge pull request #164 from fenom-template/develop
Fix: parse error if macro defined without arguments
2015-04-26 22:32:22 +03:00
bzick
9269b6b4ad Fix: parse error if macro defined without arguments 2015-04-26 22:24:20 +03:00
Ivan Shalganov
034b4b7f14 Merge pull request #161 from Sleuthhound/master
Fix typo, version
2015-03-10 10:47:49 +03:00
Anton Popov
4d11eeed0d Fix typo, version 2015-03-08 11:17:14 +05:00
Ivan Shalganov
3a1da1c154 Merge pull request #157 from fenom-template/develop
2.6
2015-02-22 23:43:33 +03:00
bzick
c34d45698a Update changelog 2015-02-22 23:31:12 +03:00
bzick
9a725deaff Done range in foreach 2015-02-22 23:07:26 +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
Ivan Shalganov
fdc6caeb20 Merge pull request #154 from pafnuty/patch-6
fix typo
2015-02-22 11:08:17 +03:00
Pavel Belousov
a9f8a34aa2 fix typo 2015-02-20 23:07:42 +03:00
Ivan Shalganov
d9df706ae1 Merge pull request #153 from pafnuty/patch-5
fix typo
2015-02-20 10:22:31 +03:00
Pavel Belousov
b07a9beea1 fix typo 2015-02-19 19:39:51 +03:00
bzick
22501f3704 Add composer.lock to git 2015-02-19 17:12:33 +03:00
bzick
3db7d0b220 Fix #152 2015-02-19 17:11:44 +03:00
bzick
8f3c94a7a1 Fix #147 2015-02-19 17:04:15 +03:00
Ivan Shalganov
4dbbc81785 Merge pull request #150 from pafnuty/patch-4
fix typo
2015-02-17 16:47:48 +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
Ivan Shalganov
45a3abed88 Merge pull request #148 from fenom-template/develop
Fix bug: unexpected array conversion when object given to {foreach} with...
2015-02-10 14:37:55 +03:00
bzick
a9b9c89f88 Fix bug: unexpected array conversion when object given to {foreach} with force verify option 2015-02-10 14:30:31 +03:00
Ivan Shalganov
5dc7bbfd56 Merge pull request #145 from fenom-template/develop
2.5.1
2015-02-02 12:11:30 +03:00
bzick
d5417630ac Add test for #144 (condition) 2015-02-02 12:05:02 +03:00
bzick
f985fff314 Fix #144: invalid ternary operator priority 2015-02-02 12:03:15 +03:00
bzick
a09b2f7620 Fix #135 (repeat commit) 2015-02-02 12:02:30 +03:00
bzick
89f2e23750 Fix #144: forgot prepend unary operator 2015-02-02 11:49:42 +03:00
Ivan Shalganov
1a72b9d43e Update README.md 2015-02-01 01:28:22 +03:00
Ivan Shalganov
feb3a51884 Merge pull request #142 from fenom-template/develop
2.5
2015-02-01 01:16:58 +03:00
bzick
5d87060f42 Dummy protect 2015-02-01 01:13:39 +03:00
bzick
fb544b10e8 Add more test for 'in' 2015-02-01 00:58:40 +03:00
bzick
76b5d3e6fa Add array of variable to tag-function's arguments 2015-02-01 00:51:49 +03:00
bzick
4beacd57b9 Fix #116 (broken regexp) 2015-02-01 00:49:59 +03:00
bzick
0592e248e2 Add test for 'in' operator 2015-02-01 00:35:41 +03:00
bzick
0339a12b3d Fix #116 2015-01-31 19:16:43 +03:00
Ivan Shalganov
1ec97221f5 Update .coveralls.yml 2015-01-30 17:18:53 +03:00
Ivan Shalganov
e157c08dcf Update .coveralls.yml 2015-01-30 17:18:08 +03:00
Ivan Shalganov
269dd36a30 Update README.md 2015-01-30 16:58:34 +03:00
Ivan Shalganov
dd6986b60f Merge pull request #139 from fenom-template/develop
Fix #138
2015-01-30 16:56:37 +03:00
bzick
e310236745 Fix #138 2015-01-30 16:52:58 +03:00
Ivan Shalganov
7e32c38db4 Update README.md 2015-01-30 12:51:38 +03:00
Ivan Shalganov
01ae6081c6 Merge pull request #136 from bzick/develop
Fix: parse error then modifier's argument converts to false
2015-01-22 14:54:34 +03:00
bzick
2f769c294c Fix: parse error then modifier's argument converts to false 2015-01-22 13:55:22 +03:00
Ivan Shalganov
47cee02dd3 Merge pull request #133 from bzick/develop
Fix #132
2015-01-08 16:06:52 +03:00
bzick
7ac11fb3cc Remove debug 2015-01-08 15:57:53 +03:00
bzick
d096a80395 Fix #132 + test.
Also small performance fix
2015-01-08 15:52:33 +03:00
bzick
16d5f337c0 Formatting 2015-01-08 12:44:38 +03:00
Ivan Shalganov
e4a7a07107 Merge pull request #131 from bzick/develop
small fixes
2015-01-07 17:42:58 +03:00
bzick
5e42892979 fix typo 2015-01-07 17:19:17 +03:00
bzick
8d6bfb00d1 Small improve 2015-01-07 17:00:54 +03:00
bzick
22fb471c89 Cleanup. Improves. 2015-01-07 15:24:57 +03:00