192 Commits

Author	SHA1	Message	Date
Romain Neutron	548ddc14e5	Fix build	2012-02-02 19:02:08 +01:00
Romain Neutron	a9c7ed23cb	Coding standards	2012-02-02 15:43:12 +01:00
Romain Neutron	9135de65cf	Push & Feedback templates	2012-02-02 15:21:51 +01:00
Romain Neutron	0f28f12fe7	Merge	2012-01-31 23:04:28 +01:00
Romain Neutron	35da359350	Fix build	2012-01-31 23:01:35 +01:00
Romain Neutron	067561a734	Merge with master	2012-01-31 22:22:54 +01:00
Romain Neutron	406db0c4e1	Add languages	2012-01-31 22:04:00 +01:00
Romain Neutron	f94dce8571	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-31 18:29:07 +01:00
Romain Neutron	1626246f7f	Merge with master	2012-01-31 18:28:49 +01:00
Romain Neutron	afb42193e7	Merge with master	2012-01-31 12:09:07 +01:00
Romain Neutron	d28e9227c2	Fix Coding standards	2012-01-31 11:55:10 +01:00
Romain Neutron	6f18aa0c88	Improved UsrLists methods	2012-01-31 11:46:29 +01:00
Romain Neutron	8d85ad9521	Improved push methods	2012-01-31 11:45:57 +01:00
Nicolas Le Goff	3db335e4c1	add language controller	2012-01-30 17:00:36 +01:00
Nicolas Le Goff	c50cdc097c	merge	2012-01-27 17:20:10 +01:00
Nicolas Le Goff	09f3ea4cfb	#fix 279 check params for controllers	2012-01-27 17:17:52 +01:00
Nicolas Le Goff	694f943d23	complete admin controller tests	2012-01-27 17:16:50 +01:00
Romain Neutron	b299e7d042	Fix build	2012-01-26 19:12:51 +01:00
Romain Neutron	91dd71cb19	Coding standards	2012-01-26 17:43:23 +01:00
Romain Neutron	5d1377f446	Setup unit tests	2012-01-26 17:42:08 +01:00
Romain Neutron	f7cc38ea25	Enhanced push tests	2012-01-26 16:58:50 +01:00
Romain Neutron	5941bc73e3	Coding standards	2012-01-26 16:45:05 +01:00
Romain Neutron	443482f971	Added some vocabulary edit tests	2012-01-26 16:44:33 +01:00
Romain Neutron	3112dcdbdd	Coding standards	2012-01-26 16:26:31 +01:00
Romain Neutron	34f2e91fd4	Coding standards	2012-01-26 16:26:00 +01:00
Romain Neutron	c2017a0399	Fix usrlist unit tests	2012-01-26 16:23:09 +01:00
Nicolas Le Goff	6c616f05de	add pathFileTest	2012-01-26 15:23:32 +01:00
Romain Neutron	3b35b83a45	Add MustacheLoader tests	2012-01-26 14:24:12 +01:00
Romain Neutron	006eb30d1a	Fix Printer unit tests	2012-01-26 13:53:45 +01:00
Romain Neutron	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
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