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

• 337437be74 //added more check on module upload vAugagneur 2012-12-10 14:44:11 +01:00
• 8b817a4a8c [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 Rémi Gaillard 2012-12-10 13:52:09 +01:00
• 29b4adb032 [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 Rémi Gaillard 2012-12-10 13:52:09 +01:00
• fb93b5376b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development sLorenzini 2012-12-10 11:43:51 +01:00
• 05d5ab2df3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development sLorenzini 2012-12-10 11:43:51 +01:00
• 1c7f88e048 [-] FO: fix Image attributes not set - #PSCFV-5957 sLorenzini 2012-12-10 11:42:13 +01:00
• dbe2d7998a [-] FO: fix Image attributes not set - #PSCFV-5957 sLorenzini 2012-12-10 11:42:13 +01:00
• c246082e72 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2012-12-10 11:39:11 +01:00
• 8b97a15405 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development François Gaillard 2012-12-10 11:39:11 +01:00
• acfb43c284 [*] FO : Bug fix : h4 -> title_block Francois Gaillard 2012-12-10 11:38:48 +01:00
• 6173a98b58 [*] FO : Bug fix : h4 -> title_block François Gaillard 2012-12-10 11:38:48 +01:00
• 25229b51ae [-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules vAugagneur 2012-12-10 11:16:33 +01:00
• 1b71add855 [-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules vAugagneur 2012-12-10 11:16:33 +01:00
• 221667a80d [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied vAugagneur 2012-12-10 10:51:46 +01:00
• eb451604af [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied vAugagneur 2012-12-10 10:51:46 +01:00
• 53f1e8fcbb // Display exception in admin regardless mode dev Rémi Gaillard 2012-12-10 10:47:41 +01:00
• 60e99d6b66 // Display exception in admin regardless mode dev Rémi Gaillard 2012-12-10 10:47:41 +01:00
• 2f3799abb8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2012-12-10 10:18:53 +01:00
• 6483525900 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development François Gaillard 2012-12-10 10:18:53 +01:00
• 9ab0485946 [*] FO : Cart vouchers style edited Francois Gaillard 2012-12-10 10:18:41 +01:00
• 312df517fb [*] FO : Cart vouchers style edited François Gaillard 2012-12-10 10:18:41 +01:00
• ae7569bde3 [-] BO : added import button on listing vAugagneur 2012-12-10 10:14:03 +01:00
• 20187807e1 [-] BO : added import button on listing vAugagneur 2012-12-10 10:14:03 +01:00
• 7a91409023 [-] FO : mobile template - states management PrestaEdit 2012-12-08 23:46:14 +01:00
• 5e563f2a48 [-] FO : mobile template - states management PrestaEdit 2012-12-08 23:46:14 +01:00
• aa4b474522 Fixed variable typo (redution instead of reduction in some places) montes 2012-12-07 23:24:41 +01:00
• 48d6b63d8e Fixed variable typo (redution instead of reduction in some places) montes 2012-12-07 23:24:41 +01:00
• 7e6d94053b // small fix Rémi Gaillard 2012-12-07 18:01:32 +01:00
• 90d4c27d17 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-07 18:01:46 +01:00
• db9ff416c0 // small fix Rémi Gaillard 2012-12-07 18:01:32 +01:00
• 1d70dad851 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-07 18:01:46 +01:00
• af3eb2cc38 //small js fix vAugagneur 2012-12-07 18:01:32 +01:00
• e65478a1b4 //small js fix vAugagneur 2012-12-07 18:01:32 +01:00
• 3280bfbeed [-] WS: Fix #PSCFV-5915 temporary images deletion Rémi Gaillard 2012-12-07 17:58:46 +01:00
• d274f6d84a [-] WS: Fix #PSCFV-5915 temporary images deletion Rémi Gaillard 2012-12-07 17:58:46 +01:00
• 3497af985a [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution Rémi Gaillard 2012-12-07 17:23:06 +01:00
• cd7cc208e8 [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution Rémi Gaillard 2012-12-07 17:23:06 +01:00
• cc7c40d4e9 [-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline vAugagneur 2012-12-07 17:22:06 +01:00
• 6dd0a04ed0 [-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline vAugagneur 2012-12-07 17:22:06 +01:00
• 7bc49194b7 [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order vAugagneur 2012-12-07 16:23:52 +01:00
• 006bb7b19a [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order vAugagneur 2012-12-07 16:23:52 +01:00
• 1c1fd827da // small fix for urls Rémi Gaillard 2012-12-07 11:46:50 +01:00
• 5bcc1417dd // small fix for urls Rémi Gaillard 2012-12-07 11:46:50 +01:00
• f40369ef6a [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules vAugagneur 2012-12-06 17:05:19 +01:00
• 4dbb321836 [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules vAugagneur 2012-12-06 17:05:19 +01:00
• adc1197320 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-06 16:53:37 +01:00
• accb337006 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-06 16:53:37 +01:00
• 048f3cce14 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled vAugagneur 2012-12-06 16:53:29 +01:00
• 52f4fca6e1 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled vAugagneur 2012-12-06 16:53:29 +01:00
• 56819e3573 [-] FO: Fix some tax_display_method value for not default customer group Rémi Gaillard 2012-12-06 16:38:31 +01:00
• 224646ef1f [-] FO: Fix some tax_display_method value for not default customer group Rémi Gaillard 2012-12-06 16:38:31 +01:00
• 52ea6cddf8 move header tag out of carrier block David Gasperoni 2012-12-06 15:06:08 +01:00
• 310dbaaf24 move header tag out of carrier block David Gasperoni 2012-12-06 15:06:08 +01:00
• 897462b3ee order-carrier more compatible with order-opc David Gasperoni 2012-12-06 14:56:06 +01:00
• 3b9b19ec48 order-carrier more compatible with order-opc David Gasperoni 2012-12-06 14:56:06 +01:00
• c89082855a order-carrier more compatible with order-opc David Gasperoni 2012-12-06 14:52:14 +01:00
• 497968fd7a order-carrier more compatible with order-opc David Gasperoni 2012-12-06 14:52:14 +01:00
• 523ec5c27c order carrier more compatible with opc David Gasperoni 2012-12-06 14:46:40 +01:00
• 094e38206c order carrier more compatible with opc David Gasperoni 2012-12-06 14:46:40 +01:00
• 276696dd6c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-06 12:16:47 +01:00
• 78bfcfbaf0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-06 12:16:47 +01:00
• 61c23c7e75 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called vAugagneur 2012-12-06 12:16:37 +01:00
• 640ec6d006 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called vAugagneur 2012-12-06 12:16:37 +01:00
• b474ca3d85 [-] FO: Fix cart summary ajax refreshment Rémi Gaillard 2012-12-06 11:58:29 +01:00
• 0e0f6ee641 [-] FO: Fix cart summary ajax refreshment Rémi Gaillard 2012-12-06 11:58:29 +01:00
• 4fa7eb6a3d //revert all config.xml vAugagneur 2012-12-06 11:41:52 +01:00
• 76b435b639 //revert all config.xml vAugagneur 2012-12-06 11:41:52 +01:00
• e809f6bfdb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-06 11:32:24 +01:00
• 12f47a1b9b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-06 11:32:24 +01:00
• 6f37326675 [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing vAugagneur 2012-12-06 11:32:19 +01:00
• d71970d5ff [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing vAugagneur 2012-12-06 11:32:19 +01:00
• d9ba307893 Merge pull request #72 from Milow/development Rémi Gaillard 2012-12-06 01:48:46 -08:00
• 2166937cf5 Merge pull request #72 from Milow/development Rémi Gaillard 2012-12-06 01:48:46 -08:00
• 2a4b7cae75 [-] FO: improvement on h4/h5 edits (id become class) sLorenzini 2012-12-06 10:06:56 +01:00
• 2191eec919 [-] FO: improvement on h4/h5 edits (id become class) sLorenzini 2012-12-06 10:06:56 +01:00
• cf7aebd029 Fix typo Milow 2012-12-05 21:27:37 -06:00
• 82c7f03119 Fix typo Milow 2012-12-05 21:27:37 -06:00
• c87fb469fd Fix mail error Milow 2012-12-05 21:26:07 -06:00
• 55e55689a6 Fix mail error Milow 2012-12-05 21:26:07 -06:00
• 7897d40e22 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Sarah Lorenzini 2012-12-05 11:03:16 +01:00
• 8ddafa2568 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Sarah Lorenzini 2012-12-05 11:03:16 +01:00
• 5c63deb469 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development sLorenzini 2012-12-05 10:59:47 +01:00
• 4844914b0a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development sLorenzini 2012-12-05 10:59:47 +01:00
• 59e793fa99 //[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921 sLorenzini 2012-12-05 10:42:26 +01:00
• babded4d29 //[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921 sLorenzini 2012-12-05 10:42:26 +01:00
• 2c3ad2e7f9 //small variable name fix part 2 vAugagneur 2012-12-04 18:47:00 +01:00
• 6e9ea91ae7 //small variable name fix part 2 vAugagneur 2012-12-04 18:47:00 +01:00
• 89e9f90cf1 //small variable name fix vAugagneur 2012-12-04 18:35:10 +01:00
• 6740906dcb //small variable name fix vAugagneur 2012-12-04 18:35:10 +01:00
• 712f0c3d6d [-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module vAugagneur 2012-12-04 18:29:10 +01:00
• 2c095c11a1 [-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module vAugagneur 2012-12-04 18:29:10 +01:00
• 2b10fcd712 // change h4, h5 Sarah Lorenzini 2012-12-04 17:15:49 +01:00
• 31efb947ab // change h4, h5 Sarah Lorenzini 2012-12-04 17:15:49 +01:00
• da5c5fb4a0 [-] Core: Locales should be setted anywhere #PSCFV-5953 Rémi Gaillard 2012-12-04 15:40:17 +01:00
• 4e9c534f1b [-] Core: Locales should be setted anywhere #PSCFV-5953 Rémi Gaillard 2012-12-04 15:40:17 +01:00
• 2d93064fb9 [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled Rémi Gaillard 2012-12-04 15:32:06 +01:00
• a1e91bcfa9 [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled Rémi Gaillard 2012-12-04 15:32:06 +01:00
• 9322f3338e // fixed FO bugs sLorenzini 2012-12-04 15:27:43 +01:00
• 52803b40b9 // fixed FO bugs sLorenzini 2012-12-04 15:27:43 +01:00
• 0071850981 [-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate Rémi Gaillard 2012-12-04 15:09:41 +01:00