Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• 930e10f87c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-13 18:21:40 +01:00
• 58d08ce1b0 //small js fix vAugagneur 2013-03-13 18:21:21 +01:00
• 37f64664d3 //small js fix vAugagneur 2013-03-13 18:21:21 +01:00
• 09f70a0020 [-] FO: Fix separated packages Rémi Gaillard 2013-03-13 18:02:54 +01:00
• b76b263ab0 [-] FO: Fix separated packages Rémi Gaillard 2013-03-13 18:02:54 +01:00
• 324ca85cb8 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-13 16:29:23 +01:00
• eae5f2d965 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-13 16:29:23 +01:00
• ee53bc4aea //added russian installer and changed english strings vAugagneur 2013-03-13 16:28:19 +01:00
• 149407f72d //added russian installer and changed english strings vAugagneur 2013-03-13 16:28:19 +01:00
• b52462bd14 Merge translations/fr/errors.php vAugagneur 2013-03-13 16:16:01 +01:00
• 67e357e447 Merge translations/fr/errors.php vAugagneur 2013-03-13 16:16:01 +01:00
• cb811a4e23 // Fix category export without multishop 2 Rémi Gaillard 2013-03-13 15:52:25 +01:00
• f0c10588d7 // Fix category export without multishop 2 Rémi Gaillard 2013-03-13 15:52:25 +01:00
• 0428a16d51 // Fix category export without multishop Rémi Gaillard 2013-03-13 15:49:52 +01:00
• e67cf21b4b // Fix category export without multishop Rémi Gaillard 2013-03-13 15:49:52 +01:00
• 22413c0f6c [-] INSTALLER : Update gender for default customer gRoussac 2013-03-13 15:43:48 +01:00
• 2b0612c0eb [-] INSTALLER : Update gender for default customer gRoussac 2013-03-13 15:43:48 +01:00
• ebbf4feb61 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Francois Gaillard 2013-03-13 15:29:21 +01:00
• cd048c6832 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release François Gaillard 2013-03-13 15:29:21 +01:00
• 9f2de77e36 [-] FO : Mobile theme updated, templates added/improved Francois Gaillard 2013-03-13 15:28:42 +01:00
• 81fbca919e [-] FO : Mobile theme updated, templates added/improved François Gaillard 2013-03-13 15:28:42 +01:00
• 3b091fad98 [-] BO : Avoid warning if img src not defined in controller gRoussac 2013-03-13 15:27:18 +01:00
• a6dbe24d28 [-] BO : Avoid warning if img src not defined in controller gRoussac 2013-03-13 15:27:18 +01:00
• 7591efd6d6 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier gRoussac 2013-03-13 14:31:26 +01:00
• b994136939 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier gRoussac 2013-03-13 14:31:26 +01:00
• 77efe4c04e // changed English strings, especially focusing on colons harmonization fram 2013-03-12 19:39:30 +01:00
• ed947bc123 // changed English strings, especially focusing on colons harmonization fram 2013-03-12 19:39:30 +01:00
• df2e121a60 [-] FO : Avoid flashing of availability_statut gRoussac 2013-03-12 18:34:24 +01:00
• ee570bbca7 [-] FO : Avoid flashing of availability_statut gRoussac 2013-03-12 18:34:24 +01:00
• d945d0cf11 // Fix iPod nano fixture specific price Rémi Gaillard 2013-03-12 18:11:20 +01:00
• 5998face6b // Fix iPod nano fixture specific price Rémi Gaillard 2013-03-12 18:11:20 +01:00
• 1fed482ca0 [*] TR: Update translations for errors gRoussac 2013-03-12 16:18:09 +01:00
• bb4ec94718 [*] TR: Update translations for errors gRoussac 2013-03-12 16:18:09 +01:00
• 09afe53452 // added russian installer fram 2013-03-12 16:05:54 +01:00
• f7c76f60fb // added russian installer fram 2013-03-12 16:05:54 +01:00
• 1ae3b67288 [-] FO : Bug fix #PSCFV-7915 : Mobile theme issue, default attribute Francois Gaillard 2013-03-12 16:04:03 +01:00
• 18bce2ba39 [-] FO : Bug fix #PSCFV-7915 : Mobile theme issue, default attribute François Gaillard 2013-03-12 16:04:03 +01:00
• 771d68be3d // Installer translations (de/it) Damien Metzger 2013-03-12 15:41:43 +01:00
• b9c87df4e5 // Installer translations (de/it) Damien Metzger 2013-03-12 15:41:43 +01:00
• 0749a6f29d // wrong commit for ed09cee7b1 gRoussac 2013-03-12 14:48:28 +01:00
• c6784fa509 // wrong commit for ed09cee7b1 gRoussac 2013-03-12 14:48:28 +01:00
• 7d095f92c4 [*] BO : Set warning when trying to activate Xcache misconfigured gRoussac 2013-03-12 14:41:07 +01:00
• ed09cee7b1 [*] BO : Set warning when trying to activate Xcache misconfigured gRoussac 2013-03-12 14:41:07 +01:00
• a0d25c399c [-] FO : Fixed mobile theme authentication CSS Francois Gaillard 2013-03-12 14:16:52 +01:00
• abb225143b [-] FO : Fixed mobile theme authentication CSS François Gaillard 2013-03-12 14:16:52 +01:00
• 32e9c7ff4f // check fields before change products statuse Rémi Gaillard 2013-03-12 12:28:40 +01:00
• ad6f8775da // check fields before change products statuse Rémi Gaillard 2013-03-12 12:28:40 +01:00
• 5907d4b8d7 // Added hook call in adminperformance Damien Metzger 2013-03-12 12:19:22 +01:00
• 828563d228 // Added hook call in adminperformance Damien Metzger 2013-03-12 12:19:22 +01:00
• a83d8d0cd8 [*] BO : file_put_contents returns length when success not true gRoussac 2013-03-12 12:09:47 +01:00
• b2cdf51cc8 [*] BO : file_put_contents returns length when success not true gRoussac 2013-03-12 12:09:47 +01:00
• fd23b5e862 // typo fix Rémi Gaillard 2013-03-12 11:03:30 +01:00
• 55d6b1ac08 // typo fix Rémi Gaillard 2013-03-12 11:03:30 +01:00
• 4aca474377 Merge pull request #318 from djfm/release Rémi Gaillard 2013-03-12 02:34:28 -07:00
• fc6c4067a7 Merge pull request #318 from djfm/release Rémi Gaillard 2013-03-12 02:34:28 -07:00
• 5441a97c28 // small installer fix Rémi Gaillard 2013-03-12 10:30:44 +01:00
• 024fbfe068 // small installer fix Rémi Gaillard 2013-03-12 10:30:44 +01:00
• 690d761258 // fixed Bulgarian PDF generation fram 2013-03-12 10:28:35 +01:00
• c1cd8c777f // fixed Bulgarian PDF generation fram 2013-03-12 10:28:35 +01:00
• 213b232278 // Moved layered rules from top to bottom in order to avoid conflicts Damien Metzger 2013-03-12 10:16:54 +01:00
• 63ef3f3e8c // Moved layered rules from top to bottom in order to avoid conflicts Damien Metzger 2013-03-12 10:16:54 +01:00
• a03bf13b8f [-] FO : Fix bug #PSCFV-5168, required phone in all templates gRoussac 2013-03-11 19:01:58 +01:00
• 13b796923a [-] FO : Fix bug #PSCFV-5168, required phone in all templates gRoussac 2013-03-11 19:01:58 +01:00
• f3579dd5eb [*] Installer: check if sessions path if writable Rémi Gaillard 2013-03-11 18:51:48 +01:00
• e95afe67b4 [*] Installer: check if sessions path if writable Rémi Gaillard 2013-03-11 18:51:48 +01:00
• d73fcdf412 [-] BO : Fix bug #PSCFV-7468 required phone in address creation gRoussac 2013-03-11 17:39:13 +01:00
• dfa3e0fcb0 [-] BO : Fix bug #PSCFV-7468 required phone in address creation gRoussac 2013-03-11 17:39:13 +01:00
• 54ee8a21d8 // small typo fix Rémi Gaillard 2013-03-11 17:03:17 +01:00
• 4dba588add // small typo fix Rémi Gaillard 2013-03-11 17:03:17 +01:00
• 78ebf6636c [-] FO : fixed bug #PSCFV-5744 - Using attribute values with decimal points numbers and its ten multiple, have the same url vAugagneur 2013-03-11 16:29:33 +01:00
• eb4e0946bb [-] FO : fixed bug #PSCFV-5744 - Using attribute values with decimal points numbers and its ten multiple, have the same url vAugagneur 2013-03-11 16:29:33 +01:00
• fd6540b896 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-11 15:10:27 +01:00
• 68b9b796d7 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-11 15:10:27 +01:00
• 0688061b0a //replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__ vAugagneur 2013-03-11 15:10:22 +01:00
• 5f47b81211 //replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__ vAugagneur 2013-03-11 15:10:22 +01:00
• 8625f39c07 // oops Rémi Gaillard 2013-03-11 15:06:57 +01:00
• 6c037a7b11 // oops Rémi Gaillard 2013-03-11 15:06:57 +01:00
• 68c9da5f25 [-] Installer: download the language pack even if this is a native language on installation Rémi Gaillard 2013-03-11 15:03:38 +01:00
• 11bc38b1f9 [-] Installer: download the language pack even if this is a native language on installation Rémi Gaillard 2013-03-11 15:03:38 +01:00
• 418995b96d [-] FO : minimum purchase total with wurrency gRoussac 2013-03-11 15:00:42 +01:00
• 6c79baedc3 [-] FO : minimum purchase total with wurrency gRoussac 2013-03-11 15:00:42 +01:00
• eb48c91eac [-] FO : remove "Invalid address warning" when not "same" an no invoice address gRoussac 2013-03-11 14:43:37 +01:00
• aa1f260b38 [-] FO : remove "Invalid address warning" when not "same" an no invoice address gRoussac 2013-03-11 14:43:37 +01:00
• 9be5d8ac64 // uncomment trigger_error on Tools::throwDeprecated Rémi Gaillard 2013-03-11 14:15:22 +01:00
• 427f12f4a1 // uncomment trigger_error on Tools::throwDeprecated Rémi Gaillard 2013-03-11 14:15:22 +01:00
• 7bd2bb9cb6 // This reverts commit 9ebe9e1894. "Changed modules list button" Damien Metzger 2013-03-11 14:05:27 +01:00
• a33c6ff54b // This reverts commit 9ebe9e1894. "Changed modules list button" Damien Metzger 2013-03-11 14:05:27 +01:00
• bf36ea88d8 Update Combination.php Shagshag 2013-03-11 12:41:59 +01:00
• 2497e3b28c Update Combination.php Shagshag 2013-03-11 12:41:59 +01:00
• a4e173a93a [-] SQL error in Combination::setAttributes Shagshag 2013-03-11 12:39:22 +01:00
• d293ae61cc [-] SQL error in Combination::setAttributes Shagshag 2013-03-11 12:39:22 +01:00
• 6bd6f283a5 [-] FO : Fix bug #PSCFV-7946 delete customized product with several custos gRoussac 2013-03-11 12:35:23 +01:00
• 3c6ac17a72 [-] FO : Fix bug #PSCFV-7946 delete customized product with several custos gRoussac 2013-03-11 12:35:23 +01:00
• e9e74a171d // Improved pscleaner Damien Metzger 2013-03-11 12:31:28 +01:00
• e9370f1892 // Improved pscleaner Damien Metzger 2013-03-11 12:31:28 +01:00
• fdeba0497d // Small fix (module installation and pscleaner) Damien Metzger 2013-03-11 11:38:24 +01:00
• bc30531063 // Small fix (module installation and pscleaner) Damien Metzger 2013-03-11 11:38:24 +01:00
• dfba5630d2 // remove useless content on 404.php deprecated file Rémi Gaillard 2013-03-11 11:51:32 +01:00
• d424a99d7e // remove useless content on 404.php deprecated file Rémi Gaillard 2013-03-11 11:51:32 +01:00
• bc8848e37c Merge pull request #314 from PrestaEdit/pscleaner Damien Metzger 2013-03-11 03:09:09 -07:00