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

• 6cfde246a2 //fix carrier wizard with multistore Vincent Augagneur 2013-08-13 10:09:19 +02:00
• 3aff1341f6 //small fix Vincent Augagneur 2013-08-13 10:01:18 +02:00
• 284f758cb4 [-] FO: Fix quantity discount table display for non default attribute #PSCFV-9942 Rémi Gaillard 2013-08-12 18:40:52 +02:00
• 0cd6c5b200 //new tab name for carrier option Vincent Augagneur 2013-08-12 17:32:55 +02:00
• 5d0f1499ac // without hedgehogs is better gRoussac 2013-08-12 16:50:14 +02:00
• 30d9ebe68f [-] FO : Fix bug #PSCFV-9624 try 302 redirect from old 1.4 images format to new _default before 404.gif gRoussac 2013-08-12 16:44:25 +02:00
• 5f6c1ac1ce // HTML Syntax error Jerome Nadaud 2013-08-12 16:44:15 +02:00
• 7ec55106ce [*] CORE : Get instance of current product in product controller merge https://github.com/PrestaShop/PrestaShop/pull/644 thanks @kpodemski gRoussac 2013-08-12 16:23:54 +02:00
• a06dfafb9a // Avoid some filters errors Jerome Nadaud 2013-08-12 15:44:13 +02:00
• e2e5fbe33a //now you can delete all carriers Vincent Augagneur 2013-08-12 15:25:26 +02:00
• 7cc59b2f49 //fixed bug #PSCFV-10091 part2 Vincent Augagneur 2013-08-12 15:23:52 +02:00
• 7a06dca942 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Vincent Augagneur 2013-08-12 15:18:02 +02:00
• a1be985067 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Vincent Augagneur 2013-08-12 15:17:35 +02:00
• 7ff8e44386 [-] BO : fixed bug when carrier is free and change shipping method Vincent Augagneur 2013-08-12 15:17:28 +02:00
• 06cdeb45a5 [-] FO : FixBug #PSCFV-10058 - Missing required form fields in address format Jerome Nadaud 2013-08-12 15:17:21 +02:00
• de41faff80 [-] Core: Fix #PSCFV-8887 - improve performance of search indexation Rémi Gaillard 2013-08-12 15:16:45 +02:00
• bae9df61dc //revert reorganization of shipping menus & options Vincent Augagneur 2013-08-12 15:15:17 +02:00
• 136586830d //small fix Vincent Augagneur 2013-08-12 15:09:40 +02:00
• 30c9156a41 [-] BO : fixed bug #PSCFV-10091 - you can now enable all zone in one clic Vincent Augagneur 2013-08-12 14:56:49 +02:00
• 52806c0056 [-] BO : fixed bug #PSCFV-10033 - disable next step if no range has been added on carrier wizard Vincent Augagneur 2013-08-12 14:41:44 +02:00
• 1359f46bae [-] FO : FixBug #PSCFV-10090 urlencode syntax error - Thanks Duarte Jerome Nadaud 2013-08-12 14:37:32 +02:00
• 4c47c980f8 // Javascript error if address does not exist Jerome Nadaud 2013-08-12 11:57:40 +02:00
• 627e3d8a77 [-] BO : fixed multistore thumbnail on product list Vincent Augagneur 2013-08-12 11:27:25 +02:00
• 6befd831c9 //small install fix Vincent Augagneur 2013-08-12 11:10:12 +02:00
• 3664f4c394 //reorganization of shipping menus & options Vincent Augagneur 2013-08-12 11:02:28 +02:00
• 7b92675778 [-] CORE : Fix bug #PSCFV-8542 could not have rewrited link for modules in blocklanguage gRoussac 2013-08-12 10:26:40 +02:00
• b7232aabd7 Merge pull request #643 from Shagshag/patch-2 Gregory Roussac 2013-08-12 00:29:33 -07:00
• ce20d55e77 ProductDownload::getNewFilename() little optimisation Shagshag 2013-08-12 04:28:58 +02:00
• 54189a5d97 [-] MO : sendtofriend FixBug Form error Jerome NadaudandgRoussac 2013-08-08 13:06:18 +02:00
• f119b8e64f [-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country Jérôme NadaudandgRoussac 2013-08-08 23:30:31 +02:00
• 7b41098a5d [-] FO : FixBug CGV does not pop-up in Fancy Box Jérôme NadaudandgRoussac 2013-08-08 21:28:55 +02:00
• d3717f0950 // fix some test with colors & fix for login screen Kevin Granger 2013-08-09 18:57:22 +02:00
• 8be3344e41 // W3C validation error Jerome NadaudandgRoussac 2013-08-09 14:10:38 +02:00
• bc7d16ede6 [-] FO : FixBug generated_date error Jerome NadaudandgRoussac 2013-08-09 09:10:53 +02:00
• 501cbea5aa [-] BO : FixBug root category listed after list reset Jerome NadaudandgRoussac 2013-08-09 12:16:05 +02:00
• 67a0c96ea2 [-] CORE : getModuleLink not working on module custom route, merge from https://github.com/PrestaShop/PrestaShop/pull/487 thanks @zimmi1 gRoussac 2013-08-09 18:36:23 +02:00
• 41d29b5445 [-] CORE : Addslashes on not translated strings for javascript js=1 gRoussac 2013-08-09 18:26:26 +02:00
• 92840f85fe [-] BO : Fix additional quote in live edit template gRoussac 2013-08-09 18:04:08 +02:00
• eb0d2d47e4 // The blunder wasn't mine :) Damien Metzger 2013-08-09 17:31:00 +02:00
• 971b45e630 // fixed variable that does not exists Damien Metzger 2013-08-09 17:21:13 +02:00
• 431aa78b6f //small fix Vincent Augagneur 2013-08-09 16:36:26 +02:00
• a64fcdd135 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-08-09 16:07:26 +02:00
• ecfe61972b [+] BO : Change action link for button Jerome Nadaud 2013-08-09 16:07:07 +02:00
• bca29980d5 //fix layout and contrasted colors Kevin Granger 2013-08-09 15:08:14 +02:00
• 8733b968f5 [-] FO : input token missplaced in address.tpl gRoussac 2013-08-09 14:31:59 +02:00
• a38fe5ddd3 // W3C validation error Jerome Nadaud 2013-08-09 14:10:38 +02:00
• c35d846f60 [-] BO : FixBug root category listed after list reset Jerome Nadaud 2013-08-09 12:16:05 +02:00
• 2820314586 [-] MO : fixed potential warning in pscleaner #PSCFV-10070 Damien Metzger 2013-08-09 11:40:40 +02:00
• 75f0b38ff1 // Syntax error Jerome Nadaud 2013-08-09 11:38:59 +02:00
• 1183b14ea9 [-] MO: no more 1.4 support for blocklayered Rémi Gaillard 2013-08-09 11:24:21 +02:00
• 328c6a5439 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Kevin Granger 2013-08-09 11:19:39 +02:00
• 2549924cef Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Kevin Granger 2013-08-09 11:10:58 +02:00
• f41bf1dcca [-] MO : fixed bug #PNM-792 : remove unused js file in blocklayered Vincent Augagneur 2013-08-09 11:07:49 +02:00
• 617c1e01d2 //fix steps of Carriers Wizard with multishop activated Kevin Granger 2013-08-09 11:06:54 +02:00
• a5be1f147f //small fix when multi-store is enable on carrier wizard Vincent Augagneur 2013-08-09 10:58:07 +02:00
• 1571dd60c8 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Vincent Augagneur 2013-08-09 10:44:24 +02:00
• 13be8db639 //added checkbox for all zones Vincent Augagneur 2013-08-09 10:44:20 +02:00
• cac7b267e6 [-] MO : fixed category link on blocklayered #PNM-1427 Damien Metzger 2013-08-09 10:37:23 +02:00
• eed7ceb37a [-] MO : blocklayered also try to find the translations in the translations directory Damien Metzger 2013-08-09 10:21:37 +02:00
• cbc7b9567a [-] FO : Do not redirect on 301 when POST request Jerome Nadaud 2013-08-09 10:20:42 +02:00
• 0fc1c9184c [-] MO : added visibility IN ("both", "catalog") in blocklayered Damien Metzger 2013-08-09 10:10:43 +02:00
• 64698d1590 [-] FO : FixBug generated_date error Jerome Nadaud 2013-08-09 09:10:53 +02:00
• 84ded9f3db [-] FO : FixBug #PSCFV-10058 Invalid id country after allow to select no country Jérôme Nadaud 2013-08-08 23:30:31 +02:00
• f5e28b9212 [-] FO : FixBug CGV does not pop-up in Fancy Box Jérôme Nadaud 2013-08-08 21:28:55 +02:00
• 9ccd9b7cad [-] FO : Do not redirect on 301 when POST request gRoussac 2013-08-08 19:19:34 +02:00
• e923455f6d // revert from https://github.com/PrestaShop/PrestaShop/commit/589052325b121282d091986cd64b5d82e8890ecd gRoussac 2013-08-08 18:58:04 +02:00
• 50cba2b12b // Added link to Addons in the footer Damien Metzger 2013-08-08 17:49:17 +02:00
• 6ae222e720 // some sass/compass magic for color schemes… and few new bugs to fix with layout Kevin Granger 2013-08-08 16:59:39 +02:00
• 95680e0158 [*] FO : added chinese/japanese search Damien Metzger 2013-08-08 16:57:55 +02:00
• 97062d60a2 // Add index.php Jerome Nadaud 2013-08-08 16:14:45 +02:00
• 390b49122e [-] FO : FixBug #PSCFV-10026 SSL error on ajax action Jerome Nadaud 2013-08-08 15:58:52 +02:00
• d2f41d7467 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-08-08 15:52:42 +02:00
• 589052325b // Fix cart with ssl Rémi Gaillard 2013-08-08 15:52:16 +02:00
• be9398c6c5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-08-08 13:06:41 +02:00
• d5cdcab859 [-] MO : sendtofriend FixBug Form error Jerome Nadaud 2013-08-08 13:06:18 +02:00
• 16fec55c6f // report of https://github.com/PrestaShop/PrestaShop/commit/0023950c72c136ef623f53f2618aa97d02525e99 gRoussac 2013-08-08 12:16:19 +02:00
• 49b6fda40f Merge pull request #639 from PrestaEdit/patch-49 Gregory Roussac 2013-08-08 03:09:29 -07:00
• cbdea59753 // revert 1c80b5fdfe Rémi Gaillard 2013-08-08 11:50:35 +02:00
• 0023950c72 [-] BO: correct link in Block Discover. PrestaEdit 2013-08-08 11:44:24 +02:00
• 5832ab3eb5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-08-08 11:40:58 +02:00
• 567321dd3d // clean cookie after logout Rémi Gaillard 2013-08-08 11:39:36 +02:00
• 169c3fbc6b // Removed useless line Damien Metzger 2013-08-08 11:24:03 +02:00
• 7d4feac247 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-08-08 11:17:07 +02:00
• 8e72d122e6 [-] MO : blockcategories FixBug html tags in categories link title Jerome Nadaud 2013-08-08 11:16:45 +02:00
• 5b3dda1cfb Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-08-08 11:05:37 +02:00
• 1c80b5fdfe [-] BO : list of carriers should only contain the active one in AdminProducts gRoussac 2013-08-08 11:05:09 +02:00
• 4709f4a3c0 [-] MO : fixed module upgrade with common version number Damien Metzger 2013-08-08 11:03:22 +02:00
• bb45c93d4f Merge pull request #563 from Prestaworks/patch-12 Gregory Roussac 2013-08-08 02:00:57 -07:00
• a9b44884f1 // Fixed upgrade of homeslider module Damien Metzger 2013-08-08 10:46:43 +02:00
• c31c2ca0e9 [-] MO: cover image issue with layered block on multishop, thanks @theginie gRoussac 2013-08-08 10:46:22 +02:00
• 55fc51f20b [-] MO : CarrierCompare FixBug #PSCFV-9975 Ajax SSL error Jerome Nadaud 2013-08-08 10:41:22 +02:00
• 1bfa43fa8b [-] MO : My account column block should not display module icon in list gRoussac 2013-08-08 10:38:39 +02:00
• 0f4562eb44 [*] MO : added manufactureres order by name, thanks@Jacky75 gRoussac 2013-08-08 10:24:05 +02:00
• 4abff03244 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-08-08 10:17:00 +02:00
• d6ab0696e6 [-] BO : OrderSlip now correctly displays the order slip date, thanks @Jacky75 gRoussac 2013-08-08 10:16:41 +02:00
• ad1efa612f [+] BO : Better SendBulkAction function Jerome Nadaud 2013-08-08 09:44:52 +02:00
• ff69638595 // removed kay navigation in carrier wizard Damien Metzger 2013-08-08 09:38:52 +02:00
• 05946f2932 [-] MO : blocktopmenu should clear cache when adding a new subcategory Damien Metzger 2013-08-08 09:35:19 +02:00
• 0550ad5135 // Fixed smarty parse error on live edit Damien Metzger 2013-08-08 09:29:13 +02:00
• 65271a9385 [-] BO : FixBug Bulk action sended on filter Jerome Nadaud 2013-08-07 18:42:43 +02:00