47 Commits

Author	SHA1	Message	Date
Romain Neutron	b299e7d042	Fix build	2012-01-26 19:12:51 +01:00
Romain Neutron	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
Romain Neutron	de5ffe76ae	Cleanup	2012-01-25 18:47:04 +01:00
Romain Neutron	e1c95b49a5	Merge with master	2012-01-25 17:25:25 +01:00
Romain Neutron	b13874e023	Fix build	2012-01-25 17:12:12 +01:00
Romain Neutron	9852e2077c	Meta writer	2012-01-25 15:09:02 +01:00
Nicolas Le Goff	b774bfce9d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-11 16:59:15 +01:00
Nicolas Le Goff	3125bdc7af	Merge	2012-01-11 15:04:52 +01:00
Nicolas Le Goff	c5c4418020	load connexion from connexion file	2012-01-11 12:29:44 +01:00
Romain Neutron	f583cf60f8	Merge branch 'FixFTP' into 3.6	2012-01-11 11:57:43 +01:00
Romain Neutron	6d830053d1	Fix logfile	2012-01-11 11:56:47 +01:00
Romain Neutron	c239740542	Merge branch 'HotFix' into 3.6	2012-01-10 21:24:12 +01:00
Romain Neutron	ecc82f6222	Merge master fix	2012-01-10 20:33:17 +01:00
Romain Neutron	319bbf2f3f	Fix FTP pull	2012-01-10 13:23:31 +01:00
Nicolas Le Goff	0ebb8b0908	merge	2012-01-04 17:04:15 +01:00
Romain Neutron	30e4b37888	Merge with master	2012-01-04 16:24:47 +01:00
Romain Neutron	39ef843a5d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-04 10:47:16 +01:00
Romain Neutron	c2f0d5dc47	Merge with master	2012-01-04 10:47:01 +01:00
Romain Neutron	6a78fefea1	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-04 10:45:35 +01:00
Romain Neutron	8365b32206	Removed some excessive verbose	2012-01-04 10:32:54 +01:00
jygaulier	d3c9d90bea	fix for 3.5, show sql	2012-01-03 18:56:38 +01:00
Nicolas Le Goff	a9039ba876	replace config.inc	2012-01-03 14:36:17 +01:00
Romain Neutron	de2f34721d	Merge	2011-12-29 14:07:47 +01:00
Romain Neutron	32ddd4aee8	Task do not have a correct return value when abox connection is lost	2011-12-29 14:03:52 +01:00
Romain Neutron	c7e0dd378c	Merge branch 'FixSeparator' into 3.6	2011-12-28 23:05:46 +01:00
Romain Neutron	88552650a0	JY changes	2011-12-28 22:55:11 +01:00
Romain Neutron	607974edcb	Merge branch '3.5.5' into 3.6	2011-12-28 15:00:18 +01:00
Romain Neutron	f4814e1fe8	Fix #127 : tasks crash counter is reseted on task start	2011-12-28 14:55:40 +01:00
Romain Neutron	1617d3e561	Fix events loader	2011-12-27 15:46:23 +01:00
Romain Neutron	cda51b4686	Removing dirname(__FILE__)	2011-12-26 20:42:31 +01:00
Romain Neutron	e3294e6f47	Merge with master	2011-12-26 18:39:41 +01:00
Romain Neutron	6d0d60d713	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-26 17:26:37 +01:00
Romain Neutron	ead7c5193d	Fix #108: Upgrade to v3.5 does not kill after upgrade	2011-12-26 13:02:06 +01:00
Nicolas Le Goff	a6edeb691f	Merge	2011-12-20 19:58:10 +01:00
Nicolas Le Goff	9cd0d6d7aa	Fix bug #101	2011-12-20 18:34:19 +01:00
Nicolas Le Goff	54c8a7a138	Fix #101 : Non graphical tasks does not update their values in database	2011-12-20 18:27:14 +01:00
Romain Neutron	7d5a03f45a	Fix bug #104 : record not indexed after having been archived	2011-12-20 16:50:27 +01:00
Romain Neutron	4c5b7eb658	V 3.5 RC 1	2011-12-05 00:23:28 +01:00
Alchemy	6f1ee368aa	Version 3.1.23	2011-10-18 14:26:13 +02:00
Alchemy	3d78a7407e	version 3.1.22	2011-09-20 12:26:46 +02:00
Alchemy	6f9ef7654d	version 3.1.20	2011-08-29 15:36:23 +02:00
Alchemy	fdf355dd88	version 3.1.12	2011-05-03 18:02:58 +02:00
Alchemy	facf6524cd	version 3.1.10	2011-04-08 15:42:53 +02:00
Alchemy	045562d3f5	Fixing latests bugs, upgrading to 3.1.8	2011-03-28 19:08:33 +02:00
Alchemy	24f9591491	Enhancend some quarantine feature, duplicate image detection	2011-03-15 12:01:35 +01:00
Alchemy	443a081da5	Version 3.1.5	2011-03-04 16:52:22 +01:00
Alchemy	339d23c06d	initial import	2011-02-16 16:09:48 +01:00