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

• a632965b0d // fix for commit 3cbd8444d6 Rémi Gaillard 2013-04-12 10:49:30 +02:00
• 30fd9ac6e0 [-] CORE : Fix bug #PSCFV-5624 set order reference to CHAR(10) gRoussac 2013-04-11 18:53:10 +02:00
• 08c53d77b2 [-] CORE : Fix bug #PSCFV-5624 set order reference to CHAR(10) gRoussac 2013-04-11 18:53:10 +02:00
• 8d06ff3044 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong Rémi Gaillard 2013-04-11 18:09:35 +02:00
• 3cbd8444d6 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong Rémi Gaillard 2013-04-11 18:09:35 +02:00
• 94d6b597a2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-11 17:51:34 +02:00
• 714b57f225 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-11 17:51:34 +02:00
• 0786cf617f //change the default color (#db3484) vAugagneur 2013-04-11 17:51:28 +02:00
• d827879f8b //change the default color (#db3484) vAugagneur 2013-04-11 17:51:28 +02:00
• 6d869cc804 [-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading gRoussac 2013-04-11 17:34:15 +02:00
• 61557f2fd0 [-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading gRoussac 2013-04-11 17:34:15 +02:00
• 8070739347 [-] Remove / PrestaEdit 2013-04-11 18:18:15 +03:00
• 60e77597ac [-] Remove / PrestaEdit 2013-04-11 18:18:15 +03:00
• 710783c066 Merge pull request #377 from PrestaEdit/patch-28 Vincent Augagneur 2013-04-11 07:43:05 -07:00
• 239dcb0179 Merge pull request #377 from PrestaEdit/patch-28 Vincent Augagneur 2013-04-11 07:43:05 -07:00
• 590b0a6576 Merge pull request #375 from MrManchot/patch-1 Vincent Augagneur 2013-04-11 07:35:04 -07:00
• 0a0f28ee21 Merge pull request #375 from MrManchot/patch-1 Vincent Augagneur 2013-04-11 07:35:04 -07:00
• a2f137f9de Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-11 16:31:48 +02:00
• f9225cb8c2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-11 16:31:48 +02:00
• 2b575e0c96 //removed commented code vAugagneur 2013-04-11 16:31:43 +02:00
• b1dc638120 //removed commented code vAugagneur 2013-04-11 16:31:43 +02:00
• 6d71b29618 // too fast PrestaEdit 2013-04-11 17:25:44 +03:00
• d35cecee10 // too fast PrestaEdit 2013-04-11 17:25:44 +03:00
• 04d7da802e [-] Fix: copy paste a little too fast PrestaEdit 2013-04-11 17:24:12 +03:00
• 891c931832 [-] Fix: copy paste a little too fast PrestaEdit 2013-04-11 17:24:12 +03:00
• f231cd5bd0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-11 15:59:58 +02:00
• 759de67222 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-04-11 15:59:58 +02:00
• 467a6f45fd //small change in table creation of linkstopmenu again gRoussac 2013-04-11 15:59:23 +02:00
• 4738a15c16 //small change in table creation of linkstopmenu again gRoussac 2013-04-11 15:59:23 +02:00
• 8bdcaa2c2d Merge pull request #65 from Ha99y:mobile-them-HR-fix2 vAugagneur 2013-04-11 15:52:07 +02:00
• 0b7e9827af Merge pull request #65 from Ha99y:mobile-them-HR-fix2 vAugagneur 2013-04-11 15:52:07 +02:00
• 3ffb2c8c56 //small chnage in table creation of linkstopmenu gRoussac 2013-04-11 15:05:03 +02:00
• 7222af7466 //small chnage in table creation of linkstopmenu gRoussac 2013-04-11 15:05:03 +02:00
• f4a5305678 [-] INSTALLER : add counter loop in update_order_messages gRoussac 2013-04-11 14:18:28 +02:00
• 2149c2a986 [-] INSTALLER : add counter loop in update_order_messages gRoussac 2013-04-11 14:18:28 +02:00
• 3f33e17567 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-11 12:00:49 +02:00
• df1e71fe76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-11 12:00:49 +02:00
• 63bcd22bc6 [-] CORE : fixed bug #PSCFV-8475 - Email templates with {shop_url} append url with index.php vAugagneur 2013-04-11 12:00:31 +02:00
• c1518dfcbf [-] CORE : fixed bug #PSCFV-8475 - Email templates with {shop_url} append url with index.php vAugagneur 2013-04-11 12:00:31 +02:00
• 723a77e565 [-] BO : Deactivate backwardcompatibility module gRoussac 2013-04-11 11:59:32 +02:00
• 0b21f0e221 [-] BO : Deactivate backwardcompatibility module gRoussac 2013-04-11 11:59:32 +02:00
• 4937f111d1 [-] Installer : Fix bug #PSCFV-8606 bad performance when updating messages gRoussac 2013-04-11 11:49:29 +02:00
• b12b6571a1 [-] Installer : Fix bug #PSCFV-8606 bad performance when updating messages gRoussac 2013-04-11 11:49:29 +02:00
• d79c125e92 Merge pull request #384 from PrestaEdit/patch-30 Gregory Roussac 2013-04-11 02:42:42 -07:00
• 89f5dbcde8 Merge pull request #384 from PrestaEdit/patch-30 Gregory Roussac 2013-04-11 02:42:42 -07:00
• 59570a58ac [-] MO: homefeatured - numbers are now the same PrestaEdit 2013-04-11 12:40:26 +03:00
• a6dafcfa86 [-] MO: homefeatured - numbers are now the same PrestaEdit 2013-04-11 12:40:26 +03:00
• f15722858e [-] FO : standardize behavior of selected country in the list when create a new address vAugagneur 2013-04-11 10:30:22 +02:00
• 7a27fa2f64 [-] FO : standardize behavior of selected country in the list when create a new address vAugagneur 2013-04-11 10:30:22 +02:00
• 8793024d56 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-04-11 10:28:49 +02:00
• 1ae6507973 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development François Gaillard 2013-04-11 10:28:49 +02:00
• 9c3417bfff // Fixed Tools::jsonEncode() on Tools.php Francois Gaillard 2013-04-11 10:28:38 +02:00
• 8125a2e5b4 // Fixed Tools::jsonEncode() on Tools.php François Gaillard 2013-04-11 10:28:38 +02:00
• f1dcb365e9 [-] MO: fix statsbestvouchers PrestaEdit 2013-04-11 02:39:03 +03:00
• cb560ce07f [-] MO: fix statsbestvouchers PrestaEdit 2013-04-11 02:39:03 +03:00
• 345ec87993 [-] BO: PSCFV-7685 parent category for root categories after upgrade Rémi Gaillard 2013-04-10 18:52:59 +02:00
• f43aee9a25 [-] BO: PSCFV-7685 parent category for root categories after upgrade Rémi Gaillard 2013-04-10 18:52:59 +02:00
• ec63aa4064 [*] Installer : Set context in upgrader gRoussac 2013-04-10 17:57:33 +02:00
• 17012ea00d [*] Installer : Set context in upgrader gRoussac 2013-04-10 17:57:33 +02:00
• cfe0464cb9 [-] INSTALLER : fix bug #PSCFV-7688 mailalert_customer_oos not existing in database gRoussac 2013-04-10 10:27:25 +02:00
• 8674313eae [-] INSTALLER : fix bug #PSCFV-7688 mailalert_customer_oos not existing in database gRoussac 2013-04-10 10:27:25 +02:00
• 4ff8ca7696 // removed slash gRoussac 2013-04-09 17:47:34 +02:00
• a0db01db58 // removed slash gRoussac 2013-04-09 17:47:34 +02:00
• b623f50df7 [-] BO : Fix bug #PSCFV-8626 rename actual admin folder gRoussac 2013-04-09 17:43:15 +02:00
• 1b01c7a602 [-] BO : Fix bug #PSCFV-8626 rename actual admin folder gRoussac 2013-04-09 17:43:15 +02:00
• 648da86eac [-] FO - fixed bug #PSCFV-8612 - Payment module: Bug in country restriction in multi store vAugagneur 2013-04-09 14:59:15 +02:00
• 3ba776a9d1 [-] FO - fixed bug #PSCFV-8612 - Payment module: Bug in country restriction in multi store vAugagneur 2013-04-09 14:59:15 +02:00
• 0da80258d4 [-] BO: fixed bug Cart rules - Javascript error - #PSCFV-5045 sLorenzini 2013-04-09 11:22:19 +02:00
• c26fa09667 [-] BO: fixed bug Cart rules - Javascript error - #PSCFV-5045 sLorenzini 2013-04-09 11:22:19 +02:00
• 01bcb38522 [-] BO : Fix bug #PSCFV-8620 returns with customized product gRoussac 2013-04-09 10:37:15 +02:00
• e5cf7a4c06 [-] BO : Fix bug #PSCFV-8620 returns with customized product gRoussac 2013-04-09 10:37:15 +02:00
• cb05f7c921 // miss logo gRoussac 2013-04-09 10:16:49 +02:00
• 403b9b760f // miss logo gRoussac 2013-04-09 10:16:49 +02:00
• 40ad032dd4 [+] BO: show all languages in setting of employee PrestaEdit 2013-04-09 00:33:49 +03:00
• 86c6b3154f [+] BO: show all languages in setting of employee PrestaEdit 2013-04-09 00:33:49 +03:00
• ba41f80b4e [-] FO: fixed bug DOCTYPE line - #PSCFV-8602 sLorenzini 2013-04-08 18:00:59 +02:00
• 66b321ae55 [-] FO: fixed bug DOCTYPE line - #PSCFV-8602 sLorenzini 2013-04-08 18:00:59 +02:00
• 582bc67633 // something was missing in last commit Rémi Gaillard 2013-04-08 17:53:56 +02:00
• 881b6e7a8b // something was missing in last commit Rémi Gaillard 2013-04-08 17:53:56 +02:00
• c6d8b91287 [*] BO: The translation of modules are now made in the theme if modules are overrided or directly in the module folder Rémi Gaillard 2013-04-08 17:50:43 +02:00
• 3ffe339a76 [*] BO: The translation of modules are now made in the theme if modules are overrided or directly in the module folder Rémi Gaillard 2013-04-08 17:50:43 +02:00
• 419ed00e58 [-] BO: Fix #PSCFV-8683 order_way collusion on listing between 2 tabs Rémi Gaillard 2013-04-08 14:58:29 +02:00
• a720b19854 [-] BO: Fix #PSCFV-8683 order_way collusion on listing between 2 tabs Rémi Gaillard 2013-04-08 14:58:29 +02:00
• f310ec5346 [-] FO: Fix htaccess generation when disable mod_security is selected #PSCFV-8675 Rémi Gaillard 2013-04-08 11:35:08 +02:00
• 90878d8a80 [-] FO: Fix htaccess generation when disable mod_security is selected #PSCFV-8675 Rémi Gaillard 2013-04-08 11:35:08 +02:00
• 0d20860e5b Update blocknewsletter.php Cédric Mouleyre 2013-04-08 11:53:37 +03:00
• 6c36a1ba72 Update blocknewsletter.php Cédric Mouleyre 2013-04-08 11:53:37 +03:00
• 6384a74c1d [-] BO : Fix bug : #PSCFV-8631 no download-product.tpl in languages packs gRoussac 2013-04-08 10:50:03 +02:00
• d6ee2acc90 [-] BO : Fix bug : #PSCFV-8631 no download-product.tpl in languages packs gRoussac 2013-04-08 10:50:03 +02:00
• f9de39b225 [-] BO : Fix bug #PSCFV-8540 setting cookie key in cache key gRoussac 2013-04-05 17:59:46 +02:00
• 5b6dc1e9e9 [-] BO : Fix bug #PSCFV-8540 setting cookie key in cache key gRoussac 2013-04-05 17:59:46 +02:00
• b101bdca71 // Fix #PSCFV-8599 remove non existant image from css Rémi Gaillard 2013-04-05 17:50:21 +02:00
• 3f1bcb4d18 // Fix #PSCFV-8599 remove non existant image from css Rémi Gaillard 2013-04-05 17:50:21 +02:00
• 49b49ee469 //small fix vAugagneur 2013-04-05 17:14:38 +02:00
• 6edc6c37f7 //small fix vAugagneur 2013-04-05 17:14:38 +02:00
• a3fd8c7d4b // Fixed commit a53163feee (shipping discount in the invoice) Damien Metzger 2013-04-05 14:32:49 +02:00
• d7b78e6f43 // Fixed commit a53163feee (shipping discount in the invoice) Damien Metzger 2013-04-05 14:32:49 +02:00
• 2837c0e34e // And now use smarty cache groups for cache ids to be more efficient Rémi Gaillard 2013-04-05 11:57:52 +02:00
• 26bdf77308 // And now use smarty cache groups for cache ids to be more efficient Rémi Gaillard 2013-04-05 11:57:52 +02:00
• 0e418f20cc [*] FO: use subdirectory per template for smarty cache Rémi Gaillard 2013-04-05 11:44:16 +02:00