687 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bzick	1363945716	Fix #171	2015-08-13 10:33:39 +03:00
Ivan Shalganov	d596c81b4c	Merge pull request #184 from fenom-template/master ... sync develop	2015-08-13 00:13:28 +03:00
bzick	10221b87ea	Fix php53	2015-08-13 00:12:06 +03:00
bzick	4fe339ba21	Add predefined accessors Fenom::ACCESSOR_PROPERY and Fenom::ACCESSOR_METHOD	2015-08-13 00:07:01 +03:00
bzick	213184c8a8	Fix: travis-ci: sudo: false	2015-08-07 17:21:24 +03:00
bzick	5da2df1eb4	Fix: #174	2015-08-07 17:20:50 +03:00
Ivan Shalganov	ae93c8f94a	Merge pull request #175 from maxicms/master ... Add prefix compile ID for template file name (by @maxicms )	2015-08-06 15:19:12 +03:00
maxicms	0a8793fe7b	remove default prefix	2015-08-06 14:02:43 +03:00
maxicms	05e35261e4	Add prefix compile ID for template file name	2015-08-06 08:51:26 +03:00
Ivan Shalganov	6331ad44a4	Merge pull request #173 from fobo66/patch-1 ... Fix a lot of typos	2015-07-21 10:19:54 +03:00
Andrey Mukamolow	f5d05e81a6	Fix a lot of typos	2015-07-18 12:04:49 +03:00
Ivan Shalganov	35cfda7516	Merge pull request #172 from Qwarble/patch-1 ... Опечатка	2015-07-01 17:43:51 +03:00
Alexey	f9fa4fe474	Опечатка	2015-07-01 17:25:27 +03:00
Ivan Shalganov	56dfcfc71f	Merge pull request #170 from fenom-template/develop ... 2.7.0	2015-06-03 11:57:35 +03:00
bzick	bf44511a53	Merge branch 'origin/master'	2015-06-03 11:41:43 +03:00
bzick	bd5557925d	Merge remote-tracking branch 'remotes/origin/master' into develop ... # Conflicts: # src/Fenom.php	2015-06-03 11:36:19 +03:00
bzick	10bc614a84	Merge remote-tracking branch 'remotes/origin/master' into develop ... # Conflicts: # src/Fenom.php	2015-06-03 11:36:05 +03:00
bzick	48e4931506	Add Fenom::ACCESSOR_CALL parser	2015-06-03 11:31:53 +03:00
bzick	c6dbdfff95	Add global charset for Fenom	2015-06-03 00:19:40 +03:00
bzick	c2751e069c	Fix #158	2015-06-03 00:13:09 +03:00
bzick	e0fc70b751	Improve accessor: add writable condition	2015-06-02 10:59:28 +03:00
bzick	ef4458ca10	Add custom parsers for accessors	2015-06-01 23:42:47 +03:00
bzick	3b56906ec8	Remove php 7 from CI (buggy)	2015-06-01 23:37:49 +03:00
bzick	30921d3500	Refectory term parser (if ->switch)	2015-06-01 23:36:30 +03:00
bzick	ec890cc819	Add is_var argument for accessor	2015-06-01 23:20:02 +03:00
bzick	bf0a0ffedc	Add support PHP 7 for CI	2015-05-23 23:21:46 +03:00
Ivan Shalganov	0511a43539	Merge pull request #168 from fenom-template/develop ... Done #165	2015-05-23 23:17:34 +03:00
bzick	806467453d	Done #165	2015-05-23 23:09:16 +03:00
Ivan Shalganov	86c6630243	Merge pull request #167 from pafnuty/patch-7 ... Update ignore.md	2015-05-05 20:06:30 +03:00
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