146 Commits

Author	SHA1	Message	Date
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	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
Nicolas Le Goff	0812cb0a9b	copy the new config .yml file with user settings	2012-01-03 14:58:44 +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
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
Nicolas Le Goff	0dc748a14d	add prettyString filter	2011-12-30 14:30:59 +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
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	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
Romain Neutron	646db61ca7	Refactor asket_adapter	2011-12-28 20:04:39 +01:00
Romain Neutron	607974edcb	Merge branch '3.5.5' into 3.6	2011-12-28 15:00:18 +01:00
Romain Neutron	f4814e1fe8	Fix #127 : tasks crash counter is reseted on task start	2011-12-28 14:55:40 +01:00
Romain Neutron	742befa16a	Fix #128 ; highlight on multivalued fields fails	2011-12-28 14:47:24 +01:00
Romain Neutron	4ab9a2563b	Fix #123 : Databox injected rights are removed everytime you logout.	2011-12-28 13:07:17 +01:00
Romain Neutron	32a7b2bfe8	Fix basket_adapter	2011-12-27 20:36:42 +01:00
Romain Neutron	5e568b0062	Merge branch 'FixCollDisplay' into 3.6	2011-12-27 19:51:17 +01:00
Romain Neutron	1774110a33	Fix #125 : Databox details are missing in admin	2011-12-27 19:48:32 +01:00
Romain Neutron	5b0f93de05	Basket refactor	2011-12-27 19:16:55 +01:00
Romain Neutron	1617d3e561	Fix events loader	2011-12-27 15:46:23 +01:00
Romain Neutron	affd3e28e0	Fix Core load event manager	2011-12-27 15:35:03 +01:00
Romain Neutron	e3727938fb	Merge branch 'FixSeparator' into 3.6	2011-12-27 14:36:19 +01:00
Romain Neutron	bf3d78b700	Fix #122 : customization du separateur de valeurs multivaluées	2011-12-27 14:32:13 +01:00
Romain Neutron	9d965538b4	Refactor basket_adapter	2011-12-27 14:07:09 +01:00
Romain Neutron	f6eef1af39	Integrate PhraseaCore in Events Manager	2011-12-27 14:04:47 +01:00