467 Commits

Author	SHA1	Message	Date
Nicolas Le Goff	3f2a527e92	write servername in conf file when creating one appbox	2012-01-03 19:36:18 +01:00
jygaulier	a14b626bfe	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 18:57:07 +01:00
jygaulier	d3c9d90bea	fix for 3.5, show sql	2012-01-03 18:56:38 +01:00
Romain Neutron	09c9e455f4	Fix #144 : Phraseanet:tf-filename metadata is wrong	2012-01-03 18:21:57 +01:00
Nicolas Le Goff	43a396eb8e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-03 16:35:02 +01:00
Nicolas Le Goff	43fbee03c2	Merge branch 'master' of github.com:alchemy-fr/Phraseanet	2012-01-03 16:17:49 +01:00
Nicolas Le Goff	e540bd39d3	Merge branch 'fix_report' into 3.6	2012-01-03 16:15:10 +01:00
Nicolas Le Goff	6872ceb3db	fix #138 report / user downloads	2012-01-03 16:12:41 +01:00
Romain Neutron	af9330b17e	Merge 3.5.7	2012-01-03 15:26:07 +01:00
Nicolas Le Goff	0812cb0a9b	copy the new config .yml file with user settings	2012-01-03 14:58:44 +01:00
Romain Neutron	e288fb0189	Fix #141 : wrong report datas	2012-01-03 14:56:50 +01:00
Nicolas Le Goff	9790928780	replace connexion.inc & remove unusued functions	2012-01-03 14:49:01 +01:00
Nicolas Le Goff	cc05ba9ac6	replace connexion.inc & replace servername	2012-01-03 14:47:56 +01:00
Nicolas Le Goff	8a73c310eb	replace connexion.inc	2012-01-03 14:46:52 +01:00
Nicolas Le Goff	4db2590ea4	replace connexion.inc	2012-01-03 14:46:32 +01:00
Nicolas Le Goff	03ece66cd5	remove bas_manage	2012-01-03 14:45:53 +01:00
Nicolas Le Goff	45f0137a20	add environnement to bootstrap::execute	2012-01-03 14:45:12 +01:00
Nicolas Le Goff	d95b6a48e1	refactor appbox::upgradeAvailable	2012-01-03 14:38:58 +01:00
Nicolas Le Goff	9d9f1261c7	replace config.inc & refactor appbox::create	2012-01-03 14:38:09 +01:00
Nicolas Le Goff	a9039ba876	replace config.inc	2012-01-03 14:36:17 +01:00
Romain Neutron	732301fba2	Add User_Adapter::is_special method	2012-01-03 14:22:44 +01:00
Romain Neutron	745d27b821	Fix #142 : add ability to apply template from user rights view	2012-01-03 13:49:13 +01:00
Romain Neutron	9c15b5d900	Add check before opening phrasea session	2012-01-03 13:48:06 +01:00
Romain Neutron	a8faa8ceef	Fix #142 : add default user sort to date desc	2012-01-03 13:47:32 +01:00
Romain Neutron	06887a068d	Basket should'nt load if empty	2012-01-03 13:45:44 +01:00
Romain Neutron	a2c0a7dbd4	Fix#143 : auto-authentication	2012-01-03 13:45:21 +01:00
Romain Neutron	de91fc5c0e	Fix status conversion	2012-01-03 13:39:20 +01:00
Romain Neutron	60588e4c69	Add patch to new entities	2012-01-03 11:04:53 +01:00
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	37d8fc26e9	Removed bas_manage right	2012-01-02 16:26:06 +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
Nicolas Le Goff	0dc748a14d	add prettyString filter	2011-12-30 14:30:59 +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
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	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	4c265a61bb	fix bridge testes	2011-12-30 00:32:17 +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	87337473fa	Fix build	2011-12-29 18:24:42 +01:00
Romain Neutron	de2f34721d	Merge	2011-12-29 14:07:47 +01:00