662 Commits

Author	SHA1	Message	Date
Romain Neutron	db4477e18a	Fix build	2012-01-25 19:13:07 +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
Nicolas Le Goff	3825f7021a	syntax fix	2012-01-24 12:53:42 +01:00
Nicolas Le Goff	f7f6ced8c5	add content-type	2012-01-23 19:47:26 +01:00
Nicolas Le Goff	6d31db1ae4	merge	2012-01-23 19:17:08 +01:00
Nicolas Le Goff	8dd9fdd98a	coreect syntax error	2012-01-23 18:52:19 +01:00
Romain Neutron	7f0982848a	Add use of core serializer	2012-01-23 18:15:15 +01:00
Romain Neutron	362df70816	New Admin Controllers	2012-01-23 18:14:08 +01:00
Nicolas Le Goff	f83be86c88	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-20 16:09:45 +01:00
Nicolas Le Goff	127bd140ce	fix testes	2012-01-20 16:09:14 +01:00
Nicolas Le Goff	0741070355	Replace global $_FILE	2012-01-20 16:08:21 +01:00
Romain Neutron	bf9cca700d	Clean block docs	2012-01-20 15:21:08 +01:00
Romain Neutron	ef89a15adf	Add route for vocabularies	2012-01-20 15:19:02 +01:00
Nicolas Le Goff	878c040d0f	fix add and share list to a user controller	2012-01-20 12:29:33 +01:00
Nicolas Le Goff	15375a4b41	fix #249 missing servername when config.yml is created	2012-01-19 18:56:41 +01:00
Nicolas Le Goff	2b38f37c11	merge	2012-01-19 16:22:06 +01:00
Nicolas Le Goff	59f48e023a	get services from new builder	2012-01-19 16:12:04 +01:00
Nicolas Le Goff	6b017a91a3	remove ini_set	2012-01-19 16:11:42 +01:00
Romain Neutron	813a5ccde8	Revert bebecocomimi changes	2012-01-18 18:20:48 +01:00
Romain Neutron	562744f6c7	Refactor caption_field	2012-01-18 18:20:15 +01:00
Romain Neutron	2dfe61d3b7	Fix installer : ... - Service sample is wrong - Use RegistrySetup in connexion - Drop Doctrine Schema before creating (rollback)	2012-01-18 15:05:32 +01:00
Romain Neutron	4e64f9a1a2	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-18 14:24:57 +01:00
Romain Neutron	37742b67c6	Rename twig templates	2012-01-18 14:18:55 +01:00
Nicolas Le Goff	bbbe292e04	Merge with 3.6	2012-01-17 18:00:34 +01:00
Nicolas Le Goff	130a60cd5a	remove exit when setup failed	2012-01-17 16:33:20 +01:00
Nicolas Le Goff	02ea562e8d	add request to closure argument	2012-01-17 16:32:49 +01:00
Nicolas Le Goff	6dfbdb040c	add correct json content-type	2012-01-17 16:31:18 +01:00
Nicolas Le Goff	308972b857	add adapter_action twig parameters to avoid raises of twig_exception in strict variable mode	2012-01-17 16:30:25 +01:00
Nicolas Le Goff	4a6b3ee10c	use unserialize method of serchEngineOption object instead of json_decode	2012-01-17 16:28:37 +01:00
Romain Neutron	af860e2fa6	Merge with master	2012-01-16 20:19:20 +01:00
Nicolas Le Goff	9daae2306d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-13 13:11:03 +01:00
Nicolas Le Goff	cc890c73f2	fix namespace issue	2012-01-13 13:10:05 +01:00
Nicolas Le Goff	c87f48c2e2	refactor	2012-01-13 13:05:42 +01:00
Nicolas Le Goff	4c8f0e5784	refactor	2012-01-13 13:05:08 +01:00
Romain Neutron	b37703b506	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-13 12:16:59 +01:00
Romain Neutron	6c92c7bf77	UsrLists fixes	2012-01-13 12:11:22 +01:00
Nicolas Le Goff	85a7239c82	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-12 19:01:11 +01:00
Nicolas Le Goff	9a14de2d49	change ServiceBuilder::build()	2012-01-12 19:00:13 +01:00
Romain Neutron	694b3b04e6	Move user search in push controller	2012-01-12 15:31:28 +01:00
Romain Neutron	66e5d0302a	Add Alchemy\Phrasea\Controller\Exception	2012-01-12 14:25:52 +01:00
Romain Neutron	883dde944f	Refactor Core::request	2012-01-12 14:25:35 +01:00
Romain Neutron	921e697620	Add documentation	2012-01-11 23:59:00 +01:00
Romain Neutron	3d32dcd2ce	Merge	2012-01-11 21:06:33 +01:00
Romain Neutron	a1983b3305	Fix push bugs	2012-01-11 20:54:20 +01:00
Romain Neutron	5230289fdd	Add User tooltip route	2012-01-11 20:54:11 +01:00
Nicolas Le Goff	3125bdc7af	Merge	2012-01-11 15:04:52 +01:00
Nicolas Le Goff	b8dd8d4e69	recover doctrine as service	2012-01-11 12:15:43 +01:00
Romain Neutron	6156bc0cbb	Renamed prod/index.html	2012-01-11 10:43:55 +01:00
Romain Neutron	869a2f614c	Added WorkZone browser routes	2012-01-10 20:32:00 +01:00