6 Commits

Author	SHA1	Message	Date
Romain Neutron	745d27b821	Fix #142 : add ability to apply template from user rights view	2012-01-03 13:49:13 +01:00
Nicolas Le Goff	c70755e9ec	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-29 18:46:51 +01:00
Nicolas Le Goff	521b9b2b4b	fix cooliris feed issue & fix rss tests	2011-12-29 18:45:26 +01:00
Romain Neutron	9427baf8b6	Add method apply template to controller edit user	2011-12-26 16:05:52 +01:00
Romain Neutron	9fb986e8f0	Fix upgrade with a bad databox	2011-12-08 17:22:34 +01:00
Romain Neutron	4c5b7eb658	V 3.5 RC 1	2011-12-05 00:23:28 +01:00