96 Commits

Author	SHA1	Message	Date
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
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
Nicolas Le Goff	1f5606d51a	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-20 17:40:28 +01:00
Romain Neutron	fb787e864f	Merge branch 'Fix99' into 3.6	2011-12-20 17:39:11 +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
Nicolas Le Goff	b50e6c930e	fix user_adapter::set_email	2011-12-20 17:33:41 +01:00
Romain Neutron	6913a41cd3	Merge bug archivage	2011-12-20 17:05:18 +01:00
Romain Neutron	7d5a03f45a	Fix bug #104 : record not indexed after having been archived	2011-12-20 16:50:27 +01:00
Romain Neutron	a656ee21d5	Add filters	2011-12-20 14:07:02 +01:00
Romain Neutron	baad6dd0b5	Merge	2011-12-19 17:51:29 +01:00
Romain Neutron	c117b6aec1	Add Bad Request	2011-12-19 17:40:49 +01:00
Nicolas Le Goff	9e50ca979c	rename StoryWorkZone to StoryWZ	2011-12-19 12:19:24 +01:00
Romain Neutron	5941c25ae6	Refactor	2011-12-16 20:00:59 +01:00
Romain Neutron	6d9b24064e	Debug datas	2011-12-16 17:22:56 +01:00
Romain Neutron	03e36caefe	Cleanup Prod	2011-12-16 17:22:47 +01:00
Romain Neutron	49e5ad7cdb	Enhanced entities	2011-12-15 18:12:03 +01:00
Romain Neutron	fa9eaf865e	Merged with 3.5.2	2011-12-15 15:12:40 +01:00
Romain Neutron	900af9e102	Fix delete of a databox field : the XML field is removed	2011-12-15 15:09:11 +01:00
Romain Neutron	89a8f1d380	Add type "string" to databox fields	2011-12-15 15:00:43 +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	9e87701623	Add path to Symfony\BrowserKit component for unit tests	2011-12-15 13:41:46 +01:00
Romain Neutron	522980ef9d	Fix broken hellotoken method	2011-12-15 13:41:19 +01:00