Commit Graph

671 Commits

Author SHA1 Message Date
Ivan Shalganov
30bff7f5e8 Merge pull request #42 from diimpp/patch-1
Fix packagist.org's project url
2013-08-12 12:40:14 -07:00
Dmitri Perunov
07ee1a479d Fix packagist.org's project url 2013-08-12 12:38:31 -07:00
bzick
25975a6782 Improve #41 2013-08-12 20:14:35 +04:00
bzick
982b284f60 Fix #41, optimize variable parser 2013-08-11 19:55:30 +04:00
bzick
ae34025ca7 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2013-08-08 18:45:19 +04:00
Ivan Shalganov
a7a25cd622 Update var.md 2013-08-07 14:36:50 +04:00
Ivan Shalganov
8a249b4850 Update CHANGELOG.md 2013-08-07 10:36:00 +04:00
bzick
85f1b22cc1 Fix bug in setOptions method 2013-08-07 10:27:28 +04:00
Ivan Shalganov
8a03a84908 Merge pull request #40 from litvinenkow/patch-2
Fix: setOptions
2013-08-06 23:26:29 -07:00
litvinenkow
5e6ee659e6 Update Fenom.php
Блин, мужик, ну исправь это уже))
2013-08-06 23:21:03 -07:00
Ivan Shalganov
fa0546e09d Update CHANGELOG.md 2013-08-06 15:20:20 +04:00
bzick
081e30e744 Fix #39 2013-08-06 12:04:23 +04:00
bzick
7fb82bd13a Remove trash 2013-08-05 19:38:31 +04:00
bzick
da7d972093 Upd build status link 2013-08-05 19:30:33 +04:00
bzick
c4080f1bf3 Back tests to php 5.3 2013-08-05 19:29:11 +04:00
bzick
c1d0268a94 Merge remote-tracking branch 'refs/remotes/origin/develop' 2013-08-05 19:26:40 +04:00
bzick
b632dc5bdf Fix link 2013-08-05 19:26:06 +04:00
bzick
997282f90a Merge master into develop 2013-08-05 19:24:58 +04:00
bzick
c7a90789de Done #28 2013-08-05 13:07:16 +04:00
bzick
09f952686b Add string concatenation (#3) 2013-08-03 18:56:17 +04:00
bzick
1e7cf29290 Tests++ 2013-08-02 23:30:44 +04:00
bzick
43925ae640 Fix ternary operator 2013-08-02 23:01:06 +04:00
bzick
e51eb9f3d8 Format code 2013-08-02 21:50:04 +04:00
bzick
c27df81545 Split parseExp (for #3) 2013-08-02 20:29:18 +04:00
bzick
f1d252a3cc Add filters for templates (#30) 2013-08-01 01:05:19 +04:00
Ivan Shalganov
6468862df3 Merge pull request #36 from klkvsk/fix-parseExp-array
Fix parseExp parsing arrays
2013-07-30 04:25:14 -07:00
klkvsk
95a41ac169 fix parseExp parsing arrays 2013-07-30 15:05:03 +04:00
bzick
e68f3dd99a Disable sandbox 2013-07-29 16:32:54 +04:00
bzick
e9b7951d7a One file - one class (#24) 2013-07-29 16:15:52 +04:00
bzick
3674de41cb To PSR-x format 2013-07-29 14:58:14 +04:00
bzick
4edd0e1708 Add recursive macros support (#28) 2013-07-29 14:53:21 +04:00
Ivan Shalganov
b0ecde05f7 Update README.md 2013-07-29 12:53:57 +04:00
bzick
97e891895a Add ::before() 2013-07-26 10:40:07 +04:00
bzick
2a64bdb1fc Add replacing of parsers 2013-07-25 02:05:44 +04:00
bzick
bd69bbd86a Fix getModifier arguments in parsers 2013-07-24 20:56:28 +04:00
bzick
d977c86116 Fix loader hint 2013-07-24 20:09:14 +04:00
bzick
d5dcfbe410 Add hook for loads modifiers and tags 2013-07-24 19:37:07 +04:00
bzick
33a2e685e3 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2013-07-24 16:16:25 +04:00
bzick
8030c12923 Add {unset …} (#29) 2013-07-24 16:16:20 +04:00
bzick
a1b6f5765b Uf, change pipe's arguments 2013-07-24 00:26:39 +04:00
bzick
fb9b0af3b2 Add adapters list 2013-07-23 12:32:06 +04:00
bzick
3be704590f Update docs 2013-07-23 11:33:21 +04:00
bzick
2537ae1716 Merge remote-tracking branch 'origin/master' 2013-07-23 11:32:38 +04:00
bzick
e37c8468eb Update docs and add tests 2013-07-23 11:32:31 +04:00
Ivan Shalganov
0afb87a783 Update benchmark.md 2013-07-22 18:54:41 +04:00
bzick
a5f83a59b8 Merge remote-tracking branch 'refs/remotes/origin/develop' 2013-07-22 18:44:51 +04:00
bzick
050523f249 Fix test operator for php 5.3 2013-07-22 18:36:48 +04:00
bzick
67e7ea0b9e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Conflicts:
	src/Fenom/Template.php
	tests/cases/Fenom/TemplateTest.php
2013-07-22 18:33:55 +04:00
bzick
e41cca72a2 Merge branch 'develop' 2013-07-22 18:08:01 +04:00
bzick
c4610a7778 Update to 1.1
Read CHANGELOG.md#1.1.0
2013-07-22 18:03:43 +04:00