780 Commits

Author	SHA1	Message	Date
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
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	7d1e0aabf6	Exclude <ul> and <li> to strip_tags in mails	2012-01-25 11:37:20 +01:00
Nicolas Le Goff	23476b1767	fix set_metadatas	2012-01-23 19:54:10 +01:00
Nicolas Le Goff	6d31db1ae4	merge	2012-01-23 19:17:08 +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
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	d46974948f	cleanup	2012-01-20 16:08:54 +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	d2e8893a46	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-20 13:00:17 +01:00
Romain Neutron	72bee22918	Add databox_field vocabularies	2012-01-20 13:00:12 +01:00
Nicolas Le Goff	ec7b3837ca	convert numeric characters to int when unserializing json	2012-01-20 12:34:14 +01:00
Nicolas Le Goff	64831e19fb	cleanup	2012-01-20 12:32:03 +01:00
Nicolas Le Goff	2c2a9c4494	add missing parentheses	2012-01-20 12:27:19 +01:00
jygaulier	5a5f86a97b	-	2012-01-19 21:01:03 +01:00
Nicolas Le Goff	d55516bb29	fix #243 set proper cache according to php cache extensions available	2012-01-19 19:00:48 +01:00
Nicolas Le Goff	2b38f37c11	merge	2012-01-19 16:22:06 +01:00
Nicolas Le Goff	ed90b1fa4d	replace path to test sqlite database with realpath	2012-01-19 16:16:47 +01:00
Nicolas Le Goff	9fc05289a5	get services from new service builder	2012-01-19 16:16:22 +01:00
Romain Neutron	0d1cc50632	Merge with master	2012-01-19 12:32:57 +01:00
Romain Neutron	8b15f3b732	Fix granted bases order	2012-01-19 12:24:09 +01:00
Romain Neutron	0ba1d57340	Fix masks on ACL transfer	2012-01-19 10:51:43 +01:00
Romain Neutron	162ab83513	caption_field refactor	2012-01-18 20:15:35 +01:00
Romain Neutron	c1bfe45931	Proper record removal	2012-01-18 19:53:14 +01:00
Romain Neutron	eb896ea36c	Fix upgrade tables	2012-01-18 19:53:03 +01:00
Romain Neutron	562744f6c7	Refactor caption_field	2012-01-18 18:20:15 +01:00
Romain Neutron	16293fd8f8	Merge with master	2012-01-18 16:01:11 +01:00
Romain Neutron	ea9a0a3217	Clean email tokens	2012-01-18 15:46:21 +01:00
Romain Neutron	f2ffa3601f	Fix installer : ... - Use RegistrySetup in connexion	2012-01-18 15:06:18 +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	2ba5fe78f9	Refactor include pathes	2012-01-18 14:24:18 +01:00
Romain Neutron	de69f0357e	Refactor caption_field	2012-01-18 14:22:31 +01:00
Nicolas Le Goff	8c203b6fce	add remove of all configuration file when rollback	2012-01-18 14:14:36 +01:00
Nicolas Le Goff	bbbe292e04	Merge with 3.6	2012-01-17 18:00:34 +01:00
Nicolas Le Goff	a3c84216a6	add message for Exception_Databox_CollectionNotFound exception	2012-01-17 16:34:37 +01:00
jygaulier	e5828f06bb	-	2012-01-17 12:03:41 +01:00
Romain Neutron	af860e2fa6	Merge with master	2012-01-16 20:19:20 +01:00
Romain Neutron	b24c6bab43	Fix #228: Stamp logo non visible	2012-01-16 20:06:55 +01:00
Romain Neutron	aef4cdf5f3	Add exiftool namespaces : http://owl.phy.queensu.ca/~phil/exiftool/TagNames/XMP.html#iptcCore and ... http://owl.phy.queensu.ca/~phil/exiftool/TagNames/XMP.html#xmpRights	2012-01-16 19:56:17 +01:00
Romain Neutron	c813082407	Fix #227 : Import/Export users	2012-01-16 19:30:12 +01:00
Romain Neutron	785fd657d0	Add notice "copy paste this link if you can not click it" in mails	2012-01-13 12:49:48 +01:00
Romain Neutron	5133425a7c	Fix Bug : collection order is not saved	2012-01-13 12:44:44 +01:00
Romain Neutron	1cdaa8d726	Fix Bug in push search : only last search parameters is taken	2012-01-13 12:41:05 +01:00