2716 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	c9ff84c345	Fix unit tests	2012-03-30 13:34:42 +02:00
Romain Neutron	1b1e0627ed	Fix Apc cache unit tests	2012-03-30 13:32:46 +02:00
Romain Neutron	575f37ea38	Migrate to Doctrine Data-Fixtures 2.2	2012-03-30 13:32:14 +02:00
Romain Neutron	2bb663c096	Merge branch 'FixPermalinks' into Dev	2012-03-27 18:56:06 +02:00
Romain Neutron	64b80b5d45	Fix token renewal on subdefinitions re-creation	2012-03-27 18:55:15 +02:00
Romain Neutron	fd3d46ddcd	Merge branch 'FixExtension' into Dev	2012-03-27 15:21:37 +02:00
Romain Neutron	dfe6a75846	Fix extension parameters load	2012-03-27 15:17:54 +02:00
Romain Neutron	fe75dac089	Cleanup	2012-03-27 15:10:13 +02:00
Romain Neutron	87ad76fc02	Fix check extension for businessfields	2012-03-27 15:09:53 +02:00
Romain Neutron	e5ffd6fa57	Merge branch 'FixTasks' into Dev	2012-03-27 14:44:09 +02:00
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
jygaulier	3a3ae5dc1c	Merge branch 'BusinessFields' into Dev	2012-03-26 16:41:59 +02:00
jygaulier	fa3d131432	test extension	2012-03-26 16:40:38 +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	5478e668d8	Add correct Exit status	2012-03-26 13:57:30 +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	05b0e4ede5	Fix console	2012-03-26 13:02:16 +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	c7632846bb	Fix Error loading	2012-03-23 17:41:24 +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	5ad365956c	Fix audio thumbnails formatting	2012-03-22 16:38:56 +01:00
Romain Neutron	62caa5e10a	Implements BusinessFields in export	2012-03-22 16:38:35 +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	e378d1f541	Fix image alignment	2012-03-22 15:50:21 +01:00
Romain Neutron	b7bd0c4650	Fix image alignment	2012-03-22 15:49:35 +01:00
Romain Neutron	43a1721479	Bump to version 3.6.1 3.6.1	2012-03-22 15:27:53 +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	9a6d475f3b	Flushing the cache now empty the cache registry	2012-03-22 15:23:14 +01:00
Romain Neutron	b35bea771f	Baskets cleanup	2012-03-22 15:22:41 +01:00