mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity
280 Commits 5 Branches 36 Tags 2 MiB
47eefb00b8
Commit Graph

280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
558cafc1fe Update usage.md 2014-02-07 22:44:03 +03: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
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
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
Ivan Shalganov
daaf1ba903 Update README.md 2013-09-20 10:07:30 +04:00
Ivan Shalganov
5770c5aea9 Disable problem code. Add more tests 2013-09-19 23:10:19 +04:00
Ivan Shalganov
b1b81cdce7 Fix tests for php 5.3 2013-09-15 16:44:15 +04:00
Ivan Shalganov
847e594aa6 Merge branch 'origin/develop' 2013-09-15 16:41:37 +04:00
Ivan Shalganov
dcb91775ca Merge branch 'origin/master' 
Conflicts:
	src/Fenom/Compiler.php
	src/Fenom/Template.php
	tests/cases/Fenom/TemplateTest.php
	tests/cases/Fenom/TokenizerTest.php
	tests/cases/FenomTest.php
 2013-09-15 16:39:29 +04:00
Ivan Shalganov
f9d9f098b7 Remove {unser} and add tests 2013-09-15 16:05:18 +04:00
bzick
7c038e0ba9 Fix tests 2013-09-14 19:55:53 +04:00
Ivan Shalganov
2fc84c226e Add tests 2013-09-14 11:24:23 +04:00
Ivan Shalganov
fef9747e43 Merge remote-tracking branch 'origin/master' 2013-09-13 21:20:34 +04:00
Ivan Shalganov
1428c86cac Rollback phpunit to require-dev 2013-09-13 21:19:51 +04:00
Ivan Shalganov
11c1c711b9 Update README.md 2013-09-12 20:13:34 +04:00
Ivan Shalganov
bcd9358fe0 Rollback phpunit to require-dev 2013-09-12 20:01:06 +04:00
Ivan Shalganov
cf0dec5b09 Add coveralls 2013-09-12 19:59:20 +04:00
Ivan Shalganov
872735fef3 Update README.md 2013-09-12 18:59:54 +04:00
Ivan Shalganov
82631f54c1 Fix: intersect the names of temporary variables during force include 2013-09-10 16:20:48 +04:00
bzick
56b7fe8bb0 Fix error message 2013-09-06 15:57:28 +04:00
bzick
d2d54a831a 1.4.2 2013-09-06 15:56:37 +04:00
bzick
d768637eb7 Update docs 2013-09-05 04:24:14 +04:00
bzick
afd3218ed4 Fix travis setup 2013-09-05 03:37:39 +04:00
bzick
d5ecc1bc20 Fix {switch} and ternary operator 2013-09-05 03:35:02 +04:00
bzick
7a84cf4ceb Merge remote-tracking branch 'refs/remotes/origin/develop' 2013-09-02 17:41:50 +04:00
bzick
0a9facc493 Done 1.4.0 2013-09-02 17:40:58 +04:00
bzick
3f77cdd099 Merge branch 'master' into develop 2013-08-30 10:26:27 +04:00
bzick
de4fcad602 Add doc for {insert} and {switch} 2013-08-30 10:26:17 +04:00
bzick
ba1b838364 Merge remote-tracking branch 'origin/master' 2013-08-29 11:29:44 +04:00
bzick
eef42150b2 1.3.1 2013-08-29 11:29:34 +04:00
Ivan Shalganov
d5b4575698 Update readme.md 2013-08-23 14:09:54 +04:00
bzick
270f90792a Disable buggy trim 2013-08-23 01:06:47 +04:00
bzick
418fbed537 Fix texts for 5.3 2013-08-23 01:02:49 +04:00