3071 Commits

Author	SHA1	Message	Date
Nicolas Le Goff	c70755e9ec	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-29 18:46:51 +01:00
Nicolas Le Goff	521b9b2b4b	fix cooliris feed issue & fix rss tests	2011-12-29 18:45:26 +01:00
Romain Neutron	87337473fa	Fix build	2011-12-29 18:24:42 +01:00
Romain Neutron	de2f34721d	Merge	2011-12-29 14:07:47 +01:00
Romain Neutron	32ddd4aee8	Task do not have a correct return value when abox connection is lost	2011-12-29 14:03:52 +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	28736fb20c	Fix #131 : use first separator as main separator	2011-12-28 23:02:53 +01:00
Romain Neutron	88552650a0	JY changes	2011-12-28 22:55:11 +01:00
Romain Neutron	646db61ca7	Refactor asket_adapter	2011-12-28 20:04:39 +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	742befa16a	Fix #128 ; highlight on multivalued fields fails	2011-12-28 14:47:24 +01:00
Romain Neutron	4ab9a2563b	Fix #123 : Databox injected rights are removed everytime you logout.	2011-12-28 13:07:17 +01:00
Romain Neutron	32a7b2bfe8	Fix basket_adapter	2011-12-27 20:36:42 +01:00
Romain Neutron	5e568b0062	Merge branch 'FixCollDisplay' into 3.6	2011-12-27 19:51:17 +01:00
Romain Neutron	1774110a33	Fix #125 : Databox details are missing in admin	2011-12-27 19:48:32 +01:00
Romain Neutron	5b0f93de05	Basket refactor	2011-12-27 19:16:55 +01:00
Romain Neutron	1617d3e561	Fix events loader	2011-12-27 15:46:23 +01:00
Romain Neutron	affd3e28e0	Fix Core load event manager	2011-12-27 15:35:03 +01:00
Romain Neutron	e3727938fb	Merge branch 'FixSeparator' into 3.6	2011-12-27 14:36:19 +01:00
Romain Neutron	bf3d78b700	Fix #122 : customization du separateur de valeurs multivaluées	2011-12-27 14:32:13 +01:00
Romain Neutron	9d965538b4	Refactor basket_adapter	2011-12-27 14:07:09 +01:00
Romain Neutron	f6eef1af39	Integrate PhraseaCore in Events Manager	2011-12-27 14:04:47 +01:00
Nicolas Le Goff	c7e9161c7f	merge	2011-12-27 13:06:51 +01:00
Nicolas Le Goff	c191f91f1c	add environnement to bootstrap::execute	2011-12-27 12:53:56 +01:00
Romain Neutron	cda51b4686	Removing dirname(__FILE__)	2011-12-26 20:42:31 +01:00
Romain Neutron	cf5333bbf0	Removed unused function	2011-12-26 20:38:53 +01:00
Romain Neutron	e66c0bf148	Merge with Fix tests	2011-12-26 18:42:08 +01:00
Romain Neutron	e3294e6f47	Merge with master	2011-12-26 18:39:41 +01:00
Romain Neutron	1d5500e6e0	Databox field type is required and default is string	2011-12-26 18:09:59 +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	206bf058d5	Fix #116 Thumbtitle lost with 3.5 migrate	2011-12-26 16:36:57 +01:00
Romain Neutron	1cb8f2f2a1	Rewrite of ACL::apply_template	2011-12-26 16:07:28 +01:00
Romain Neutron	1bb1469108	Fix #114 : subdef substitution fails	2011-12-26 16:07:05 +01:00
Romain Neutron	9427baf8b6	Add method apply template to controller edit user	2011-12-26 16:05:52 +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
Romain Neutron	138ed434b2	Add method User_Adapter::get_template_owner	2011-12-26 16:04:47 +01:00
Romain Neutron	5dc97682be	Add method User_Query::only_template	2011-12-26 16:04:28 +01:00
Romain Neutron	d74f3e203f	Fix #107 : add autoload to PHPShortener	2011-12-26 13:05:52 +01:00
Romain Neutron	ead7c5193d	Fix #108: Upgrade to v3.5 does not kill after upgrade	2011-12-26 13:02:06 +01:00
Romain Neutron	d50ac212b1	Add global filter to twig	2011-12-26 12:13:13 +01:00
Romain Neutron	0e6757e2db	Refactor basket_adapter	2011-12-26 10:50:55 +01:00
Romain Neutron	8b75d70156	Refactor basket_adapter	2011-12-24 03:19:43 +01:00
Romain Neutron	2a3186c10f	Fix version numbers	2011-12-23 17:18:00 +01:00
Romain Neutron	e1626b20ad	Fix grouping methods	2011-12-21 17:49:41 +01:00
Nicolas Le Goff	ed92922842	Merge	2011-12-20 20:00:52 +01:00