55 Commits

Author	SHA1	Message	Date
Romain Neutron	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
Romain Neutron	7319930d5c	Removed old controllers	2012-01-23 18:16:43 +01:00
Romain Neutron	d38103d410	Fix subdefs controller classname	2012-01-20 15:24:03 +01:00
Romain Neutron	1d8bbd34d3	Add vocabulary settings to controller	2012-01-20 15:23:49 +01:00
Romain Neutron	41f99bff9e	Merge	2012-01-12 16:05:49 +01:00
Romain Neutron	65215d69e2	Fix collection cache name bug	2012-01-12 16:03:49 +01:00
Romain Neutron	3d32dcd2ce	Merge	2012-01-11 21:06:33 +01:00
Romain Neutron	3ea1e067a0	Fix wrong path	2012-01-11 21:01:59 +01:00
Nicolas Le Goff	3125bdc7af	Merge	2012-01-11 15:04:52 +01:00
Nicolas Le Goff	d61b08ecea	load connexion from connexion file	2012-01-11 12:27:34 +01:00
Romain Neutron	c239740542	Merge branch 'HotFix' into 3.6	2012-01-10 21:24:12 +01:00
Romain Neutron	43dabbe867	Fix #196 : applya template during registration removes registration on other collections	2012-01-10 20:46:08 +01:00
Nicolas Le Goff	9831cc45c3	add twig service	2012-01-06 16:25:33 +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
jygaulier	d15abe329e	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 17:47:05 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Nicolas Le Goff	c4de980ba7	replace config.inc	2012-01-03 14:54:12 +01:00
Romain Neutron	dfa31dc3b8	Add link to autoregister setup	2012-01-03 14:22:06 +01:00
Romain Neutron	654ca168c7	Removed invite and autoregister links from dashboard	2012-01-03 14:21:13 +01:00
jygaulier	e47f864ff0	fix bug on custom tasks	2012-01-03 13:50:47 +01:00
Romain Neutron	745d27b821	Fix #142 : add ability to apply template from user rights view	2012-01-03 13:49:13 +01:00
jygaulier	0370bec2e3	fix bug on custom tasks	2012-01-03 12:19:35 +01:00
Romain Neutron	647946e802	Merge branch 'RequiredField' into 3.6	2011-12-28 23:12:23 +01:00
Romain Neutron	d0761afae1	Fix #129 : setup a databox field as required	2011-12-28 23:11:49 +01:00
Romain Neutron	c7e0dd378c	Merge branch 'FixSeparator' into 3.6	2011-12-28 23:05:46 +01:00
Romain Neutron	88552650a0	JY changes	2011-12-28 22:55:11 +01:00
Romain Neutron	2c850bf74f	Syntax corrections	2011-12-27 15:51:19 +01:00
Romain Neutron	1617d3e561	Fix events loader	2011-12-27 15:46:23 +01:00
Romain Neutron	e3727938fb	Merge branch 'FixSeparator' into 3.6	2011-12-27 14:36:19 +01:00
Romain Neutron	382be15123	Fix #122 : customization du separateur de valeurs multivaluées	2011-12-27 14:32:46 +01:00
Romain Neutron	cda51b4686	Removing dirname(__FILE__)	2011-12-26 20:42:31 +01:00
Romain Neutron	e3294e6f47	Merge with master	2011-12-26 18:39:41 +01:00
Romain Neutron	6d0d60d713	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-26 17:26:37 +01:00
Romain Neutron	9f8dd943b3	Fix #110 : make user management table sortable	2011-12-26 17:24:50 +01:00
Romain Neutron	c6a60052c6	Add option to apply template to Twig templates	2011-12-26 16:08:49 +01:00
Romain Neutron	2a3186c10f	Fix version numbers	2011-12-23 17:18:00 +01:00
Nicolas Le Goff	a6edeb691f	Merge	2011-12-20 19:58:10 +01:00
Nicolas Le Goff	9cd0d6d7aa	Fix bug #101	2011-12-20 18:34:19 +01:00
Nicolas Le Goff	54c8a7a138	Fix #101 : Non graphical tasks does not update their values in database	2011-12-20 18:27:14 +01:00
Romain Neutron	1e0d06bc56	Merged with 3.5.1	2011-12-15 14:25:47 +01:00
Romain Neutron	86329b9507	Add descriptor type in interface	2011-12-15 12:32:32 +01:00
Romain Neutron	c94c4279ac	Enhanced error messages	2011-12-15 12:31:58 +01:00
Nicolas Le Goff	799e35f794	declare new app path	2011-12-14 20:13:33 +01:00
Romain Neutron	2d88ad234e	Fix display of checkboxes	2011-12-07 18:37:00 +01:00
Romain Neutron	4c5b7eb658	V 3.5 RC 1	2011-12-05 00:23:28 +01:00
Alchemy	6f1ee368aa	Version 3.1.23	2011-10-18 14:26:13 +02:00
Alchemy	6f9ef7654d	version 3.1.20	2011-08-29 15:36:23 +02:00
Alchemy	ff8cd59afb	tag 3.1.14	2011-05-23 15:50:08 +02:00
Alchemy	facf6524cd	version 3.1.10	2011-04-08 15:42:53 +02:00