1184 Commits

Author	SHA1	Message	Date
Romain Neutron	afaf619891	Merge branch 'Fixinstaller' into 3.6	2012-01-02 17:12:06 +01:00
Romain Neutron	ec7ecd3533	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-02 16:27:30 +01:00
Romain Neutron	a8a8f57052	Bimp to version 3.5.6	2012-01-02 16:27:06 +01:00
Romain Neutron	37d8fc26e9	Removed bas_manage right	2012-01-02 16:26:06 +01:00
Romain Neutron	a1e447fe66	Push controller	2012-01-02 16:20:23 +01:00
Romain Neutron	ef2fd695a7	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-02 12:53:05 +01:00
Romain Neutron	3f559a36d7	Push Controllers	2012-01-02 12:52:46 +01:00
Romain Neutron	405b7c6cda	Usr List controller	2012-01-02 12:47:12 +01:00
Romain Neutron	7fb481c1e5	Usr List entities / proxies / repositories	2012-01-02 12:45:56 +01:00
Romain Neutron	5f057d20ac	Usr List entities	2012-01-02 12:44:18 +01:00
Romain Neutron	6abcff5580	Upgraded proxies	2012-01-02 12:43:52 +01:00
jygaulier	d1457604f6	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-02 11:59:07 +01:00
jygaulier	48adecbc7c	Add ldap_created	2012-01-02 11:58:57 +01:00
jygaulier	311d3ea19a	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-02 11:54:57 +01:00
jygaulier	6c9812da7e	add attribute ldap_created + get/set	2011-12-30 18:07:15 +01:00
Romain Neutron	8f77647778	Add print log	2011-12-30 16:21:49 +01:00
Romain Neutron	f64e71f965	Fix TCPDF path	2011-12-30 16:21:40 +01:00
Romain Neutron	075409b9f3	Add printer route	2011-12-30 16:16:41 +01:00
Romain Neutron	6684de2895	Add printer Helper	2011-12-30 16:16:19 +01:00
Romain Neutron	a6ce43217c	Fix Bug in grep_records	2011-12-30 16:15:52 +01:00
Romain Neutron	71ecc1a14f	Add Printer Controller	2011-12-30 16:14:49 +01:00
Romain Neutron	d7d45feb05	Add PDF Export Module	2011-12-30 16:14:40 +01:00
Nicolas Le Goff	0dc748a14d	add prettyString filter	2011-12-30 14:30:59 +01:00
Nicolas Le Goff	d154341b23	fix some issues	2011-12-30 14:30:28 +01:00
Nicolas Le Goff	654608c35a	remove unused code	2011-12-30 14:29:40 +01:00
Nicolas Le Goff	010724d86b	move and refactor attach & detach story testes	2011-12-30 14:29:08 +01:00
Nicolas Le Goff	04d24cb8da	fix story lst issue	2011-12-30 14:28:20 +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
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	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	13128aed9a	Fix build	2011-12-29 18:27:41 +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