394 Commits

Author	SHA1	Message	Date
Romain Neutron	1ce52264fb	Fix readonly fields	2012-01-25 15:27:08 +01:00
jygaulier	5a5f86a97b	-	2012-01-19 21:01:03 +01:00
Nicolas Le Goff	9fc05289a5	get services from new service builder	2012-01-19 16:16:22 +01:00
Romain Neutron	c813082407	Fix #227 : Import/Export users	2012-01-16 19:30:12 +01:00
Nicolas Le Goff	65cce08fad	add task to check configuration file	2012-01-12 18:54:39 +01:00
Romain Neutron	4fc8da1d15	Fix #206 : search by date	2012-01-11 14:46:06 +01:00
Romain Neutron	5c8d00397c	Allox usr_mail to be null	2012-01-11 11:18:13 +01:00
Nicolas Le Goff	554e657d68	add twig service	2012-01-06 16:32:45 +01:00
Nicolas Le Goff	7963d0aec8	add todo	2012-01-06 16:32:19 +01:00
Romain Neutron	e5648b9335	Fix update users details	2012-01-05 12:36:41 +01:00
Nicolas Le Goff	6720192ba0	Merge branch 'fix_report' into 3.6	2012-01-04 15:18:47 +01:00
Nicolas Le Goff	b321d1540e	fix #153 No display of thumbs in report	2012-01-04 15:15: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
Nicolas Le Goff	43fbee03c2	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 16:17:49 +01:00
Nicolas Le Goff	e540bd39d3	Merge branch 'fix_report' into 3.6	2012-01-03 16:15:10 +01:00
Nicolas Le Goff	6872ceb3db	fix #138 report / user downloads	2012-01-03 16:12:41 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Nicolas Le Goff	0812cb0a9b	copy the new config .yml file with user settings	2012-01-03 14:58:44 +01:00
Romain Neutron	e288fb0189	Fix #141 : wrong report datas	2012-01-03 14:56:50 +01:00
Romain Neutron	745d27b821	Fix #142 : add ability to apply template from user rights view	2012-01-03 13:49:13 +01:00
Romain Neutron	a8faa8ceef	Fix #142 : add default user sort to date desc	2012-01-03 13:47:32 +01:00
Romain Neutron	06887a068d	Basket should'nt load if empty	2012-01-03 13:45:44 +01:00
Nicolas Le Goff	0dc748a14d	add prettyString filter	2011-12-30 14:30:59 +01:00
Romain Neutron	9ea7c19c92	Fix #135 : substitution of a story image	2011-12-30 11:59:31 +01:00
Romain Neutron	cda51b4686	Removing dirname(__FILE__)	2011-12-26 20:42:31 +01:00
Romain Neutron	fbff35ea25	Add method apply template to controller edit user	2011-12-26 16:05:39 +01:00
Romain Neutron	88135030b4	Add method apply template to controller edit user	2011-12-26 16:05:28 +01:00
Nicolas Le Goff	a6edeb691f	Merge	2011-12-20 19:58:10 +01:00
Romain Neutron	fb800696ba	Fix bug #99 : unable to upgrade from 3.1 without creating a config.inc file manually	2011-12-20 17:38:38 +01:00
Romain Neutron	03e36caefe	Cleanup Prod	2011-12-16 17:22:47 +01:00
Romain Neutron	1e0d06bc56	Merged with 3.5.1	2011-12-15 14:25:47 +01:00
Romain Neutron	32f599e6f9	Merged with 3.5.1	2011-12-15 14:22:46 +01:00
Romain Neutron	6d2daacd9b	Fix bug : API throws 500 error when session is not re-openened	2011-12-15 14:04:00 +01:00
Romain Neutron	62deb6f4bf	Adding uncommited fixes	2011-12-15 12:45:59 +01:00
Romain Neutron	1fc97a767d	Add Basket controller to Prod application	2011-12-15 11:58:57 +01:00
Nicolas Le Goff	dec2bbb327	clean module	2011-12-14 20:15:16 +01:00
Nicolas Le Goff	47518c2c7c	mount new controllers	2011-12-14 16:00:33 +01:00
Nicolas Le Goff	d182d7dad0	delete prod record module	2011-12-14 15:56:23 +01:00
Romain Neutron	d4794801fc	Moved controllers	2011-12-14 13:14:47 +01:00
Romain Neutron	5622c31bcd	Fix typo	2011-12-13 19:05:57 +01:00
Romain Neutron	9fb986e8f0	Fix upgrade with a bad databox	2011-12-08 17:22:34 +01:00
Romain Neutron	af558b4a75	Add a console command to fix all duplicates addresses	2011-12-08 16:42:34 +01:00
Romain Neutron	4c5b7eb658	V 3.5 RC 1	2011-12-05 00:23:28 +01:00