1762 Commits

Author	SHA1	Message	Date
Romain Neutron	200b8c3576	Update setup upgrade	2012-10-04 15:42:54 +02:00
Romain Neutron	a757adbdbe	Update user query and user adapter	2012-10-04 15:42:54 +02:00
Romain Neutron	28880af8e5	Update patches	2012-10-04 15:42:54 +02:00
Romain Neutron	3e13cb455c	Update base and bootstrap	2012-10-04 15:42:54 +02:00
Romain Neutron	9cf8055d49	Update ACL	2012-10-04 15:42:54 +02:00
Romain Neutron	e176823f80	Fix interface	2012-10-04 15:31:36 +02:00
Romain Neutron	1a3461d5fc	Update to filesystem service provider	2012-10-04 15:31:36 +02:00
Romain Neutron	ba25b8cc7c	Merge with 3.7	2012-10-04 12:49:01 +02:00
romain	09520db2b5	Fix #924 : Add permanent cookie only if necessary	2012-10-04 11:27:26 +02:00
romain	8deacf0d01	Backport JY changes	2012-10-04 11:13:07 +02:00
Romain Neutron	b10c6120fa	Fix #901 : allow upgrade from Phraseanet 3.1	2012-09-27 14:22:31 +02:00
jygaulier	537f14268f	reverts	2012-09-27 14:20:59 +02:00
jygaulier	ec9ce01a6e	CS	2012-09-27 14:20:59 +02:00
jygaulier	255cc7b3ad	security fix ... fix bug : indexer did not start	2012-09-27 14:20:37 +02:00
jygaulier	bfc1ddcb5f	fix issue 895 (scheduler creates zombies) ... fix bug in windows : tasks did not start cleanup	2012-09-27 14:19:50 +02:00
Nicolas Le Goff	08ae7bad76	add "feed_id" property for a feed entry ... revert CS change feed property order	2012-09-27 14:19:49 +02:00
Romain Neutron	9dd1575dc9	Move Events Manager to service	2012-09-27 14:19:48 +02:00
Romain Neutron	e96a861f0a	Fix #901 : allow upgrade from Phraseanet 3.1	2012-09-27 12:56:06 +02:00
Romain Neutron	7b20efd430	Merge pull request #223 from jygaulier/fix895 ... fix issue 895 (scheduler creates zombies)	2012-09-27 01:41:10 -07:00
jygaulier	9476fb6b51	reverts	2012-09-26 17:52:07 +02:00
jygaulier	7e2d522c77	CS	2012-09-26 17:14:14 +02:00
jygaulier	a078aac6da	security fix ... fix bug : indexer did not start	2012-09-26 17:04:02 +02:00
jygaulier	bdc059028a	fix issue 895 (scheduler creates zombies) ... fix bug in windows : tasks did not start cleanup	2012-09-26 15:27:14 +02:00
Nicolas Le Goff	f446937e26	add "feed_id" property for a feed entry ... revert CS change feed property order	2012-09-25 16:50:19 +02:00
Romain Neutron	b86c3ed0c0	Move Events Manager to service	2012-09-24 18:36:40 +02:00
Romain Neutron	0037c593dc	Cleanup	2012-09-19 15:42:15 +02:00
Romain Neutron	70a3244431	post merge cleanup	2012-09-19 15:39:55 +02:00
Romain Neutron	8e8fdf4dfc	post merge cleanup	2012-09-19 15:39:48 +02:00
jygaulier	9a008c631a	apply comments of pull request	2012-09-17 15:24:50 +02:00
jygaulier	17eb3b0176	fix some tasks bugs, delete old files	2012-09-17 14:16:15 +02:00
jygaulier	90841c5ba1	fusion task, tasks, scheduler dans taskmanager ... todo : tests	2012-09-17 14:16:15 +02:00
jygaulier	6e302e85a4	silexing taskmanager & tasks	2012-09-17 14:16:15 +02:00
jygaulier	151fed4d1b	fix bad CS	2012-09-17 13:38:19 +02:00
jygaulier	883cb1dec6	en cours : silexing taskmanager : add first tests	2012-09-17 13:38:19 +02:00
jygaulier	be24152468	en cours : silexing taskmanager	2012-09-17 13:38:19 +02:00
Romain Neutron	70f64da8d1	Merge branch '3.7'	2012-09-14 17:00:07 +02:00
Romain Neutron	becf617f52	Fix SQL	2012-09-14 16:59:32 +02:00
Romain Neutron	f6b6605e93	Merge branch '3.7'	2012-09-14 16:41:50 +02:00
Romain Neutron	8cca2b9f90	Merge pull request #213 from jygaulier/ArchiveTask ... fic CTRLC	2012-09-14 07:41:01 -07:00
Romain Neutron	a80073395d	Merge with 3.7	2012-09-14 16:18:22 +02:00
Romain Neutron	177b622241	Revert SQL	2012-09-14 16:14:26 +02:00
Romain Neutron	b6faccb50d	Fix Feed Collection	2012-09-14 15:23:06 +02:00
Romain Neutron	39782c6b4c	Fix typo	2012-09-14 14:16:48 +02:00
Romain Neutron	a8209d8c1c	Fix story picture definition	2012-09-14 11:43:08 +02:00
jygaulier	cd95cfa152	fic CTRLC	2012-09-13 16:53:23 +02:00
Romain Neutron	4bb1a1d870	Merge branch '3.7'	2012-09-13 12:31:20 +02:00
Romain Neutron	8dc6afc88f	Switch to constants	2012-09-13 12:29:48 +02:00
Romain Neutron	6ce46aed18	Fix archive task	2012-09-13 12:29:38 +02:00
Romain Neutron	1c592224d9	Add option -y (answer yes to all questions) and -f (force upgrade even if a concurrent one is running) to system:upgrade command	2012-09-12 14:35:41 +02:00
Romain Neutron	35df701d4c	Add option -y (answer yes to all questions) and -f (force upgrade even if a concurrent one is running) to system:upgrade command	2012-09-10 13:39:48 +02:00