192 Commits

Author	SHA1	Message	Date
Romain Neutron	8c5c78f2c6	Fix Tests	2011-12-30 11:04:06 +01:00
Nicolas Le Goff	3846803d36	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-30 00:34:13 +01:00
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
Romain Neutron	1257da5d70	Workzone stories attach/detach	2011-12-27 19:15:30 +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
Nicolas Le Goff	c7e9161c7f	merge	2011-12-27 13:06:51 +01:00
Nicolas Le Goff	a1ad46cabf	fix & cleanup	2011-12-27 12:46:57 +01:00
Romain Neutron	d8644f0ad9	Fix Dev Install	2011-12-26 20:39:34 +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	1319a01c0b	Cleanup Helpers	2011-12-24 03:15:19 +01:00
Romain Neutron	2a3186c10f	Fix version numbers	2011-12-23 17:18:00 +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
Romain Neutron	e8f0e8a10d	Basket routes	2011-12-20 14:06:32 +01:00
Romain Neutron	8b6278cb2a	Basket route	2011-12-19 19:08:44 +01:00
Nicolas Le Goff	7ee57da570	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-19 19:08:31 +01:00
Nicolas Le Goff	9a7c326d6c	added request	2011-12-19 19:07:53 +01:00
Romain Neutron	e1dce46c9c	Basket route	2011-12-19 18:24:16 +01:00
Romain Neutron	efb42bf2eb	Fix entity manager	2011-12-19 17:53:00 +01:00
Romain Neutron	baad6dd0b5	Merge	2011-12-19 17:51:29 +01:00
Romain Neutron	df08011365	Basket Controller	2011-12-19 17:40:32 +01:00
Nicolas Le Goff	b3012cee04	fix minor issues	2011-12-19 17:13:56 +01:00
Romain Neutron	10f74f0265	Refactor	2011-12-16 20:00:16 +01:00
Romain Neutron	bc505910a2	Renamed RequestHandler => Helper	2011-12-16 17:19:52 +01:00
Nicolas Le Goff	24ad9b5d4b	Workzone Controller	2011-12-15 19:55:06 +01:00
Nicolas Le Goff	cc6c0aa5cd	Basket controller	2011-12-15 19:53:13 +01:00
Romain Neutron	1e0d06bc56	Merged with 3.5.1	2011-12-15 14:25:47 +01:00
Romain Neutron	d704c92ad0	Add Basket controller	2011-12-15 11:55:54 +01:00
Romain Neutron	15151ab30d	Moved Doc Blocks	2011-12-15 11:55:15 +01:00
Nicolas Le Goff	dbbde89ddb	move controllers	2011-12-14 20:08:32 +01:00
Nicolas Le Goff	1881f3a7d1	add new prod controllers	2011-12-14 15:58:14 +01:00
Romain Neutron	d4794801fc	Moved controllers	2011-12-14 13:14:47 +01:00