3516 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	d794e92bd5	Update dependencies	2012-09-19 15:40:09 +02:00
Romain Neutron	af350db853	Revert dependencies	2012-09-19 15:40:06 +02:00
Romain Neutron	2430a9245b	post merge cleanup	2012-09-19 15:40:03 +02:00
Romain Neutron	12bd132288	post merge cleanup	2012-09-19 15:39:59 +02:00
Romain Neutron	70a3244431	post merge cleanup	2012-09-19 15:39:55 +02:00
Romain Neutron	002f4e2b7d	post merge cleanup	2012-09-19 15:39:52 +02:00
Romain Neutron	8e8fdf4dfc	post merge cleanup	2012-09-19 15:39:48 +02:00
Romain Neutron	fb5cb6b74a	Update rewrite rules	2012-09-19 15:39:43 +02:00
Romain Neutron	02637a1481	Update dependencies	2012-09-19 15:39:38 +02:00
Romain Neutron	4e18f12fe4	Rename files	2012-09-19 15:39:29 +02:00
Romain Neutron	05495d89a4	Merge pull request #208 from jygaulier/TaskManager ... Task manager with routes /admin/task-manager/...	2012-09-19 02:01:33 -07:00
jygaulier	8c5d5340ca	apply comments of pull request	2012-09-17 15:37:06 +02:00
jygaulier	599e8ad3e1	apply comments of pull request	2012-09-17 15:31:16 +02:00
jygaulier	5f4c09ba72	apply comments of pull request	2012-09-17 15:31:03 +02:00
jygaulier	ab7b61d885	apply comments of pull request	2012-09-17 15:29:58 +02:00
jygaulier	9a008c631a	apply comments of pull request	2012-09-17 15:24:50 +02:00
jygaulier	8a0d98db7e	test taskmanager	2012-09-17 14:16:16 +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	7a9dd3b612	en cours : silexing taskmanager	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	4e6753baa0	Merge pull request #215 from romainneutron/HotFixes ... Hot fixes	2012-09-14 07:14:55 -07:00
Romain Neutron	177b622241	Revert SQL	2012-09-14 16:14:26 +02:00
Romain Neutron	bded0d2df1	Fix CS	2012-09-14 16:13:28 +02:00
Romain Neutron	b6faccb50d	Fix Feed Collection	2012-09-14 15:23:06 +02:00
Romain Neutron	afc3806a2d	Fix #893 && #894	2012-09-14 14:35:02 +02:00
Romain Neutron	39782c6b4c	Fix typo	2012-09-14 14:16:48 +02:00
Romain Neutron	05055c7272	Add empty lazaret route	2012-09-14 14:16:24 +02:00
Romain Neutron	51e202459a	Add media subdef test	2012-09-14 12:34:35 +02:00
Romain Neutron	61be8e4ad7	Split value of Phraseanet TF fields	2012-09-14 12:34:02 +02:00
Romain Neutron	0cb823f65e	Enhance lightbox error message	2012-09-14 11:58:58 +02:00
Romain Neutron	b2f0c701ea	Fix caption inclusion	2012-09-14 11:53:04 +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	6b0aff4d72	Merge branch '3.7'	2012-09-13 12:47:23 +02:00
Romain Neutron	b5079ffacf	Add better exception message	2012-09-13 12:44:37 +02:00
Romain Neutron	4bb1a1d870	Merge branch '3.7'	2012-09-13 12:31:20 +02:00
Romain Neutron	c2a78c9d19	Merge pull request #212 from romainneutron/ArchiveTask ... Archive task	2012-09-13 03:30:31 -07: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	f1df64d512	Merge with 3.7	2012-09-13 11:30:58 +02:00
Romain Neutron	7150a3e9b0	Merge pull request #211 from romainneutron/master ... Merge with 3.7	2012-09-13 02:29:45 -07:00