705 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
bzick	712e8319a6	Upd CHANGELOG.md	2013-08-23 01:00:06 +04:00
bzick	6d52f33977	Merge remote-tracking branch 'refs/remotes/origin/master'	2013-08-23 00:57:28 +04:00
bzick	2d871b2dd7	Merge remote-tracking branch 'refs/remotes/origin/develop'	2013-08-23 00:56:55 +04:00
bzick	ecc842cc04	Fix AUTO_RELOAD option	2013-08-23 00:55:53 +04:00
bzick	75c8d983d8	Upd docs	2013-08-22 21:36:31 +04:00
bzick	0139593d45	Remove debugs	2013-08-22 10:35:43 +04:00
bzick	cad8d27ffe	Add 'how it work'	2013-08-22 10:33:03 +04:00
bzick	77660b1733	Add 'how it work'	2013-08-22 00:03:44 +04:00
bzick	cb803f5d9c	Add 'how it work'	2013-08-22 00:03:20 +04:00
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