24 Commits

Author	SHA1	Message	Date
Romain Neutron	d27cd4e6ab	Vocabulary classes	2012-02-08 16:15:48 +01:00
Nicolas Le Goff	90e8004fb8	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-03 16:11:06 +01:00
Nicolas Le Goff	6a437a3831	fix #312 subdef structure for a preview is duplicate	2012-02-03 15:32:52 +01:00
Romain Neutron	a9c7ed23cb	Coding standards	2012-02-02 15:43:12 +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	1626246f7f	Merge with master	2012-01-31 18:28:49 +01:00
Romain Neutron	716f377fdd	User who can change status can see hidden status	2012-01-31 16:58:39 +01:00
Romain Neutron	4dcb569cea	Merge with master	2012-01-31 12:10:03 +01:00
Nicolas Le Goff	694f943d23	complete admin controller tests	2012-01-27 17:16:50 +01:00
Romain Neutron	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
Romain Neutron	ca252d8564	Moved vocabulary to Alchemy namespace	2012-01-23 18:19:07 +01:00
Romain Neutron	a4c103fa42	Moved vocabulary to Alchemy namespace	2012-01-23 18:18:49 +01:00
Romain Neutron	7d98dc7f27	Refactor databox_field :: name generation	2012-01-20 15:53:18 +01:00
Romain Neutron	3e8ed50f97	Databox field vocabulary classes	2012-01-20 15:19:50 +01:00
Romain Neutron	72bee22918	Add databox_field vocabularies	2012-01-20 13:00:12 +01:00
Romain Neutron	5b7e000013	Fix #172 : Fix CGU to confirm without access	2012-01-06 15:59:15 +01:00
Romain Neutron	de91fc5c0e	Fix status conversion	2012-01-03 13:39:20 +01:00
Romain Neutron	bf3d78b700	Fix #122 : customization du separateur de valeurs multivaluées	2011-12-27 14:32:13 +01:00
Romain Neutron	1d5500e6e0	Databox field type is required and default is string	2011-12-26 18:09:59 +01:00
Romain Neutron	206bf058d5	Fix #116 Thumbtitle lost with 3.5 migrate	2011-12-26 16:36:57 +01:00
Romain Neutron	900af9e102	Fix delete of a databox field : the XML field is removed	2011-12-15 15:09:11 +01:00
Romain Neutron	4c5b7eb658	V 3.5 RC 1	2011-12-05 00:23:28 +01:00