1066 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolas Le Goff	2d8451c5eb	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-25 19:02:26 +01:00
Nicolas Le Goff	a910017d08	fix CoreTest::iniConfTest	2012-01-25 19:01:58 +01:00
Nicolas Le Goff	6eef4eae3c	delete phpecho	2012-01-25 18:55:08 +01:00
Nicolas Le Goff	c41104189e	fix testIsDiplayingErr	2012-01-25 18:54:47 +01:00
Nicolas Le Goff	a764b7d3bf	rename phpEcho to phpEchotTest	2012-01-25 18:51:03 +01:00
Nicolas Le Goff	44dae5d6a3	remove cache service implementation	2012-01-25 18:48:33 +01:00
Romain Neutron	de5ffe76ae	Cleanup	2012-01-25 18:47:04 +01:00
Romain Neutron	fc1a0abb19	Cleanup	2012-01-25 18:45:28 +01:00
Romain Neutron	4a65e2af8a	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-25 18:16:12 +01:00
Nicolas Le Goff	8a7a254c80	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-25 18:14:36 +01:00
Nicolas Le Goff	429b216691	Cache service tests	2012-01-25 18:14:14 +01:00
Nicolas Le Goff	f13e801c2c	Add caches to doctrine	2012-01-25 18:13:08 +01:00
Nicolas Le Goff	b938dcbe2e	Cache services	2012-01-25 18:12:22 +01:00
Nicolas Le Goff	441cdb22c0	add phpunit listener	2012-01-25 18:10:04 +01:00
Romain Neutron	92964858be	Fix rename	2012-01-25 17:47:14 +01:00
Romain Neutron	e1c95b49a5	Merge with master	2012-01-25 17:25:25 +01:00
Romain Neutron	b13874e023	Fix build	2012-01-25 17:12:12 +01:00
Romain Neutron	65f5098bbb	Fix readonly fields	2012-01-25 15:34:58 +01:00
Romain Neutron	1ce52264fb	Fix readonly fields	2012-01-25 15:27:08 +01:00
Romain Neutron	9852e2077c	Meta writer	2012-01-25 15:09:02 +01:00
Nicolas Le Goff	605f44686c	load array cache if memcache instance not reachable	2012-01-25 13:42:21 +01:00
Nicolas Le Goff	5e8dd97b02	fix cache tests	2012-01-25 13:40:54 +01:00
Romain Neutron	4c8597f811	Fix stamper	2012-01-25 13:04:05 +01:00
Romain Neutron	7e0adec7a4	Fix story default image	2012-01-25 12:49:32 +01:00
Romain Neutron	d2b5846de6	Fix mail activation	2012-01-25 12:04:18 +01:00
Romain Neutron	52eae04531	Fix mail activation	2012-01-25 11:47:14 +01:00
Romain Neutron	63c9bb656a	Applymodel takes a User_Adapter as first argument	2012-01-25 11:39:12 +01:00
Romain Neutron	7d1e0aabf6	Exclude <ul> and <li> to strip_tags in mails	2012-01-25 11:37:20 +01:00
Romain Neutron	be132519e8	Updated editing CSS	2012-01-25 11:30:21 +01:00
Romain Neutron	bbdc5a6078	Add Push css	2012-01-25 11:29:22 +01:00
Romain Neutron	be4dc29577	Removed verbosity	2012-01-25 11:28:55 +01:00
Romain Neutron	a54d1c23d2	Add mustache loader	2012-01-25 11:28:16 +01:00
Romain Neutron	51ff757396	Change default push route to push	2012-01-25 11:27:49 +01:00
Romain Neutron	1b064eed11	Add MustacheLoader route	2012-01-25 11:26:17 +01:00
Romain Neutron	9f5eae01dc	Modify Selectable use	2012-01-25 11:25:52 +01:00
Romain Neutron	a74f5a8e45	Push template	2012-01-25 11:25:33 +01:00
Romain Neutron	49d96618f1	Push-Badge Mustache template	2012-01-25 11:24:48 +01:00
Romain Neutron	e0b7781698	Add mustache to prod	2012-01-25 11:24:32 +01:00
Romain Neutron	e4e930a90f	Add Push controller	2012-01-25 11:24:05 +01:00
Romain Neutron	2f206e6251	Add mustache as a dependency	2012-01-25 11:21:37 +01:00
Romain Neutron	07527adbdc	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-24 17:00:22 +01:00
Nicolas Le Goff	9c922e3aa1	change memcached to memcache	2012-01-24 16:59:04 +01:00
Nicolas Le Goff	dc2c854c74	remove normal output log options add vdump instead	2012-01-24 16:32:09 +01:00
Nicolas Le Goff	45ba8f4e02	rename NormalTest to PhpEcho test	2012-01-24 16:31:15 +01:00
Nicolas Le Goff	b370d6dac0	rename normal monolog outpout to vdump output	2012-01-24 16:30:30 +01:00
Romain Neutron	2f3960a6f6	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-24 16:19:08 +01:00
Nicolas Le Goff	b1faf01798	rename service normal logger to phpecho logger	2012-01-24 16:18:35 +01:00
Romain Neutron	d0bd63b562	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-24 16:06:48 +01:00
Nicolas Le Goff	7586fba40f	rename config file to config.yml	2012-01-24 16:05:51 +01:00
Nicolas Le Goff	35547f21e2	refactor getConfigurationMethod	2012-01-24 16:00:15 +01:00