992 Commits

Author	SHA1	Message	Date
Nicolas Le Goff	4c265a61bb	fix bridge testes	2011-12-30 00:32:17 +01:00
Romain Neutron	95dd9d1134	Fix build	2011-12-29 19:46:26 +01:00
Romain Neutron	cc871662b6	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-29 19:32:13 +01:00
Romain Neutron	028b72f271	Fix build	2011-12-29 19:31:45 +01:00
Nicolas Le Goff	e4c198b41b	Merge cooliris branch	2011-12-29 18:48:15 +01:00
Romain Neutron	753c9ba3d3	Fix build	2011-12-29 18:23:22 +01:00
Romain Neutron	646db61ca7	Refactor asket_adapter	2011-12-28 20:04:39 +01:00
Nicolas Le Goff	bcd6719845	add enhancement	2011-12-28 19:31:38 +01:00
Nicolas Le Goff	5e07d736e2	split into smaller function to reduce the crap	2011-12-28 19:30:30 +01:00
Nicolas Le Goff	59f8029d0c	dependency injection refactor	2011-12-28 19:29:41 +01:00
Nicolas Le Goff	0411a943ae	add ::loadConf & some comments	2011-12-28 19:29:05 +01:00
Nicolas Le Goff	266d9021e7	add config parameter class	2011-12-28 19:27:49 +01:00
Nicolas Le Goff	52c971f1a8	merge	2011-12-28 13:26:05 +01:00
Nicolas Le Goff	42ce345fe8	configuration file system integration	2011-12-28 13:24:26 +01:00
Romain Neutron	069ec209aa	Fix typo	2011-12-27 19:17:55 +01:00
Romain Neutron	1257da5d70	Workzone stories attach/detach	2011-12-27 19:15:30 +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
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	9d965538b4	Refactor basket_adapter	2011-12-27 14:07:09 +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	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	c5a6d65fd1	add configuration systeme	2011-12-26 22:21:32 +01:00
Romain Neutron	d8644f0ad9	Fix Dev Install	2011-12-26 20:39:34 +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	e3294e6f47	Merge with master	2011-12-26 18:39:41 +01:00
Romain Neutron	ae51a396cd	Refactor basket_adapter	2011-12-26 12:11:23 +01:00
Romain Neutron	d90998ac12	Menage	2011-12-26 12:09:58 +01:00
Romain Neutron	ae5d083e25	Add Phraseanet Core to apps	2011-12-24 03:16:02 +01:00
Romain Neutron	1319a01c0b	Cleanup Helpers	2011-12-24 03:15:19 +01:00
Romain Neutron	70c762e93d	Cleanup Helpers	2011-12-24 03:14:19 +01:00
Romain Neutron	1fc83e6019	Cleanup Helpers	2011-12-24 03:08:30 +01:00
Romain Neutron	2a3186c10f	Fix version numbers	2011-12-23 17:18:00 +01:00
Romain Neutron	612593e090	Story controller mount in prod	2011-12-21 17:45:46 +01:00
Romain Neutron	9570890d98	Story tooltip controller	2011-12-21 17:45:23 +01:00
Romain Neutron	bdc3ca2ea0	Cleanup + redorder route	2011-12-21 17:45:14 +01:00
Romain Neutron	04108f66d5	Story controller	2011-12-21 17:44:30 +01:00
Romain Neutron	d12ad8dfc0	Merge with Legoff's changes	2011-12-20 14:10:53 +01:00