22 Commits

Author	SHA1	Message	Date
Romain Neutron	ade22295ad	Fix CS	2012-04-26 00:55:53 +02:00
Romain Neutron	dd994a9bd6	Fix CS	2012-04-25 17:38:49 +02:00
Romain Neutron	7a82a72e30	Cleanup after merge	2012-03-20 21:29:52 +01:00
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	a574dd14a8	Refactor Appbox	2012-02-21 16:07:34 +01:00
Romain Neutron	067561a734	Merge with master	2012-01-31 22:22:54 +01:00
jygaulier	72078aa836	-	2012-01-31 19:21:06 +01:00
Romain Neutron	99a344774f	Coding standards	2012-01-31 18:35:27 +01:00
Romain Neutron	69abf305d4	Removed sleep connections	2012-01-31 11:33:35 +01:00
Romain Neutron	190b5992ff	Cleaning opened connections	2012-01-30 12:00:34 +01:00
jygaulier	5a5f86a97b	-	2012-01-19 21:01:03 +01:00
jygaulier	e5828f06bb	-	2012-01-17 12:03:41 +01:00
Nicolas Le Goff	c5c4418020	load connexion from connexion file	2012-01-11 12:29:44 +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	8365b32206	Removed some excessive verbose	2012-01-04 10:32:54 +01:00
Nicolas Le Goff	a9039ba876	replace config.inc	2012-01-03 14:36:17 +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	cda51b4686	Removing dirname(__FILE__)	2011-12-26 20:42:31 +01:00
Romain Neutron	4c5b7eb658	V 3.5 RC 1	2011-12-05 00:23:28 +01:00