5312 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Romain Neutron	5b0f93de05	Basket refactor	2011-12-27 19:16:55 +01:00
Romain Neutron	1257da5d70	Workzone stories attach/detach	2011-12-27 19:15:30 +01:00
Romain Neutron	ae4ac2b911	Fix javascript typo	2011-12-27 19:13:29 +01:00
Nicolas Le Goff	19d5e43283	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-27 16:27:49 +01:00
Nicolas Le Goff	ccda8a86a9	Temporary revert	2011-12-27 16:27:04 +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	1358f79012	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-27 15:35:30 +01:00
Romain Neutron	affd3e28e0	Fix Core load event manager	2011-12-27 15:35:03 +01:00
Romain Neutron	0c45e06a07	Bump to version 5.3.4 3.5.4	2011-12-27 14:47:16 +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	bf3d78b700	Fix #122 : customization du separateur de valeurs multivaluées	2011-12-27 14:32:13 +01:00
Nicolas Le Goff	1bde45bf93	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-27 14:20:24 +01:00
Nicolas Le Goff	d18653789f	fix	2011-12-27 14:19:32 +01:00
Romain Neutron	bb03cb1344	Refactor basket_adapter	2011-12-27 14:07:27 +01:00
Romain Neutron	9d965538b4	Refactor basket_adapter	2011-12-27 14:07:09 +01:00
Romain Neutron	0e1e62ccb9	Refactor basket_adapter	2011-12-27 14:06:14 +01:00
Romain Neutron	9c9b9a36b3	Refactor basket_adapter	2011-12-27 14:05:48 +01:00
Romain Neutron	00fef88ccd	Refactor basket_adapter	2011-12-27 14:05:22 +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	1ffc9ef1f0	delete	2011-12-27 13:02:42 +01:00
Nicolas Le Goff	a11994a5e6	configuration & environnement return null if not installed	2011-12-27 13:01:11 +01:00
Nicolas Le Goff	6858bc4c69	fix core::getEnv	2011-12-27 12:58:33 +01:00
Nicolas Le Goff	c8ed0004a2	Add configuration getter	2011-12-27 12:56:57 +01:00
Nicolas Le Goff	c191f91f1c	add environnement to bootstrap::execute	2011-12-27 12:53:56 +01:00
Nicolas Le Goff	5950e58db0	add story controller tests	2011-12-27 12:51:24 +01:00
Nicolas Le Goff	f313bf4c51	move to Controller/Prod	2011-12-27 12:50:19 +01:00
Nicolas Le Goff	b30f46c8b0	replace findby to findbyone for getting a user story	2011-12-27 12:48:32 +01:00
Nicolas Le Goff	a1ad46cabf	fix & cleanup	2011-12-27 12:46:57 +01:00
Nicolas Le Goff	9ca7f61d68	cleanup	2011-12-27 12:45:20 +01:00
Nicolas Le Goff	540a3a8145	cleanup	2011-12-27 12:44:55 +01:00
Nicolas Le Goff	7f9e940f67	Add a doctrine sql logger handle by monolog	2011-12-27 12:44:17 +01:00
Nicolas Le Goff	f065acb68b	moove bootstrap	2011-12-27 11:36:15 +01:00
Nicolas Le Goff	c5a6d65fd1	add configuration systeme	2011-12-26 22:21:32 +01:00
Romain Neutron	cda51b4686	Removing dirname(__FILE__)	2011-12-26 20:42:31 +01:00
Romain Neutron	03a0703441	Fix locale selector	2011-12-26 20:40:02 +01:00
Romain Neutron	d8644f0ad9	Fix Dev Install	2011-12-26 20:39:34 +01:00
Romain Neutron	cf5333bbf0	Removed unused function	2011-12-26 20:38:53 +01:00
Romain Neutron	dc1ef6a3bf	Core should work when Phraseanet is not installed	2011-12-26 20:38:29 +01:00
Romain Neutron	0661d25cff	Add bootstrap to setup	2011-12-26 20:25:38 +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	9eaac19f4d	Fix test usr_mail	2011-12-26 18:11:04 +01:00
Romain Neutron	5d197fb2fc	Add databox_field::TYPE_STRING to api tests	2011-12-26 18:10:39 +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