819 Commits

Author	SHA1	Message	Date
Romain Neutron	5427d334c3	Fix tasks for 3.6+	2012-03-27 14:43:05 +02:00
Romain Neutron	e11ac4275e	Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into Dev	2012-03-27 13:39:53 +02:00
Romain Neutron	a2554577f7	Merge pgrade scripts	2012-03-27 13:39:12 +02:00
Romain Neutron	5b0963e5f2	Fix upgrade scripts for large volumes	2012-03-27 13:35:07 +02:00
jygaulier	8d504605e6	fix : business fields were not serialized in xml	2012-03-26 17:19:54 +02:00
Romain Neutron	c0dfe1657b	Merge branch 'BusinessFields' into Dev	2012-03-26 14:21:16 +02:00
Romain Neutron	938cd9276d	Merge branch 'master' into Dev	2012-03-26 14:20:52 +02:00
Romain Neutron	5acfdf0f3c	Merge with 3.5	2012-03-26 14:12:52 +02:00
Romain Neutron	85f32e4e23	Add check on Video icon on video thumbnail	2012-03-26 13:57:50 +02:00
Romain Neutron	f85d159ea0	Add correct Exit status	2012-03-26 13:48:06 +02:00
Romain Neutron	b35ece6eab	Remove metadata key	2012-03-26 13:31:27 +02:00
Romain Neutron	4d6cad987b	Fix patches	2012-03-26 13:02:02 +02:00
Romain Neutron	1189cece49	Merge with master	2012-03-23 17:43:51 +01:00
Romain Neutron	a9ea620875	Fix DQL syntax	2012-03-23 17:41:01 +01:00
Romain Neutron	84c0d2cdf0	Fix unit tests	2012-03-23 17:39:39 +01:00
Romain Neutron	5bd6c9d629	Implements search engine queries	2012-03-23 13:56:10 +01:00
Romain Neutron	3de8375289	Implements business fields in search engines	2012-03-23 13:49:21 +01:00
jygaulier	39c3f97460	Merge branch 'BusinessFields' of github.com:alchemy-fr/Phraseanet into BusinessFields	2012-03-22 19:54:06 +01:00
jygaulier	d22a360a12	BusinessFields : add fake collist to phrasea_query2(...) to quick test	2012-03-22 19:53:50 +01:00
Romain Neutron	fc926dbe33	Fix Upgrade	2012-03-22 18:51:25 +01:00
Romain Neutron	815a15fe5e	Add businessfields option to FTP	2012-03-22 18:26:20 +01:00
Romain Neutron	1a936120ed	Fix Upgrade	2012-03-22 17:41:01 +01:00
Romain Neutron	97b5632017	Fix bug serialization export	2012-03-22 17:12:24 +01:00
Romain Neutron	31165c6816	Add business fields options in export dialog	2012-03-22 17:04:22 +01:00
Romain Neutron	63595e9dee	Implements BusinessFields in export	2012-03-22 16:38:07 +01:00
Romain Neutron	b694b6bb6d	Implements BusinessFields in serializer	2012-03-22 16:37:34 +01:00
Romain Neutron	e09588aec3	Merge branch '361' into BusinessFields	2012-03-22 15:26:57 +01:00
Romain Neutron	5475a5b4ea	Merge branch '361' into Dev	2012-03-22 15:26:45 +01:00
Romain Neutron	b35bea771f	Baskets cleanup	2012-03-22 15:22:41 +01:00
jygaulier	3d53ef9f23	allow search on business fields (last parm of phrasea_query2 = TRUE)	2012-03-21 20:31:33 +01:00
Romain Neutron	2a69ceac6a	Implements business fields in view	2012-03-21 17:55:32 +01:00
Romain Neutron	989402620b	Add consistency to caption field values	2012-03-21 16:38:16 +01:00
Romain Neutron	f1921e5aff	Refactor separator check ... Add InvalidArgument Exception if name is invalid Remove unused method is_distinct	2012-03-21 15:40:42 +01:00
Romain Neutron	28d61125d3	Fix typo	2012-03-21 15:39:55 +01:00
Romain Neutron	a9bd1f2d6c	Add business fields in admin interface	2012-03-21 13:18:37 +01:00
Romain Neutron	e1bee8225a	Remove business field check in meta writing as it is already check	2012-03-21 11:59:59 +01:00
Romain Neutron	a43d764f3d	Add consistency check on caption field values	2012-03-21 11:58:24 +01:00
Romain Neutron	0ecb391e8d	Fix scheduler status	2012-03-21 11:56:48 +01:00
Romain Neutron	183eb30489	Disable business fields	2012-03-21 09:41:58 +01:00
Romain Neutron	b9366c3823	Add Business field to schema	2012-03-20 21:31:15 +01:00
Romain Neutron	7a82a72e30	Cleanup after merge	2012-03-20 21:29:52 +01:00
Romain Neutron	415be93920	Cleanup after merge	2012-03-20 21:29:20 +01:00
Romain Neutron	384552d4b8	Refactor set_export::getCaption	2012-03-20 19:11:09 +01:00
Romain Neutron	d1a5824c19	Merge	2012-03-20 15:53:08 +01:00
Romain Neutron	ffa2ba233e	Merge	2012-03-20 15:52:36 +01:00
Romain Neutron	5ed518e423	Fix upgrade	2012-03-20 15:45:32 +01:00
Romain Neutron	9bce2cf3a5	Refactor caption serialization	2012-03-20 15:44:32 +01:00
Romain Neutron	583ee314b4	Refactor caption serialization	2012-03-20 15:42:59 +01:00
Romain Neutron	a10fb04999	Remove report::getChamp	2012-03-20 14:50:36 +01:00
Romain Neutron	4c7f3897bf	Fix build	2012-03-20 13:40:00 +01:00