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

• e793d8e25f [-] CORE : Fix bug #PSCFI-7072 redundant configuration get gRoussac 2013-05-15 14:44:33 +02:00
• 35463be99a // Fixed product rules issue in the cart rules with mod_mysql Damien Metzger 2013-05-15 14:14:04 +02:00
• d3a87e845e // Fixed product rules issue in the cart rules with mod_mysql Damien Metzger 2013-05-15 14:14:04 +02:00
• 79c1d7d0f0 // refacto for last commit c7aa92f3b3 gRoussac 2013-05-15 11:47:46 +02:00
• 5fedb03b30 // refacto for last commit c7aa92f3b3 gRoussac 2013-05-15 11:47:46 +02:00
• be977a5f17 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-15 11:32:03 +02:00
• 37193efc9d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-15 11:32:03 +02:00
• 9b615244b1 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable gRoussac 2013-05-15 11:31:55 +02:00
• c7aa92f3b3 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable gRoussac 2013-05-15 11:31:55 +02:00
• f33e8d8b4a [-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts Rémi Gaillard 2013-05-14 18:13:07 +02:00
• 84aff1d469 [-] FO: Fix #PSCFV-9057 close output buffer before sending attachment and virtualproducts Rémi Gaillard 2013-05-14 18:13:07 +02:00
• 2bcd5bd0c2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-14 16:46:38 +02:00
• 6796738cfd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-14 16:46:38 +02:00
• 81553d81da [-] MO : Fix bug #PSCFI-7055 do not relay on ".html" in referer to find previous category gRoussac 2013-05-14 16:46:03 +02:00
• 8db48ed534 [-] MO : Fix bug #PSCFI-7055 do not relay on ".html" in referer to find previous category gRoussac 2013-05-14 16:46:03 +02:00
• dff200ac9d [-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders Rémi Gaillard 2013-05-14 09:53:33 +02:00
• e54609e3a5 [-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders Rémi Gaillard 2013-05-14 09:53:33 +02:00
• ce71def570 Merge pull request #431 from samy-r/dev-add_attribute Rémi Gaillard 2013-05-14 00:12:55 -07:00
• 897c1ae1d4 Merge pull request #431 from samy-r/dev-add_attribute Rémi Gaillard 2013-05-14 00:12:55 -07:00
• 7b26967df0 $id_shop_list filtering in addAttribute Samy Rabih 2013-05-13 14:50:24 +02:00
• 0fc1b7b7a2 $id_shop_list filtering in addAttribute Samy Rabih 2013-05-13 14:50:24 +02:00
• 28af026c06 [-] BO: Ajax Confirmation / padding-left PrestaEdit 2013-05-12 01:04:00 +03:00
• e14509170b [-] BO: Ajax Confirmation / padding-left PrestaEdit 2013-05-12 01:04:00 +03:00
• 6e425c518b [-] MO: blockcart ajax cart product insert missing html class AntonLejon 2013-05-09 00:53:06 +03:00
• 83a1ea5488 [-] MO: blockcart ajax cart product insert missing html class AntonLejon 2013-05-09 00:53:06 +03:00
• 52bffe6917 // Fixed warning Damien Metzger 2013-05-07 17:27:16 +02:00
• 11fdc8f74b // Fixed warning Damien Metzger 2013-05-07 17:27:16 +02:00
• 693b3355a8 [-] BO : fixed turkish characters replacement #PSCFV-8968 Damien Metzger 2013-05-07 14:09:07 +02:00
• f878e3c721 [-] BO : fixed turkish characters replacement #PSCFV-8968 Damien Metzger 2013-05-07 14:09:07 +02:00
• 4ed5d1bf4e Merge pull request #381 from PrestaEdit/patch-29 Damien Metzger 2013-05-06 07:34:05 -07:00
• ab2008e82a Merge pull request #381 from PrestaEdit/patch-29 Damien Metzger 2013-05-06 07:34:05 -07:00
• 0ab7b15753 Merge pull request #412 from MyBB-Services/dev/gb/contributing Damien Metzger 2013-05-06 07:21:57 -07:00
• 8fb086059e Merge pull request #412 from MyBB-Services/dev/gb/contributing Damien Metzger 2013-05-06 07:21:57 -07:00
• 9ce563e332 Merge pull request #419 from e-gaulue/Module_translation_patch Damien Metzger 2013-05-06 07:09:58 -07:00
• 387b54d322 Merge pull request #419 from e-gaulue/Module_translation_patch Damien Metzger 2013-05-06 07:09:58 -07:00
• f4df47986b Merge pull request #420 from e-gaulue/Module_translation_patch_2 Damien Metzger 2013-05-06 07:08:41 -07:00
• 7c4cabf0f2 Merge pull request #420 from e-gaulue/Module_translation_patch_2 Damien Metzger 2013-05-06 07:08:41 -07:00
• cb6f696dad [*] MO: blockcart animation optimization AntonLejon 2013-05-06 12:14:11 +03:00
• 448b8bad02 [*] MO: blockcart animation optimization AntonLejon 2013-05-06 12:14:11 +03:00
• 80b5855006 [-] BO : fixed potential warning with texture list #PSCFV-9050 Damien Metzger 2013-05-06 09:27:03 +02:00
• 2af342c864 [-] BO : fixed potential warning with texture list #PSCFV-9050 Damien Metzger 2013-05-06 09:27:03 +02:00
• 4df5ac447f [-] BO : tab cache wasn't emptied on delete #PSCFV-9053 Damien Metzger 2013-05-06 09:22:24 +02:00
• dc294d24cb [-] BO : tab cache wasn't emptied on delete #PSCFV-9053 Damien Metzger 2013-05-06 09:22:24 +02:00
• 443e22aa72 [*] FO : AuthController can now have its own template Edouard Gaulué 2013-05-06 00:32:16 +02:00
• 4346d9e57c [*] FO : AuthController can now have its own template Edouard Gaulué 2013-05-06 00:32:16 +02:00
• 63993a425b [-] BO: You can now disable the email sent after account creation Rémi Gaillard 2013-05-03 17:01:12 +02:00
• abcb083cb3 [-] BO: You can now disable the email sent after account creation Rémi Gaillard 2013-05-03 17:01:12 +02:00
• 50b7e77a0c [-] FO : Fix bug #PSCFV-8967 large image instead of thickbox when one image Gregory Roussac 2013-05-02 22:19:28 +02:00
• 4e8c5a24df [-] FO : Fix bug #PSCFV-8967 large image instead of thickbox when one image Gregory Roussac 2013-05-02 22:19:28 +02:00
• 8fe323239b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-02 19:03:11 +02:00
• 3e93198b13 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-02 19:03:11 +02:00
• 5a922391e2 [-] INSTALLER : Fix bug #PSCFV-8605 first part, do not affect memeory limit when upgrading if set to -1 gRoussac 2013-05-02 19:02:48 +02:00
• 049d00a9db [-] INSTALLER : Fix bug #PSCFV-8605 first part, do not affect memeory limit when upgrading if set to -1 gRoussac 2013-05-02 19:02:48 +02:00
• 7eb318b0b0 // small fix Rémi Gaillard 2013-05-02 18:58:05 +02:00
• 32a11677e7 // small fix Rémi Gaillard 2013-05-02 18:58:05 +02:00
• 0442bee919 [-] BO : don't show unecessary tpl module translations - complience with documentation Edouard Gaulué 2013-05-02 18:46:13 +02:00
• fdb931e3e8 [-] BO : don't show unecessary tpl module translations - complience with documentation Edouard Gaulué 2013-05-02 18:46:13 +02:00
• 41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop Rémi Gaillard 2013-05-02 18:42:01 +02:00
• 4d4eb9df19 [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop Rémi Gaillard 2013-05-02 18:42:01 +02:00
• 444a99f564 [-] BO : don't show translation for class/controler overrides when on modules translation page Edouard Gaulué 2013-05-02 18:21:54 +02:00
• 467c183564 [-] BO : don't show translation for class/controler overrides when on modules translation page Edouard Gaulué 2013-05-02 18:21:54 +02:00
• 4b59516a52 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-02 17:10:49 +02:00
• 63fe5b8d4a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-02 17:10:49 +02:00
• b4547fbd83 // small fix when rel of big pic is empty gRoussac 2013-05-02 17:06:32 +02:00
• 311ad3087c // small fix when rel of big pic is empty gRoussac 2013-05-02 17:06:32 +02:00
• fb604492b7 [-] BO : fixed infinite loop in the categories #PSCFV-8965 Damien Metzger 2013-05-02 16:06:09 +02:00
• 87be8bd39e [-] BO : fixed infinite loop in the categories #PSCFV-8965 Damien Metzger 2013-05-02 16:06:09 +02:00
• f1c2d431a9 // FO: improve jqzoom product sLorenzini 2013-05-02 15:49:29 +02:00
• e67965e6bc // FO: improve jqzoom product sLorenzini 2013-05-02 15:49:29 +02:00
• 5c7f3e256d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-02 15:41:34 +02:00
• 15a4d1c60f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-02 15:41:34 +02:00
• a1ce0fda13 [-] INSTALLER : Fix bug #PSCFV-8750 do not activate disabled module during upgrade gRoussac 2013-05-02 15:41:21 +02:00
• 605f95eb88 [-] INSTALLER : Fix bug #PSCFV-8750 do not activate disabled module during upgrade gRoussac 2013-05-02 15:41:21 +02:00
• 9e78586d2b [-] FO: fixed bug: Solved a javascript problem on the new 1.5.4.1 with the full image on product page - PSCFV-8967 sLorenzini 2013-05-02 15:06:57 +02:00
• e158ea1227 [-] FO: fixed bug: Solved a javascript problem on the new 1.5.4.1 with the full image on product page - PSCFV-8967 sLorenzini 2013-05-02 15:06:57 +02:00
• 0ba4d91c43 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog vAugagneur 2013-05-02 11:41:49 +02:00
• 77b8e106f7 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog vAugagneur 2013-05-02 11:41:49 +02:00
• 20babaf68e Merge last developments from Prestashop Grégoire Bélorgey 2013-05-01 09:17:51 +02:00
• 7cd6ab4218 gb/mailcolor Grégoire Bélorgey 2013-05-01 09:01:39 +02:00
• b6fbbe6187 [*] FO: use Tools::fileAttachment() in ContactController PrestaEdit 2013-04-30 20:46:34 +02:00
• 2d1c6514f3 // fix </description> PrestaEdit 2013-04-30 20:40:03 +02:00
• 757f740037 // fix </description> PrestaEdit 2013-04-30 20:40:03 +02:00
• fb3291a08f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity Rémi Gaillard 2013-04-30 12:33:52 +02:00
• 46f7922a8f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity Rémi Gaillard 2013-04-30 12:33:52 +02:00
• ad8291353b [-] FO: improve some css for RTL language sLorenzini 2013-04-30 11:34:13 +02:00
• e0a16977ef [-] FO: improve some css for RTL language sLorenzini 2013-04-30 11:34:13 +02:00
• 6b178752ff [-] FO: replace logo on the left (fixed bug RTL language - #PSCFV-8891) sLorenzini 2013-04-30 11:23:18 +02:00
• 4d961564f7 [-] FO: replace logo on the left (fixed bug RTL language - #PSCFV-8891) sLorenzini 2013-04-30 11:23:18 +02:00
• dc2b69f699 // BO: Improve product display on supplier page sLorenzini 2013-04-30 11:09:08 +02:00
• 00bd78e843 // BO: Improve product display on supplier page sLorenzini 2013-04-30 11:09:08 +02:00
• 028bffd363 // remove unused .show() Gregory Roussac 2013-04-29 23:14:57 +02:00
• cb29f20f1e // remove unused .show() Gregory Roussac 2013-04-29 23:14:57 +02:00
• 5c02334aab [-] FO : Jqzoom must be enabled to add class jqzoom Gregory Roussac 2013-04-29 22:05:01 +02:00
• 1e4e8d6a13 [-] FO : Jqzoom must be enabled to add class jqzoom Gregory Roussac 2013-04-29 22:05:01 +02:00
• 2051b925a1 //norms Gregory Roussac 2013-04-29 21:55:30 +02:00
• d618c8618a //norms Gregory Roussac 2013-04-29 21:55:30 +02:00
• 93d5016848 [-] Bo : Admin login loop under Firefox Gregory Roussac 2013-04-29 21:54:26 +02:00
• a8698d9e59 [-] Bo : Admin login loop under Firefox Gregory Roussac 2013-04-29 21:54:26 +02:00
• 8996690a65 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination Rémi Gaillard 2013-04-29 18:49:42 +02:00
• 9fc4bce500 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination Rémi Gaillard 2013-04-29 18:49:42 +02:00