12 Commits

Author	SHA1	Message	Date
Romain Neutron	e286c84eb1	Merge with Scheduler 2 branch	2012-03-19 19:14:10 +01:00
jygaulier	8bd291f569	Merge with master	2012-03-07 11:22:08 +01:00
Romain Neutron	cc8acb342e	Refactor Appbox	2012-02-21 16:26:07 +01:00
Romain Neutron	a9c7ed23cb	Coding standards	2012-02-02 15:43:12 +01:00
Romain Neutron	067561a734	Merge with master	2012-01-31 22:22:54 +01:00
jygaulier	5feebb8355	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-31 20:06:55 +01:00
jygaulier	ab44742882	fix #262 : archive task / waiting for a 'magic file' in any subfolder locked whole archiving	2012-01-31 19:30:40 +01:00
jygaulier	72078aa836	-	2012-01-31 19:21:06 +01:00
Romain Neutron	69abf305d4	Removed sleep connections	2012-01-31 11:33:35 +01:00
Romain Neutron	b13874e023	Fix build	2012-01-25 17:12:12 +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