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

• 8dfef27674 [-] FO : Fix bug #PSCFV-8028 refactoring customization gRoussac 2013-03-21 12:02:13 +01:00
• 905c1b2018 [-] FO : Fix bug #PSCFV-8028 refactoring customization gRoussac 2013-03-21 12:02:13 +01:00
• 391d30b2cd // Fixed installer translations Damien Metzger 2013-03-21 14:04:44 +01:00
• f215a69e10 // Fixed installer translations Damien Metzger 2013-03-21 14:04:44 +01:00
• 39e036197d // Fixed activity Damien Metzger 2013-03-21 14:02:44 +01:00
• c0f55d37a3 // Fixed activity Damien Metzger 2013-03-21 14:02:44 +01:00
• ea7a7e8416 [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed Rémi GaillardandgRoussac 2013-03-20 17:17:26 +01:00
• b63e5c235c [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed Rémi GaillardandgRoussac 2013-03-20 17:17:26 +01:00
• fea8f50ab9 // reset category filter on adminproducts on multishop when category is not associated to the shop Rémi Gaillard 2013-03-21 12:03:39 +01:00
• 103a2cb443 // reset category filter on adminproducts on multishop when category is not associated to the shop Rémi Gaillard 2013-03-21 12:03:39 +01:00
• d5759f1b58 [-] FO : Fix bug #PSCFV-8028 refactoring customization gRoussac 2013-03-21 12:02:13 +01:00
• 14627d4d75 [-] FO : Fix bug #PSCFV-8028 refactoring customization gRoussac 2013-03-21 12:02:13 +01:00
• b196c2a4f8 // switch to degraded mode with safe_mode only if errors on a first install Rémi Gaillard 2013-03-21 11:17:24 +01:00
• 09e5df3704 // switch to degraded mode with safe_mode only if errors on a first install Rémi Gaillard 2013-03-21 11:17:24 +01:00
• f504b3c594 // Fix installer when safe_mode is enabled Rémi Gaillard 2013-03-21 10:56:26 +01:00
• 1f3f53607d // Fix installer when safe_mode is enabled Rémi Gaillard 2013-03-21 10:56:26 +01:00
• cf8a621332 Merge pull request #338 from djfm/pl_installer Rémi Gaillard 2013-03-21 02:50:03 -07:00
• 530f9e1a8b Merge pull request #338 from djfm/pl_installer Rémi Gaillard 2013-03-21 02:50:03 -07:00
• b2d1270433 // Fix htmlentities on csv export Rémi Gaillard 2013-03-21 10:08:24 +01:00
• 37489c752c // Fix htmlentities on csv export Rémi Gaillard 2013-03-21 10:08:24 +01:00
• 6be433a2fe // Small fix Rémi Gaillard 2013-03-21 10:02:36 +01:00
• 34743b465b // Small fix Rémi Gaillard 2013-03-21 10:02:36 +01:00
• 1a00bcb369 //some changes after review from Magdalena djfm 2013-03-20 14:56:36 +01:00
• cb84c1cbe4 //some changes after review from Magdalena djfm 2013-03-20 14:56:36 +01:00
• 39b71b13ce another utf-8 fix :( kpodemskianddjfm 2013-03-15 18:17:37 +01:00
• 2c3d0e7657 another utf-8 fix :( kpodemskianddjfm 2013-03-15 18:17:37 +01:00
• 751346a932 fix utf-8 kpodemskianddjfm 2013-03-15 18:13:50 +01:00
• 3d7a303046 fix utf-8 kpodemskianddjfm 2013-03-15 18:13:50 +01:00
• f6eec7a70a fix kpodemskianddjfm 2013-03-15 18:01:52 +01:00
• 1acc4439cc fix kpodemskianddjfm 2013-03-15 18:01:52 +01:00
• c3fd182ce5 // some corrections in ru and pl installer fram 2013-03-15 12:18:30 +01:00
• db58043fbe // some corrections in ru and pl installer fram 2013-03-15 12:18:30 +01:00
• df7ea64007 // added Polish installer fram 2013-03-14 11:01:45 +01:00
• ece2ad6f21 // added Polish installer fram 2013-03-14 11:01:45 +01:00
• 72f49a93f4 // oups Rémi Gaillard 2013-03-20 20:13:38 +01:00
• 646a68ef16 // oups Rémi Gaillard 2013-03-20 20:13:38 +01:00
• 503ea951a5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-03-20 20:12:52 +01:00
• 070ea4b556 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-03-20 20:12:52 +01:00
• 5f181c8e4c [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images Rémi Gaillard 2013-03-20 20:12:28 +01:00
• 17c9814f63 [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images Rémi Gaillard 2013-03-20 20:12:28 +01:00
• 58de916f79 [-] FO : Fix bug #PSCFV-8031 and maybe others, do not loop when calling displayNewProducts in blockcart gRoussac 2013-03-20 20:10:52 +01:00
• 9275de936a [-] FO : Fix bug #PSCFV-8031 and maybe others, do not loop when calling displayNewProducts in blockcart gRoussac 2013-03-20 20:10:52 +01:00
• 68be65e60f // Reduced localization form size Damien Metzger 2013-03-20 18:10:53 +01:00
• 3820a011cb // Reduced localization form size Damien Metzger 2013-03-20 18:10:53 +01:00
• f8fd67e2c4 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-20 17:28:58 +01:00
• b901447827 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-20 17:28:58 +01:00
• ecfb24dad4 [+] CORE : added new hook actionModuleInstallBefore and actionModuleInstallAfter vAugagneur 2013-03-20 17:28:51 +01:00
• 697f3fb71a [+] CORE : added new hook actionModuleInstallBefore and actionModuleInstallAfter vAugagneur 2013-03-20 17:28:51 +01:00
• 02d58956c8 [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed Rémi Gaillard 2013-03-20 17:17:26 +01:00
• b1c47c4fde [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed Rémi Gaillard 2013-03-20 17:17:26 +01:00
• a58e9948e7 [-] BO: AdminProductControllers::bulkDelete should return error message if stock left with adv stock management like standard delete #PSCFV-8250 Rémi Gaillard 2013-03-20 16:38:20 +01:00
• db9a73d41a [-] BO: AdminProductControllers::bulkDelete should return error message if stock left with adv stock management like standard delete #PSCFV-8250 Rémi Gaillard 2013-03-20 16:38:20 +01:00
• 5d054704a9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-03-20 16:37:02 +01:00
• 98fe8b6dd5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-03-20 16:37:02 +01:00
• 0fb8bb1127 // Bug fix, no language is set when a employee is not logged yet Francois Gaillard 2013-03-20 15:26:51 +01:00
• d1ee26895e // Bug fix, no language is set when a employee is not logged yet Rémi GaillardandFrançois Gaillard 2013-03-20 15:26:51 +01:00
• cc996afc13 // sometimes shit happen and no language is set when a employee is not logged yet Rémi Gaillard 2013-03-20 15:26:51 +01:00
• d951460cff // sometimes shit happen and no language is set when a employee is not logged yet Rémi Gaillard 2013-03-20 15:26:51 +01:00
• 0924228fcd Merge pull request #335 from djfm/pdf Rémi Gaillard 2013-03-20 06:21:15 -07:00
• 3b97989d2e Merge pull request #335 from djfm/pdf Rémi Gaillard 2013-03-20 06:21:15 -07:00
• 6ab2ffaf12 // fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk djfm 2013-03-20 12:23:01 +01:00
• adf6786d40 // fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk djfm 2013-03-20 12:23:01 +01:00
• a2362d1d6f // remove themeinstallator from install modules list, now install from addons vAugagneur 2013-03-20 11:25:45 +01:00
• 04c3b54c38 // remove themeinstallator from install modules list, now install from addons vAugagneur 2013-03-20 11:25:45 +01:00
• 40bddde9cc // Code cleaning thanks to maofree #PSCFV-7953 Damien Metzger 2013-03-20 11:21:36 +01:00
• 2fb9b140f0 // Code cleaning thanks to maofree #PSCFV-7953 Damien Metzger 2013-03-20 11:21:36 +01:00
• a6da2c12a0 [-] FO: Fix #PSCFV-7600 display accessory in the product page even if there are no stock for the default combination (on the default theme) Rémi Gaillard 2013-03-20 11:14:33 +01:00
• 09d5c695bb [-] FO: Fix #PSCFV-7600 display accessory in the product page even if there are no stock for the default combination (on the default theme) Rémi Gaillard 2013-03-20 11:14:33 +01:00
• b95b5861ef [+] INSTALLER : added modules install from addons vAugagneur 2013-03-20 11:04:48 +01:00
• b70497189d [+] INSTALLER : added modules install from addons vAugagneur 2013-03-20 11:04:48 +01:00
• 77002bb3f5 [-] BO : fixed product indexation markup in import #PSCFV-7695 Damien Metzger 2013-03-20 10:43:18 +01:00
• 155150ea00 [-] BO : fixed product indexation markup in import #PSCFV-7695 Damien Metzger 2013-03-20 10:43:18 +01:00
• d683478818 [-] FO : fixed attributes order #PSCFV-8032 Damien Metzger 2013-03-20 10:31:39 +01:00
• 967a01f2ae [-] FO : fixed attributes order #PSCFV-8032 Damien Metzger 2013-03-20 10:31:39 +01:00
• 51bac2107f // Made order message checks more flexible #PSCFV-8123 Damien Metzger 2013-03-19 16:38:44 +01:00
• 6fdb4890cd // Made order message checks more flexible #PSCFV-8123 Damien Metzger 2013-03-19 16:38:44 +01:00
• bbd5cc3313 // Code cleaning Damien Metzger 2013-03-04 08:43:38 +01:00
• 9ae5e0e12a // Code cleaning Damien Metzger 2013-03-04 08:43:38 +01:00
• 0a54da23d8 // small fix for value of default refund displayed Rémi Gaillard 2013-03-19 13:50:21 +01:00
• e4890b629d // small fix for value of default refund displayed Rémi Gaillard 2013-03-19 13:50:21 +01:00
• 319d6ddec8 [-] BO : Fix bug #PSCFV-8027 bad sql query on messages when private bool = true gRoussac 2013-03-19 11:34:54 +01:00
• b9649c754e [-] BO : Fix bug #PSCFV-8027 bad sql query on messages when private bool = true gRoussac 2013-03-19 11:34:54 +01:00
• 2bdb188634 // Bug fix : Mobile, js errors fixed Francois Gaillard 2013-03-19 11:16:40 +01:00
• 5b96943e7f // Bug fix : Mobile, js errors fixed François Gaillard 2013-03-19 11:16:40 +01:00
• 39b120bbb4 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js gRoussac 2013-03-19 11:10:57 +01:00
• 1b7a914008 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js gRoussac 2013-03-19 11:10:57 +01:00
• cd60e6785e [*] Mobile : OPC, display carrier price, gift wrapping price and gift products Francois Gaillard 2013-03-19 10:01:07 +01:00
• 97c5c0d0c7 [*] Mobile : OPC, display carrier price, gift wrapping price and gift products François Gaillard 2013-03-19 10:01:07 +01:00
• 3cd5de42b0 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Francois Gaillard 2013-03-19 09:47:46 +01:00
• fddbfa6032 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release François Gaillard 2013-03-19 09:47:46 +01:00
• fef6c04f32 // Debug removed from shopping cart Francois Gaillard 2013-03-19 09:47:39 +01:00
• a7f4f82fc0 // Debug removed from shopping cart François Gaillard 2013-03-19 09:47:39 +01:00
• bf171af16a [-] BO : added important check of the default language for ObjectModel multilang properties Damien Metzger 2013-03-18 17:48:17 +01:00
• ce4148b89a [-] BO : added important check of the default language for ObjectModel multilang properties Damien Metzger 2013-03-18 17:48:17 +01:00
• b4b90669d0 [-] FO: CMS link to conditions should not be in SSL DrÿSs 2013-03-18 17:07:41 +01:00
• 6a278d405d [-] FO: CMS link to conditions should not be in SSL DrÿSs' 2013-03-18 17:07:41 +01:00
• 52f76312f0 [-] FO: CMS link to conditions should not be in SSL DrÿSs 2013-03-18 17:05:22 +01:00
• 29cc8fc782 [-] FO: CMS link to conditions should not be in SSL DrÿSs' 2013-03-18 17:05:22 +01:00
• 5b2465e9bb //small fix when click on install button on tab module list vAugagneur 2013-03-18 15:27:56 +01:00
• e9c618e55b //small fix when click on install button on tab module list vAugagneur 2013-03-18 15:27:56 +01:00