528 Commits

Author	SHA1	Message	Date
Romain Neutron	82d9eeef7b	Coding standards	2012-03-09 12:49:13 +01:00
Romain Neutron	394a40f01e	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-09 00:33:43 +01:00
Ysolyne Gresille	429a1bef9b	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-03-08 17:27:47 +01:00
Romain Neutron	fb060cd8cf	Fix insert coll	2012-03-08 16:16:53 +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
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	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
Romain Neutron	948e6a3fc1	Fix installer	2012-03-07 15:15:38 +01:00
Romain Neutron	d02b04ece6	Fix update sphinx	2012-03-07 11:46:01 +01:00
Nicolas Le Goff	0769a9cb97	fix sprintf issue	2012-03-06 19:08:16 +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
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	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	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	8e3b01017c	fix #482 Issue Gestion des commandes	2012-03-02 14:20:14 +01:00
Nicolas Le Goff	73f4a5438d	fix #487 noms des utilisateurs manquants dans un tableau	2012-03-01 16:19:25 +01:00
Nicolas Le Goff	9f406919ec	fix backslash issue	2012-02-29 17:59:35 +01:00
Nicolas Le Goff	9108400f1f	fix #493	2012-02-29 17:26:54 +01:00
Nicolas Le Goff	0fe94cad74	add string	2012-02-29 14:51:04 +01:00
Ysolyne Gresille	498f1dba23	Bugfix	2012-02-29 11:00:58 +01:00
Romain Neutron	d258670ad5	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-28 18:11:33 +01:00
Romain Neutron	8778977049	Merge with master	2012-02-28 18:11:20 +01:00
Romain Neutron	bc21c5d1b5	Remove old rights	2012-02-28 18:10:10 +01:00
Romain Neutron	1ef82652bf	Fix mail formatting	2012-02-28 17:40:51 +01:00
Nicolas Le Goff	ef95c197bc	disable display of notice if its not possible to reach memcache server	2012-02-28 17:37:43 +01:00
Nicolas Le Goff	90326a2142	fix build_excerpt issue	2012-02-28 16:21:18 +01:00
Nicolas Le Goff	ddcee6bbad	fix check cache memcached	2012-02-28 16:20:37 +01:00
Nicolas Le Goff	fb6e997960	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-28 15:32:56 +01:00
Nicolas Le Goff	0cd55b289f	fix #463 Erreur nombre de téléchargement dans Report	2012-02-28 15:31:53 +01:00
Romain Neutron	150ab811cd	Removed ORM table drop proposal	2012-02-28 15:13:43 +01:00
Romain Neutron	f1b9311aba	Fix ORM configuration	2012-02-28 11:44:11 +01:00
Romain Neutron	c50118007d	Fix config check	2012-02-27 15:33:12 +01:00
Romain Neutron	ba61356541	Event initialization is done after core initialization	2012-02-24 12:08:30 +01:00
Romain Neutron	4d01c23b63	Merge branch 'HotFix' into 3.6	2012-02-23 19:01:51 +01:00
Romain Neutron	584b3cc4b2	Fix meta writing	2012-02-23 19:01:22 +01:00
Romain Neutron	1adc885155	Fix installer	2012-02-23 18:59:45 +01:00
Romain Neutron	54515c0c94	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-02-23 18:13:00 +01:00