Commit Graph

309 Commits

Author SHA1 Message Date
Ivan Shalganov
8adc2ac55d Temporary disable broken tests 2014-04-10 10:58:14 +04:00
Ivan Shalganov
27bd06f534 Cleanaup 2014-04-10 10:33:51 +04:00
Ivan Shalganov
218efdffe6 Fix #75 for new inheritance system 2014-04-10 01:49:15 +04:00
Ivan Shalganov
654b259b42 Merge branch 'origin/master'
Conflicts:
	CHANGELOG.md
	docs/tags/raw.md
	src/Fenom/Compiler.php
	src/Fenom/Render.php
	src/Fenom/Template.php
2014-04-10 00:11:04 +04:00
Ivan Shalganov
aeda090476 Update changelog 2014-04-09 20:07:37 +04:00
Ivan Shalganov
47eefb00b8 Update doc for macros 2014-04-09 20:04:38 +04:00
Ivan Shalganov
0fcc5463e8 Merge remote-tracking branch 'origin/master' 2014-04-09 20:01:59 +04:00
Ivan Shalganov
e9a60041c4 Fix #75: macros don's share between child and parent templates 2014-04-09 20:01:20 +04:00
Ivan Shalganov
1f9a56500e Fix #75: throw invalid exception 2014-04-09 20:00:08 +04:00
Ivan Shalganov
777e315dce Dev flags 2014-04-09 18:03:49 +04:00
Ivan Shalganov
61816e76bc Fix tests for PHP<5.5 2014-02-28 18:32:59 +04:00
Ivan Shalganov
c210303b72 More test, reformat code to PSR-0 2014-02-27 16:30:44 +04:00
Ivan Shalganov
e00d6c7e50 Cleanup code 2014-02-27 00:24:57 +04:00
Ivan Shalganov
127ed0fef8 Fix test for PHP 5.3 2014-02-26 23:59:28 +04:00
Ivan Shalganov
000009a5d3 Done dynamic extends 2014-02-26 23:57:29 +04:00
Ivan Shalganov
9c0cea5934 Fix tests for PHP 5.3 2014-02-22 20:56:21 +04:00
Ivan Shalganov
d5a9ea5740 Fix tests for PHP 5.3 2014-02-22 20:53:36 +04:00
Ivan Shalganov
a523d4a4aa Done #66, dev dynamic extends 2014-02-22 20:34:53 +04:00
Ivan Shalganov
d3a97074cc Merge pull request #73 from igorhim/master
fix 2 small bugs
2014-02-19 11:42:28 +03:00
igorhim
65477a5a06 Fix warning object to string 2014-02-18 23:53:02 +02:00
igorhim
df5fb0516d Fix custom modifier closure functions call 2014-02-18 23:48:56 +02:00
Ivan Shalganov
3adafb6fcc Merge remote-tracking branch 'origin/develop' into develop 2014-02-14 15:56:22 +04:00
Ivan Shalganov
52c0858d06 Done #5, dev #66, improve blocks, refectory block's tests 2014-02-14 15:55:36 +04:00
Ivan Shalganov
558cafc1fe Update usage.md 2014-02-07 22:44:03 +03:00
Ivan Shalganov
e0224aa18b Update in.md 2014-01-31 10:43:18 +02:00
Ivan Shalganov
397e05b01a Merge pull request #68 from paw34rus/patch-1
Update raw.md
2014-01-31 00:36:29 -08:00
paw34rus
e47e159ee6 Update raw.md
опечатка
2014-01-30 19:57:56 -08:00
Ivan Shalganov
dc287f08b2 Translate modifier's docs 2014-01-29 10:01:31 +02:00
Ivan Shalganov
5e4b7f3051 Update docs 2014-01-28 19:49:35 +02:00
Ivan Shalganov
c6abbdb328 Update docs 2014-01-28 19:46:23 +02:00
Ivan Shalganov
2c0ac60c14 Update docs 2014-01-28 19:44:24 +02:00
Ivan Shalganov
b34a1e1013 Update docs 2014-01-28 19:31:26 +02:00
Ivan Shalganov
75bcc4e0ff Add #48: allow call static method in templates and allow disable this option 2014-01-28 19:24:47 +02:00
Ivan Shalganov
7759df8453 Performance improvement: use plain array instead of ArrayObject for variable storage into templates 2014-01-27 23:58:14 +04:00
Ivan Shalganov
05a4991a5d Fix git ignore 2014-01-20 12:33:59 +04:00
Ivan Shalganov
5049056046 Fix #58, small improvements 2014-01-20 11:54:28 +04:00
Ivan Shalganov
19e0898da6 Merge branch 'origin/master'
Conflicts:
	CHANGELOG.md
2014-01-08 01:10:18 +04:00
Ivan Shalganov
8b3dd4c8a7 Merge remote-tracking branch 'origin/master' 2014-01-08 01:06:04 +04:00
Ivan Shalganov
cf8e25cd8f Improve docs 2014-01-08 01:05:52 +04:00
Ivan Shalganov
df08e491a7 Merge pull request #64 from evseevnn/patch-1
Modifiers: Remove unnecessary check for the string and fix regexp
2013-12-21 09:08:47 -08:00
evseevnn
cd8e8a1bb4 Проверка на строку не нужна
В регулярном выражении нет необходимости указывать "^", так как .* заякоривается автоматом.
2013-12-21 15:19:20 +03:00
Ivan Shalganov
7b87a88d16 Merge remote-tracking branch 'origin/master' 2013-12-01 19:30:17 +04:00
Ivan Shalganov
1ce0315282 1.4.8 2013-12-01 19:30:09 +04:00
Ivan Shalganov
6fec661ea7 Add tag filter. Move benchmark to another project 2013-10-08 17:48:23 +04:00
Ivan Shalganov
24f22f8f43 Merge branch 'origin/master' 2013-10-08 14:11:47 +04:00
Ivan Shalganov
0160fa6b3b Update README.md 2013-10-02 10:36:55 +04:00
Ivan Shalganov
6d9872c895 Fix composer version 2013-10-02 10:36:33 +04:00
Ivan Shalganov
1132b76221 Translate 2013-09-29 23:52:48 +04:00
Ivan Shalganov
0b192c8399 Merge remote-tracking branch 'origin/master' 2013-09-21 23:24:29 +04:00
Ivan Shalganov
58c8f450b8 Fixes 2013-09-21 23:24:22 +04:00