56 Commits

Author	SHA1	Message	Date
Nicolas Le Goff	b4ce89fad6	merge master	2012-04-27 18:49:38 +02:00
Nicolas Le Goff	f8f6c97918	fix #605 consistency deletion of records in order_elements table	2012-04-27 17:41:22 +02:00
Romain Neutron	093869d3d0	Add devices in API answer / CS / Fixes ... Add tests to media subdefs Fix CS Add Mplayer to build Fix Alchemy\Phrasea\Exceptions Add media_subdef etags	2012-04-27 16:46:52 +02:00
Nicolas Le Goff	529452a677	fix command export	2012-04-27 15:53:18 +02:00
Romain Neutron	70519a471a	Update copyright year	2012-04-26 02:06:29 +02:00
Romain Neutron	33b10d6746	Add curly braces	2012-04-26 01:55:12 +02:00
Romain Neutron	ade22295ad	Fix CS	2012-04-26 00:55:53 +02:00
Romain Neutron	dd994a9bd6	Fix CS	2012-04-25 17:38:49 +02:00
Romain Neutron	098b57389c	Merge with master	2012-04-19 11:17:28 +02:00
Romain Neutron	18707146b7	Subdef export does not include original file extension anymore	2012-04-19 11:05:33 +02:00
Romain Neutron	9acaf0b211	Use Composer for dependencies instead of git submodules	2012-03-30 13:39:44 +02:00
Romain Neutron	815a15fe5e	Add businessfields option to FTP	2012-03-22 18:26:20 +01:00
Romain Neutron	97b5632017	Fix bug serialization export	2012-03-22 17:12:24 +01:00
Romain Neutron	31165c6816	Add business fields options in export dialog	2012-03-22 17:04:22 +01:00
Romain Neutron	63595e9dee	Implements BusinessFields in export	2012-03-22 16:38:07 +01:00
Romain Neutron	384552d4b8	Refactor set_export::getCaption	2012-03-20 19:11:09 +01:00
Romain Neutron	9bce2cf3a5	Refactor caption serialization	2012-03-20 15:44:32 +01:00
Romain Neutron	82d9eeef7b	Coding standards	2012-03-09 12:49:13 +01:00
Nicolas Le Goff	8e3b01017c	fix #482 Issue Gestion des commandes	2012-03-02 14:20:14 +01:00
Romain Neutron	8c840091d7	Merge branch 'HotFixCache' into 3.6	2012-02-22 12:39:17 +01:00
Romain Neutron	2cb18c5d78	Download elements without watermark when pushed	2012-02-22 12:22:50 +01:00
Romain Neutron	a574dd14a8	Refactor Appbox	2012-02-21 16:07:34 +01:00
Romain Neutron	0f616f8c7d	Fix #419	2012-02-20 09:08:48 +01:00
Romain Neutron	3450a77c91	Lifting	2012-02-17 17:02:56 +01:00
Romain Neutron	2590ab6ddd	Add control on BasketRepo	2012-02-17 16:08:00 +01:00
Romain Neutron	848ee99466	Merge branch 'HotFix' into 3.6	2012-02-17 15:06:10 +01:00
Romain Neutron	c562ab11a0	Fix bad argument	2012-02-17 15:05:24 +01:00
Nicolas Le Goff	abbcf8075e	Merge branch 'fix' into 3.6	2012-02-17 11:47:01 +01:00
Nicolas Le Goff	e4efd52686	fix set::streamfile issue	2012-02-17 11:28:03 +01:00
Romain Neutron	1e7e16de7b	Merge with master	2012-02-16 15:57:36 +01:00
Romain Neutron	97c254e86b	Fix DL	2012-02-16 15:48:18 +01:00
Romain Neutron	2d2427603a	Fix Export XML/YAML	2012-02-15 19:27:29 +01:00
Romain Neutron	8a154e21c1	Coding Standards	2012-02-13 18:23:06 +01:00
Romain Neutron	d475e00cfa	Merge with master	2012-02-07 17:47:39 +01:00
Romain Neutron	d0642b40ce	Fix #319	2012-02-07 17:02:38 +01:00
Romain Neutron	99a344774f	Coding standards	2012-01-31 18:35:27 +01:00
Romain Neutron	06b8df26b1	Fix coding standards	2012-01-26 12:32:37 +01:00
Romain Neutron	fc3bb9a6fd	Merge with master	2012-01-11 12:15:30 +01:00
Romain Neutron	8dbedd0e87	Fix story export	2012-01-11 12:12:37 +01:00
Romain Neutron	c239740542	Merge branch 'HotFix' into 3.6	2012-01-10 21:24:12 +01:00
Romain Neutron	a3ebb45317	Fix refactor	2012-01-10 21:07:29 +01:00
Romain Neutron	f8e5cc6426	Merge master fix	2012-01-10 20:30:03 +01:00
Romain Neutron	5587256ba4	Fix typo	2012-01-10 13:23:43 +01:00
Romain Neutron	ccf08e05eb	Merge with master	2012-01-10 10:25:02 +01:00
Romain Neutron	0228edec5d	Fix export caption	2012-01-09 18:50:26 +01:00
Romain Neutron	8f16962873	Merge branch 'hotfix' into 3.6	2012-01-06 13:35:52 +01:00
Romain Neutron	e7bab79c85	Cleanup (oups)	2012-01-06 13:34:31 +01:00
Romain Neutron	64ce815e81	Merge with master	2012-01-06 13:30:56 +01:00
Romain Neutron	a1624c4a6b	Adding todo	2012-01-06 13:17:35 +01:00
Romain Neutron	d9b611cceb	Fix download IE6	2012-01-06 13:14:53 +01:00