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

• 0abe3b3193 [*] Class: Module / Use method instead of SQL query PrestaEdit 2013-05-21 13:03:41 +03:00
• dc5df43d16 //remove useless comments vAugagneur 2013-05-21 11:28:24 +02:00
• 43a333ff03 //remove useless comments vAugagneur 2013-05-21 11:28:24 +02:00
• 6d6b2ef7d3 Merge pull request #225 from emily-d/development Vincent Augagneur 2013-05-21 02:27:30 -07:00
• 70b061343b Merge pull request #225 from emily-d/development Vincent Augagneur 2013-05-21 02:27:30 -07:00
• 7576bc18e4 // small fix Rémi Gaillard 2013-05-21 11:06:23 +02:00
• 0ddc7e0e4b // small fix Rémi Gaillard 2013-05-21 11:06:23 +02:00
• 3d9596aa99 [*] FO: Don't make useless ajax requests to blockcart on the cart page Rémi Gaillard 2013-05-21 10:56:55 +02:00
• b573b39acb [*] FO: Don't make useless ajax requests to blockcart on the cart page Rémi Gaillard 2013-05-21 10:56:55 +02:00
• 0d4fd0729b //small bug vAugagneur 2013-05-21 10:30:35 +02:00
• 2a606999fd //small bug vAugagneur 2013-05-21 10:30:35 +02:00
• 5c9abe1194 Merge pull request #429 from PrestaEdit/patch-34 Vincent Augagneur 2013-05-21 01:25:54 -07:00
• 69c045d8fd Merge pull request #429 from PrestaEdit/patch-34 Vincent Augagneur 2013-05-21 01:25:54 -07:00
• 0759fd36c0 Merge branch 'development' of github.com:MyBB-Services/PrestaShop into development Grégoire Bélorgey 2013-05-21 08:18:23 +02:00
• 532a727cc2 // add hack for blockcart cache and back button Rémi Gaillard 2013-05-20 17:30:04 +02:00
• 7d5830af94 // add hack for blockcart cache and back button Rémi Gaillard 2013-05-20 17:30:04 +02:00
• 2a3820f068 Added close span tag to avoid bug on IE8 (thanks Atch) Kevin Granger 2013-05-20 18:20:55 +03:00
• 3fd3ad2919 Added close span tag to avoid bug on IE8 (thanks Atch) Kevin Granger 2013-05-20 18:20:55 +03:00
• 3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() vAugagneur 2013-05-20 16:55:52 +02:00
• e01383c5a1 [-] BO : remove deprecated parameter when call Tools::displayDate() vAugagneur 2013-05-20 16:55:52 +02:00
• ec87deb016 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 vAugagneur 2013-05-20 16:39:08 +02:00
• 5244fdaa21 [-] BO : remove deprecated parameter when call Tools::link_rewrite() part 2 vAugagneur 2013-05-20 16:39:08 +02:00
• 7aef793e65 [-] BO : remove deprecated parameter when call Tools::link_rewrite() vAugagneur 2013-05-20 16:33:12 +02:00
• 90f0781377 [-] BO : remove deprecated parameter when call Tools::link_rewrite() vAugagneur 2013-05-20 16:33:12 +02:00
• e157a8f0d4 Merge pull request #438 from PrestaEdit/patch-36 Vincent Augagneur 2013-05-20 06:23:20 -07:00
• d106d3a136 Merge pull request #438 from PrestaEdit/patch-36 Vincent Augagneur 2013-05-20 06:23:20 -07:00
• 3bd489df15 Merge pull request #437 from PrestaEdit/patch-35 Vincent Augagneur 2013-05-20 06:22:59 -07:00
• 3368ff1d69 Merge pull request #437 from PrestaEdit/patch-35 Vincent Augagneur 2013-05-20 06:22:59 -07:00
• 62f350334c // Set param as null PrestaEdit 2013-05-20 14:56:12 +02:00
• c0b9736cf4 // Set param as null PrestaEdit 2013-05-20 14:56:12 +02:00
• c573819dc9 // Set params as null PrestaEdit 2013-05-20 14:49:45 +02:00
• 7864f38438 // Set params as null PrestaEdit 2013-05-20 14:49:45 +02:00
• bf2cb18c1f Merge pull request #439 from Prestaworks/patch-11 Vincent Augagneur 2013-05-20 02:34:46 -07:00
• 7da7fd94fd Merge pull request #439 from Prestaworks/patch-11 Vincent Augagneur 2013-05-20 02:34:46 -07:00
• 8e64dd9141 Merge pull request #440 from MrManchot/patch-8 Vincent Augagneur 2013-05-20 02:28:57 -07:00
• 3a9f82a7f0 Merge pull request #440 from MrManchot/patch-8 Vincent Augagneur 2013-05-20 02:28:57 -07:00
• 025550b4ce Merge pull request #443 from PrestaEdit/patch-37 Vincent Augagneur 2013-05-20 02:25:55 -07:00
• 12c43acd5b Merge pull request #443 from PrestaEdit/patch-37 Vincent Augagneur 2013-05-20 02:25:55 -07:00
• 2fe8b5cf23 // small fix again... Rémi Gaillard 2013-05-20 11:08:05 +02:00
• 7f92b45c33 // small fix again... Rémi Gaillard 2013-05-20 11:08:05 +02:00
• 26a3dc2f62 // small fix Rémi Gaillard 2013-05-20 10:58:49 +02:00
• 614556ec3d // small fix Rémi Gaillard 2013-05-20 10:58:49 +02:00
• 996b8e145f [-] MO: Don't make unnecessary request to ajax cart Rémi Gaillard 2013-05-20 10:50:34 +02:00
• 1edbebf8f5 [-] MO: Don't make unnecessary request to ajax cart Rémi Gaillard 2013-05-20 10:50:34 +02:00
• a14520f825 Merge pull request #442 from raulgundin/patch-1 Rémi Gaillard 2013-05-20 00:53:07 -07:00
• a508be0a07 Merge pull request #442 from raulgundin/patch-1 Rémi Gaillard 2013-05-20 00:53:07 -07:00
• e996eeeed1 [-] Translations: .. instead of . PrestaEdit 2013-05-19 00:14:39 +02:00
• fc1ecf0a70 [-] Translations: .. instead of . PrestaEdit 2013-05-19 00:14:39 +02:00
• e7393dc5d0 [-] CORE: Fix #PSCFV-9185 Wrong product price display on list by manufacturer raulgundin 2013-05-18 14:38:07 +03:00
• 5c0605d73f [-] CORE: Fix #PSCFV-9185 Wrong product price display on list by manufacturer raulgundin 2013-05-18 14:38:07 +03:00
• 110064a0c1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-17 18:09:32 +02:00
• eb74e0c2d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-17 18:09:32 +02:00
• e2cfa9f08e [-] BO : Fix #PSCFI-7186 incorrect return in Meta->deleteSelection() gRoussac 2013-05-17 17:56:42 +02:00
• 7123d47f91 [-] BO : Fix #PSCFI-7186 incorrect return in Meta->deleteSelection() gRoussac 2013-05-17 17:56:42 +02:00
• 8b95e9f2ca [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 Rémi Gaillard 2013-05-17 17:10:11 +02:00
• 626e556575 [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 Rémi Gaillard 2013-05-17 17:10:11 +02:00
• d691e1d403 [-] MO: Fix #PSCFV-8973 product images in the blockviewed module Rémi Gaillard 2013-05-17 16:35:21 +02:00
• d096a5845e [-] MO: Fix #PSCFV-8973 product images in the blockviewed module Rémi Gaillard 2013-05-17 16:35:21 +02:00
• f921fd2352 Add Wysiwyg Category Controller Cédric Mouleyre 2013-05-17 12:00:43 +03:00
• 334c5d35fd Add Wysiwyg Category Controller Cédric Mouleyre 2013-05-17 12:00:43 +03:00
• c63ca0cdf8 Update _shipping.tpl Daniel 2013-05-17 11:48:47 +08:00
• ce9f147d58 Update _shipping.tpl Daniel 2013-05-17 11:48:47 +08:00
• 4253754afd [-] Class: Tools / link_rewrite(displayParameterAsDeprecated) PrestaEdit 2013-05-17 00:52:39 +02:00
• 57bb00a6a8 [-] Class: Tools / link_rewrite(displayParameterAsDeprecated) PrestaEdit 2013-05-17 00:52:39 +02:00
• 2e9efe58cc [-] Class: Tools / displayDate (displayParameterAsDeprecated) PrestaEdit 2013-05-17 00:40:22 +02:00
• fe4223593d [-] Class: Tools / displayDate (displayParameterAsDeprecated) PrestaEdit 2013-05-17 00:40:22 +02:00
• eaa5605e91 [-] CORE : Fix bug #PSCFI-7168 cast and truncate POST values for statistics.php controller gRoussac 2013-05-16 18:30:58 +02:00
• 2bfad8017e [-] CORE : Fix bug #PSCFI-7168 cast and truncate POST values for statistics.php controller gRoussac 2013-05-16 18:30:58 +02:00
• e7f54d3694 [-] CORE : TRACKING_DIRECT_TRAFFIC not respected gRoussac 2013-05-16 11:24:44 +02:00
• 0765dde5c0 [-] CORE : TRACKING_DIRECT_TRAFFIC not respected gRoussac 2013-05-16 11:24:44 +02:00
• 2cd6724591 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-16 11:05:28 +02:00
• 11eaf792e9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-16 11:05:28 +02:00
• 0753dab214 [-] CORE : referer keywords truncated before insertion in connections table gRoussac 2013-05-16 11:05:19 +02:00
• 11575fb749 [-] CORE : referer keywords truncated before insertion in connections table gRoussac 2013-05-16 11:05:19 +02:00
• 21d45b61bd [-] BO : fixed gift deletion when there is no products anymore in the cart Damien Metzger 2013-05-16 11:02:46 +02:00
• 9a2ddd7608 [-] BO : fixed gift deletion when there is no products anymore in the cart Damien Metzger 2013-05-16 11:02:46 +02:00
• 112583edeb [-] FO : first_item class don t exist if shopping cart have only one item prestarocket 2013-05-16 10:37:02 +02:00
• da15136c67 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-15 17:12:55 +02:00
• 0a0f313de7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-15 17:12:55 +02:00
• e34ef4f7f4 // no controllerUri for front office please gRoussac 2013-05-15 17:11:32 +02:00
• 68cdfd0dae // no controllerUri for front office please gRoussac 2013-05-15 17:11:32 +02:00
• ee8da0499b // also set query_string and server_name Rémi Gaillard 2013-05-15 16:46:48 +02:00
• 963dfe8ca2 // also set query_string and server_name Rémi Gaillard 2013-05-15 16:46:48 +02:00
• a0423d6226 // small fix Rémi Gaillard 2013-05-15 16:26:02 +02:00
• da8c21d644 // small fix Rémi Gaillard 2013-05-15 16:26:02 +02:00
• a22138f3c7 // small fix for id_shop and php-cli Rémi Gaillard 2013-05-15 16:23:29 +02:00
• 932d949392 // small fix for id_shop and php-cli Rémi Gaillard 2013-05-15 16:23:29 +02:00
• 8d0e28291b [-] BO: Fix listing exports with image or other empty fields Rémi Gaillard 2013-05-15 15:49:42 +02:00
• 7ca9356f65 [-] BO: Fix listing exports with image or other empty fields Rémi Gaillard 2013-05-15 15:49:42 +02:00
• 45b1c864a5 [-] BO : catch prestashop exception and display smart error messages #PSCFV-9147 Damien Metzger 2013-05-15 15:39:58 +02:00
• e27ef3e7f2 [-] BO : catch prestashop exception and display smart error messages #PSCFV-9147 Damien Metzger 2013-05-15 15:39:58 +02:00
• 3e4ef99214 [-] BO : fixed issue with reduction in the category for groups #PSCFV-9101 Damien Metzger 2013-05-15 15:22:02 +02:00
• e1afce7f22 [-] BO : fixed issue with reduction in the category for groups #PSCFV-9101 Damien Metzger 2013-05-15 15:22:02 +02:00
• e105f8fff7 [-] INSTALLER : Fix bug #PSCFI-7075 too short column in PREFIX_webservice_account gRoussac 2013-05-15 15:18:13 +02:00
• 2e00a1662e [-] INSTALLER : Fix bug #PSCFI-7075 too short column in PREFIX_webservice_account gRoussac 2013-05-15 15:18:13 +02:00
• d9e93a6352 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-15 14:51:16 +02:00
• 57a13efa18 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-05-15 14:51:16 +02:00
• 2c10ba5359 [*] Core: you can now pass a query string with php-cli which will merged with for cronjobs and other things Rémi Gaillard 2013-05-15 14:46:40 +02:00
• a9684804d5 [*] Core: you can now pass a query string with php-cli which will merged with for cronjobs and other things Rémi Gaillard 2013-05-15 14:46:40 +02:00
• 792d477a9d [-] CORE : Fix bug #PSCFI-7072 redundant configuration get gRoussac 2013-05-15 14:44:33 +02:00