1671 Commits

Author	SHA1	Message	Date
Romain Neutron	f8d71a9bca	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 14:35:22 +01:00
Romain Neutron	68f3acfd9f	Fix locales	2012-03-08 14:34:58 +01:00
Nicolas Le Goff	34708b27d5	add /records/caption/ api route test	2012-03-08 12:52:26 +01:00
Nicolas Le Goff	09ac5372aa	fix patch PDOException issue	2012-03-08 12:47:44 +01:00
Nicolas Le Goff	fe01a6574f	add /records/caption/ route to API	2012-03-08 12:17:03 +01:00
Nicolas Le Goff	d18489c30e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 11:33:53 +01:00
Nicolas Le Goff	7b89c0204f	fix #518 Creation de reportage avec ajout de la selection courante n'est pas pris en compte.	2012-03-08 11:33:44 +01:00
Romain Neutron	cf629822d0	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 11:28:55 +01:00
Romain Neutron	e2def9fbc7	Upgrade locales	2012-03-08 11:27:35 +01:00
Nicolas Le Goff	88e3b5242a	fix bridge load containers	2012-03-08 11:12:06 +01:00
Romain Neutron	02d1bb867b	Add default charset table	2012-03-07 18:23:15 +01:00
Romain Neutron	166e2fc248	Add lazy load to caption fields	2012-03-07 18:22:30 +01:00
Romain Neutron	78fd25cb78	Fix command message	2012-03-07 18:22:14 +01:00
Romain Neutron	f7cf4848e6	Update vendors	2012-03-07 18:21:22 +01:00
Romain Neutron	3f89deb153	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-07 16:01:20 +01:00
Romain Neutron	0fb0d3add2	Disable sphinxql magic	2012-03-07 16:00:59 +01:00
Romain Neutron	63a880d333	Convert "truncate" to delete from because it fails when there are foreign keys	2012-03-07 16:00:41 +01:00
Nicolas Le Goff	18610410b3	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-07 15:59:05 +01:00
Romain Neutron	948e6a3fc1	Fix installer	2012-03-07 15:15:38 +01:00
Nicolas Le Goff	d7d52275c0	use finder component to retrieve css and fix namespace issue	2012-03-07 11:58:59 +01:00
Romain Neutron	d02b04ece6	Fix update sphinx	2012-03-07 11:46:01 +01:00
jygaulier	6b84264505	Updated vendors	2012-03-07 11:29:37 +01:00
jygaulier	8bd291f569	Merge with master	2012-03-07 11:22:08 +01:00
jygaulier	8c767d28c7	New scheduler	2012-03-07 11:08:54 +01:00
Nicolas Le Goff	cd61d7fcbd	fix #511 fail load css theme from user preference	2012-03-06 20:28:39 +01:00
Nicolas Le Goff	80c22ae265	blacklist vendor & unitTest from codecoverage	2012-03-06 19:18:53 +01:00
Nicolas Le Goff	0769a9cb97	fix sprintf issue	2012-03-06 19:08:16 +01:00
Romain Neutron	6705988894	Set results nullable	2012-03-06 16:16:57 +01:00
Romain Neutron	79d4d44167	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-06 16:06:38 +01:00
Romain Neutron	3bb0a919ef	Fix bug separators	2012-03-06 14:47:00 +01:00
Romain Neutron	a0b8010d78	Fix bug separators	2012-03-06 13:25:01 +01:00
Nicolas Le Goff	5173bb7df1	fix #500 Ne voir que les user deja dans la liste dans Edit du LIst Manager	2012-03-05 20:10:42 +01:00
Romain Neutron	d767857b48	Correct messages	2012-03-05 19:08:54 +01:00
Romain Neutron	434e7075cb	Add ensuredevsettings task	2012-03-05 19:08:40 +01:00
Romain Neutron	60214728a6	Add a strict mode to ensure ProductionSettings	2012-03-05 18:51:05 +01:00
Nicolas Le Goff	faa873ee08	fix #434 Possibilité de reglages du settings pour l'arret du download d'un fichier et passage en mail	2012-03-05 18:23:00 +01:00
Romain Neutron	c1af665180	Update baskets fix	2012-03-05 18:03:42 +01:00
Nicolas Le Goff	6fc4b9dff8	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-05 18:01:54 +01:00
Nicolas Le Goff	a04e1980f6	fix #435 verifier que les mails sont envoyés une fois le zip généré	2012-03-05 18:01:27 +01:00
Romain Neutron	cedd6b54a2	Live info about baskets exclude expired baskets	2012-03-05 17:53:30 +01:00
Romain Neutron	ab7da89b1a	Add default sort for Phrasea Engine	2012-03-05 16:59:40 +01:00
Romain Neutron	087754a56b	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-05 16:33:56 +01:00
Romain Neutron	2632d1b4de	Change story tests to fit previous changes	2012-03-05 16:33:15 +01:00
Romain Neutron	1426b9a6f9	Add feedback availability from basket + User icons	2012-03-05 16:08:49 +01:00
Romain Neutron	d8ba8b954a	Fix databox field creation	2012-03-05 16:07:46 +01:00
Romain Neutron	3aa5999ce7	Refactor regname regdesc regdate	2012-03-05 15:06:26 +01:00
Nicolas Le Goff	dbfac64b4a	fix #504 Lightbox : impossible de transmettre un rapport	2012-03-05 12:49:56 +01:00
Nicolas Le Goff	b2e62ddfcc	fix build	2012-03-04 20:07:58 +01:00
Nicolas Le Goff	1d53e47dd7	fix notice	2012-03-02 19:26:09 +01:00
Nicolas Le Goff	21ff3afd70	fix build	2012-03-02 18:54:44 +01:00