Commit Graph

705 Commits

Author SHA1 Message Date
bzick 3766505e5c Fix #195; Catch Throwable exceptions; 2016-02-23 13:16:48 +03:00
Ivan Shalganov 7668426f65 Merge pull request #211 from fenom-template/develop
Fix #162
2016-02-23 12:56:24 +03:00
bzick 46708c6195 Fix #162 2016-02-23 12:41:46 +03:00
Ivan Shalganov 32755c3787 Merge pull request #210 from fenom-template/master
Sync develop
2016-02-23 12:41:32 +03:00
Ivan Shalganov 9f1bad3740 Merge pull request #203 from zhabinka/patch-1
Update lower.md
2015-12-28 13:35:05 +03:00
zhabinka 939a608db0 Update lower.md 2015-12-27 18:50:18 +03:00
Max Kostjukevich b9ee7bf609 Merge pull request #202 from zhabinka/master
Update lower.md
2015-12-27 17:47:34 +02:00
zhabinka de35e9addb Update lower.md 2015-12-27 17:52:57 +03:00
Ivan Shalganov da9cafe4f3 Merge pull request #198 from sin4end/patch-1
Update ereplace.md
2015-11-04 16:28:09 +03:00
sin4end 6ca82e267b Update ereplace.md
Исправлена опечатка в строке 8: должно быть ereplace, а не replace
2015-11-04 17:28:29 +06:00
Ivan Shalganov 4491176cf4 Update readme.md 2015-11-04 11:15:06 +03:00
Ivan Shalganov 359cf5fbcb Update start.md 2015-11-04 11:14:46 +03:00
Ivan Shalganov 28935c0ddc Support PHP 7.0 (again) 2015-10-10 23:20:00 +03:00
Ivan Shalganov 10c8109bb5 Merge pull request #186 from maxicms/patch-1
fix typo
2015-08-14 21:25:19 +03:00
Max Kostjukevich b82b6e7a58 fix typo 2015-08-14 13:05:45 +03:00
Ivan Shalganov e2a3087dfa Merge pull request #185 from fenom-template/develop
2.8
2015-08-13 15:04:17 +03:00
bzick 5c86d2d6ae Docs 2015-08-13 14:55:00 +03:00
bzick 544aa4f248 Fix sub-issue #159 (https://github.com/fenom-template/fenom/issues/159#issuecomment-119112070) 2015-08-13 11:03:51 +03:00
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