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

• 3b63713cdd Merge pull request #3 from damonsk/development Vincent Augagneur 2012-11-29 06:15:56 -08:00
• 8dc4dafbd7 Merge pull request #3 from damonsk/development Vincent Augagneur 2012-11-29 06:15:56 -08:00
• 12971aa769 Merge pull request #57 from oleacorner/patch-1 Vincent Augagneur 2012-11-29 05:46:38 -08:00
• cb4bf6251f Merge pull request #57 from oleacorner/patch-1 Vincent Augagneur 2012-11-29 05:46:38 -08:00
• 86f720398a Merge pull request #15 from axome/shipping_cost_admin Vincent Augagneur 2012-11-29 05:40:56 -08:00
• 1127bbbfcb Merge pull request #15 from axome/shipping_cost_admin Vincent Augagneur 2012-11-29 05:40:56 -08:00
• 25ff95741b Update classes/pdf/PDFGenerator.php oleacorner 2012-11-29 13:05:05 +01:00
• 81931f40a0 Update classes/pdf/PDFGenerator.php oleacorner 2012-11-29 13:05:05 +01:00
• 5f8b5c1527 Merge pull request #41 from jessylenne/patch-1 Vincent Augagneur 2012-11-29 03:08:24 -08:00
• 0c0e3ab9ce Merge pull request #41 from jessylenne/patch-1 Vincent Augagneur 2012-11-29 03:08:24 -08:00
• 30b8f81e36 //small fix in controllers/front/OrderController.php thanks to @Butterback vAugagneur 2012-11-29 09:07:02 +01:00
• 562c49163e //small fix in controllers/front/OrderController.php thanks to @Butterback vAugagneur 2012-11-29 09:07:02 +01:00
• 853515ebf0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-11-28 18:52:17 +01:00
• c180b82627 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-11-28 18:52:17 +01:00
• 72464dc9b7 [-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag vAugagneur 2012-11-28 18:52:01 +01:00
• cff5661690 [-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag vAugagneur 2012-11-28 18:52:01 +01:00
• d7ecc8bb99 [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 Sarah Lorenzini 2012-11-28 17:01:56 +01:00
• eb65e76252 [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 Sarah Lorenzini 2012-11-28 17:01:56 +01:00
• b35e0fd519 //remove useless comment vAugagneur 2012-11-28 16:27:21 +01:00
• 0b10428124 //remove useless comment vAugagneur 2012-11-28 16:27:21 +01:00
• 813d28bda9 [-] FO: fix #product_list li span.new: IE 6,7,8 bug: New product badge not correct position - #PSCFV-5898 Sarah Lorenzini 2012-11-28 16:07:36 +01:00
• f9fb4b7f8d [-] FO: fix #product_list li span.new: IE 6,7,8 bug: New product badge not correct position - #PSCFV-5898 Sarah Lorenzini 2012-11-28 16:07:36 +01:00
• f3cde47048 [-] FO: added border-right on product-comparison table Sarah Lorenzini 2012-11-28 15:13:14 +01:00
• bb3ede3aed [-] FO: added border-right on product-comparison table Sarah Lorenzini 2012-11-28 15:13:14 +01:00
• ce427a91d4 //bad link in CONTRIBUTING.md :p vAugagneur 2012-11-28 14:45:52 +01:00
• 585841909f //bad link in CONTRIBUTING.md :p vAugagneur 2012-11-28 14:45:52 +01:00
• f07d918867 //bad link in CONTRIBUTING.md vAugagneur 2012-11-28 14:38:19 +01:00
• 86bbb06360 //bad link in CONTRIBUTING.md vAugagneur 2012-11-28 14:38:19 +01:00
• 7834f1e274 Update classes/pdf/PDFGenerator.php oleacorner 2012-11-28 13:55:08 +01:00
• 6d0d0bab1f Update classes/pdf/PDFGenerator.php oleacorner 2012-11-28 13:55:08 +01:00
• da8fcf7d0e Another instance of cart_quantity_button set as ID Damon Skelhorn 2012-11-28 10:33:25 +00:00
• 3420085113 Another instance of cart_quantity_button set as ID Damon Skelhorn 2012-11-28 10:33:25 +00:00
• 8d6433f48f [-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short [*] BO : added prefix on credit slip reference vAugagneur 2012-11-28 10:56:43 +01:00
• 358c0c168f [-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short [*] BO : added prefix on credit slip reference vAugagneur 2012-11-28 10:56:43 +01:00
• 56b49e9681 Removed ID from repeating product rows in shopping cart table. Damon Skelhorn 2012-11-28 09:35:23 +00:00
• d8bd1f7ca6 Removed ID from repeating product rows in shopping cart table. Damon Skelhorn 2012-11-28 09:35:23 +00:00
• 36851aaa58 [+] FO: modifiy width and height smarty vars for the mobile logo PrestaEdit 2012-11-28 01:31:43 +01:00
• 06ca6d2576 [+] FO: modifiy width and height smarty vars for the mobile logo PrestaEdit 2012-11-28 01:31:43 +01:00
• a6389cb7ef [+] BO: modifiy width and height configuration for the mobile logo PrestaEdit 2012-11-28 01:26:53 +01:00
• 9c51161cfa [+] BO: modifiy width and height configuration for the mobile logo PrestaEdit 2012-11-28 01:26:53 +01:00
• 59035bd99a [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version PrestaEdit 2012-11-28 01:23:24 +01:00
• d6cf7278cf [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version PrestaEdit 2012-11-28 01:23:24 +01:00
• bbdef58492 [+] BO: add updateOptionPsLogoMobile() PrestaEdit 2012-11-28 01:19:45 +01:00
• 238475c097 [+] BO: add updateOptionPsLogoMobile() PrestaEdit 2012-11-28 01:19:45 +01:00
• 2a65bab40e [+] BO: add posibility to set a Mobile Header logo PrestaEdit 2012-11-28 01:10:42 +01:00
• 905e6ce611 [+] BO: add posibility to set a Mobile Header logo PrestaEdit 2012-11-28 01:10:42 +01:00
• 19e14c976a [-] FO : show mobile theme if you have click "Broswe the mobile site" on a PC PrestaEdit 2012-11-27 22:55:57 +01:00
• d16cd5a3bf [-] FO : show mobile theme if you have click "Broswe the mobile site" on a PC PrestaEdit 2012-11-27 22:55:57 +01:00
• 09ce9b2870 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-11-27 18:39:36 +01:00
• 01eef37db5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-11-27 18:39:36 +01:00
• 3b28e532fe //added modules/statssales/config.xml vAugagneur 2012-11-27 18:39:32 +01:00
• e555e679eb //added modules/statssales/config.xml vAugagneur 2012-11-27 18:39:32 +01:00
• 1d45d66370 Merge pull request #50 from PrestaEdit/PSCFV-5880 Vincent Augagneur 2012-11-27 09:21:44 -08:00
• eb80e9fcf5 Merge pull request #50 from PrestaEdit/PSCFV-5880 Vincent Augagneur 2012-11-27 09:21:44 -08:00
• 4a05ddd0a2 [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled vAugagneur 2012-11-27 17:07:59 +01:00
• 21fd4d5eaa [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled vAugagneur 2012-11-27 17:07:59 +01:00
• fda993d05d [-] FO: fix Referral Program Email link fix generates duplicate address in the url - #PSCFV-5853 Sarah Lorenzini 2012-11-27 16:40:41 +01:00
• 8cb08f5d84 [-] FO: fix Referral Program Email link fix generates duplicate address in the url - #PSCFV-5853 Sarah Lorenzini 2012-11-27 16:40:41 +01:00
• 0993d57862 [-] FO : fixed bug #PSCFV-5865 - Payment modules are not visible in the hookPayment for a foreigner country vAugagneur 2012-11-27 16:33:32 +01:00
• 23862593f1 [-] FO : fixed bug #PSCFV-5865 - Payment modules are not visible in the hookPayment for a foreigner country vAugagneur 2012-11-27 16:33:32 +01:00
• 4b87a10bf0 // small fix for merge pull #49 Rémi Gaillard 2012-11-27 15:57:01 +01:00
• a7d67fcd48 // small fix for merge pull #49 Rémi Gaillard 2012-11-27 15:57:01 +01:00
• 5e86f1114b Merge pull request #49 from PrestaEdit/PSCFV-5879 Rémi Gaillard 2012-11-27 06:48:10 -08:00
• d55fb35690 Merge pull request #49 from PrestaEdit/PSCFV-5879 Rémi Gaillard 2012-11-27 06:48:10 -08:00
• 6b5452b053 [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' part 2 vAugagneur 2012-11-27 15:31:21 +01:00
• b123955b26 [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' part 2 vAugagneur 2012-11-27 15:31:21 +01:00
• 65acf285e3 [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' vAugagneur 2012-11-27 15:30:37 +01:00
• 6d3d2bec77 [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' vAugagneur 2012-11-27 15:30:37 +01:00
• fc23dae9de [-] FO: fix The "Compare buttons" on the Manufacturers List page is coded incorrectly... - #PSCFV-5636 Sarah Lorenzini 2012-11-27 15:27:11 +01:00
• 6e640dfe9b [-] FO: fix The "Compare buttons" on the Manufacturers List page is coded incorrectly... - #PSCFV-5636 Sarah Lorenzini 2012-11-27 15:27:11 +01:00
• d4cff1c94b [-] FO: fix Can't create consumer account if blockcart module is disabled - baseUri not defined - #PSCFV-5667 Sarah Lorenzini 2012-11-27 15:13:53 +01:00
• 13af2c610b [-] FO: fix Can't create consumer account if blockcart module is disabled - baseUri not defined - #PSCFV-5667 Sarah Lorenzini 2012-11-27 15:13:53 +01:00
• dc8d8a23ca [-] FO: bug fixed on infos fields authentification Sarah Lorenzini 2012-11-27 15:01:55 +01:00
• 9114223d4b [-] FO: bug fixed on infos fields authentification Sarah Lorenzini 2012-11-27 15:01:55 +01:00
• a25b960fc1 Merge pull request #24 from Caleydon/patch-3 Vincent Augagneur 2012-11-27 06:04:09 -08:00
• c88b4c3d3c Merge pull request #24 from Caleydon/patch-3 Vincent Augagneur 2012-11-27 06:04:09 -08:00
• e09c412a65 Merge pull request #25 from Caleydon/patch-4 Vincent Augagneur 2012-11-27 06:03:02 -08:00
• 5f36ec30af Merge pull request #25 from Caleydon/patch-4 Vincent Augagneur 2012-11-27 06:03:02 -08:00
• 37ddd943ed [-] FO: Fix cookie problem when accessing not accessing to the shop with the main url Rémi Gaillard 2012-11-27 14:52:15 +01:00
• 93038e45f8 [-] FO: Fix cookie problem when accessing not accessing to the shop with the main url Rémi Gaillard 2012-11-27 14:52:15 +01:00
• a7dfa64f3e Merge pull request #22 from Caleydon/patch-1 Vincent Augagneur 2012-11-27 05:46:22 -08:00
• 728424bd63 Merge pull request #22 from Caleydon/patch-1 Vincent Augagneur 2012-11-27 05:46:22 -08:00
• fdb5ba9649 Merge pull request #19 from Caleydon/patch-5 Vincent Augagneur 2012-11-27 05:40:12 -08:00
• 0d8cc1ace2 Merge pull request #19 from Caleydon/patch-5 Vincent Augagneur 2012-11-27 05:40:12 -08:00
• ded3b0cd5e [-] BO : improved error display on admincarriers #PSCFV-5660 DamienMetzger 2012-11-27 12:01:13 +01:00
• e40d8616f8 [-] BO : improved error display on admincarriers #PSCFV-5660 DamienMetzger 2012-11-27 12:01:13 +01:00
• 545e37a57f [-] Classes : Bug fix : Modules, check module instance Francois Gaillard 2012-11-27 11:58:25 +01:00
• 7ae88931f0 [-] Classes : Bug fix : Modules, check module instance François Gaillard 2012-11-27 11:58:25 +01:00
• 1812937933 [-] BO: Fix product image link for admin orders #PSCFV-5163 Rémi Gaillard 2012-11-27 11:55:58 +01:00
• 4e75a1c406 [-] BO: Fix product image link for admin orders #PSCFV-5163 Rémi Gaillard 2012-11-27 11:55:58 +01:00
• 91d53843d9 Merge pull request #51 from PrestaEdit/PSCFV-5872 Vincent Augagneur 2012-11-27 01:32:07 -08:00
• b874e0a990 Merge pull request #51 from PrestaEdit/PSCFV-5872 Vincent Augagneur 2012-11-27 01:32:07 -08:00
• 41f7a8678f // add $usetax in block BestSellers Jonathan Danse 2012-11-27 10:24:46 +01:00
• a934567dfc // add $usetax in block BestSellers Jonathan Danse 2012-11-27 10:24:46 +01:00
• 9e0ad934f8 [-] BO : added Module::getInstanceByName brefore ->loadUpgradeVersionList vAugagneur 2012-11-27 10:10:00 +01:00
• 2567034288 [-] BO : added Module::getInstanceByName brefore ->loadUpgradeVersionList vAugagneur 2012-11-27 10:10:00 +01:00
• 53b1475631 // remove test in Product Jonathan Danse 2012-11-27 10:09:22 +01:00
• 9e3643411e // remove test in Product Jonathan Danse 2012-11-27 10:09:22 +01:00
• 8e4d5057ae // $module_name is a string, test not good Jonathan Danse 2012-11-27 09:30:04 +01:00
• 45cafd3a23 // $module_name is a string, test not good Jonathan Danse 2012-11-27 09:30:04 +01:00