3336 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolas Le Goff	3b7532b69f	fix version issue	2011-12-30 14:27:42 +01:00
Nicolas Le Goff	79b828f2ef	merge	2011-12-30 12:48:39 +01:00
Romain Neutron	8e8f014e6c	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2011-12-30 12:48:11 +01:00
Romain Neutron	a9667b8e2a	Removed bit.ly	2011-12-30 12:47:25 +01:00
Nicolas Le Goff	5f027d18cb	fix name issue	2011-12-30 12:46:29 +01:00
Romain Neutron	ea0a544567	Removed bit.ly	2011-12-30 12:45:52 +01:00
Romain Neutron	4e970c5e56	Fix #135 / #134	2011-12-30 12:17:19 +01:00
Romain Neutron	9ea7c19c92	Fix #135 : substitution of a story image	2011-12-30 11:59:31 +01:00
Romain Neutron	d0fc37b957	Fix #134 : browsing a story	2011-12-30 11:40:21 +01:00
Romain Neutron	8c5c78f2c6	Fix Tests	2011-12-30 11:04:06 +01:00
Romain Neutron	2ab0dd02eb	Fix Typo	2011-12-30 10:30:13 +01:00
Romain Neutron	f7698e0f24	Fix build APIs / Session	2011-12-30 10:28:50 +01:00
Romain Neutron	d6de10324d	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-30 09:49:11 +01:00
Romain Neutron	bd2a8d6cad	Merge branch 'master' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-30 09:46:12 +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	a852449971	fix bridge testes	2011-12-30 00:33:44 +01:00
Nicolas Le Goff	32ca91a43f	add tests for basket entity	2011-12-30 00:32:52 +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
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	adf7e62f20	Fix build	2011-12-29 18:30:58 +01:00
Romain Neutron	13128aed9a	Fix build	2011-12-29 18:27:41 +01:00
Romain Neutron	d327e5f4f9	Fix templates	2011-12-29 18:26:10 +01:00
Romain Neutron	5112c19235	Fix templates	2011-12-29 18:25:43 +01:00
Romain Neutron	87337473fa	Fix build	2011-12-29 18:24:42 +01:00
Romain Neutron	753c9ba3d3	Fix build	2011-12-29 18:23:22 +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	567c6c95fd	Bump to version 3.5.5 3.5.5	2011-12-28 23:14:50 +01:00
Romain Neutron	9b740a19dd	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-28 23:12:39 +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
Nicolas Le Goff	c85d708e65	add enhancement	2011-12-28 20:54:14 +01:00
Nicolas Le Goff	947dbd43ad	move to Alchemy/Phrasea	2011-12-28 20:42:48 +01:00
Romain Neutron	646db61ca7	Refactor asket_adapter	2011-12-28 20:04:39 +01:00
Nicolas Le Goff	bfa8e851c6	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-28 19:32:21 +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	45aa313db7	add configuration & service testes	2011-12-28 19:27:26 +01:00
Romain Neutron	ebdf23f1a3	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2011-12-28 15:00:44 +01:00