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

• c6f9d13800 [*] BO : moved sample csv file vAugagneur 2012-12-13 09:16:03 +01:00
• f78abb14b9 // New user assistance in the installer Damien Metzger 2012-12-12 20:34:13 +01:00
• d8c4db1d1b // New user assistance in the installer Damien Metzger 2012-12-12 20:34:13 +01:00
• e0aa292a69 [-] BO: Fix catalog price rules creation with mysql strict mod #PSCFV-5916 Rémi Gaillard 2012-12-12 19:38:40 +01:00
• 1c5f8b968c [-] BO: Fix catalog price rules creation with mysql strict mod #PSCFV-5916 Rémi Gaillard 2012-12-12 19:38:40 +01:00
• 91ba2bfa2e // fix js arg missing for translations in javascript Rémi Gaillard 2012-12-12 19:07:29 +01:00
• d4ba675273 // fix js arg missing for translations in javascript Rémi Gaillard 2012-12-12 19:07:29 +01:00
• 02f3c3c1cc removed unused files vAugagneur 2012-12-12 19:00:57 +01:00
• 04695dccbf removed unused files vAugagneur 2012-12-12 19:00:57 +01:00
• d31d54a65b Merge pull request #87 from ivancasasempere/patch-1 Vincent Augagneur 2012-12-12 09:59:48 -08:00
• 2b8aae9280 Merge pull request #87 from ivancasasempere/patch-1 Vincent Augagneur 2012-12-12 09:59:48 -08:00
• 35327e1792 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-12 18:43:15 +01:00
• 72f4c102e6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-12 18:43:15 +01:00
• 198a48491a //small fix vAugagneur 2012-12-12 18:43:11 +01:00
• 0b95f0c30d //small fix vAugagneur 2012-12-12 18:43:11 +01:00
• 35a0c7c94c [-] MO: Fix Wishlist controller with ssl #PSCFV-5943 Rémi Gaillard 2012-12-12 18:01:57 +01:00
• 80bbeac35c [-] MO: Fix Wishlist controller with ssl #PSCFV-5943 Rémi Gaillard 2012-12-12 18:01:57 +01:00
• a100b1d220 [-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag vAugagneur 2012-12-12 17:38:31 +01:00
• cd0eb0c6a4 [-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag vAugagneur 2012-12-12 17:38:31 +01:00
• b5037d4bfe Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-12 16:24:41 +01:00
• c3c0441316 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-12 16:24:41 +01:00
• 4471a1a140 //small fix #310dbaaf2492042953c5e65ffb7fa1c6afd0b0a8 vAugagneur 2012-12-12 16:24:35 +01:00
• 7e95ccb76c //small fix #310dbaaf2492042953c5e65ffb7fa1c6afd0b0a8 vAugagneur 2012-12-12 16:24:35 +01:00
• 87798d1193 // small fix Rémi Gaillard 2012-12-12 16:18:48 +01:00
• a48798e8f1 // small fix Rémi Gaillard 2012-12-12 16:18:48 +01:00
• f6b46f47c5 //added PS_MAIL_COLOR in upgrade vAugagneur 2012-12-12 16:01:32 +01:00
• b1b42dc8e6 //added PS_MAIL_COLOR in upgrade vAugagneur 2012-12-12 16:01:32 +01:00
• ebff913250 Merge pull request #69 from PrestaEdit/mails Vincent Augagneur 2012-12-12 06:59:04 -08:00
• 6445fea198 Merge pull request #69 from PrestaEdit/mails Vincent Augagneur 2012-12-12 06:59:04 -08:00
• 39f108d79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-12 14:37:40 +01:00
• 4cbf8d380f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-12 14:37:40 +01:00
• 42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option vAugagneur 2012-12-12 14:37:15 +01:00
• ed836e081c //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option vAugagneur 2012-12-12 14:37:15 +01:00
• ed65ab64de [-] BO: useSSL global does not exist anymore #PSCFV-6113 Rémi Gaillard 2012-12-12 14:33:42 +01:00
• 6180cb1fa9 // And another Damien Metzger 2012-12-12 14:33:54 +01:00
• 07c47f7001 [-] BO: useSSL global does not exist anymore #PSCFV-6113 Rémi Gaillard 2012-12-12 14:33:42 +01:00
• 16b726349f // And another Damien Metzger 2012-12-12 14:33:54 +01:00
• 6532868e1d // Fixed duplicated lines #PSCFV-6109 Damien Metzger 2012-12-12 14:31:46 +01:00
• 490213a550 // Fixed duplicated lines #PSCFV-6109 Damien Metzger 2012-12-12 14:31:46 +01:00
• 0f6b60a3af // Merged 4 lignes of code in the Configuration class Damien Metzger 2012-12-12 14:29:37 +01:00
• 51dff4de4e // Merged 4 lignes of code in the Configuration class Damien Metzger 2012-12-12 14:29:37 +01:00
• e060a32e60 Merge pull request #79 from PrestaEdit/PSCFV-3877 Vincent Augagneur 2012-12-12 03:34:09 -08:00
• 0cd93a517b Merge pull request #79 from PrestaEdit/PSCFV-3877 Vincent Augagneur 2012-12-12 03:34:09 -08:00
• 1780a5ea7b [*] FO : mobile template - states management Put "p" and "div" in the same selector Jonathan Danse 2012-12-12 12:30:10 +01:00
• 9d5611f9fe [*] FO : mobile template - states management Put "p" and "div" in the same selector Jonathan Danse 2012-12-12 12:30:10 +01:00
• 651743734e Merge pull request #74 from mcdado/patch-1 Vincent Augagneur 2012-12-12 03:21:19 -08:00
• 90c7578637 Merge pull request #74 from mcdado/patch-1 Vincent Augagneur 2012-12-12 03:21:19 -08:00
• 1547539c43 [*] Modules : blocktopmenu css improvement ivancasasempere 2012-12-12 12:05:27 +01:00
• 645498fc65 [*] Modules : blocktopmenu css improvement ivancasasempere 2012-12-12 12:05:27 +01:00
• 1d909b1248 [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops Rémi Gaillard 2012-12-12 11:46:19 +01:00
• d49b13579b [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops Rémi Gaillard 2012-12-12 11:46:19 +01:00
• bfff958b1f Merge pull request #75 from @sebastienhouzet vAugagneur 2012-12-12 11:24:56 +01:00
• 768fcf8f84 Merge pull request #75 from @sebastienhouzet vAugagneur 2012-12-12 11:24:56 +01:00
• 04ad50908e Merge pull request #78 from montes/redution-typo Vincent Augagneur 2012-12-12 00:53:00 -08:00
• 33fcc16467 Merge pull request #78 from montes/redution-typo Vincent Augagneur 2012-12-12 00:53:00 -08:00
• 98d9575c4c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2012-12-11 18:05:02 +01:00
• be71bed3d8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2012-12-11 18:05:02 +01:00
• 4061c67c5b [-] MO: Mailalert should send alert for new order independently of the stock management Rémi Gaillard 2012-12-11 18:04:33 +01:00
• a825982242 [-] MO: Mailalert should send alert for new order independently of the stock management Rémi Gaillard 2012-12-11 18:04:33 +01:00
• a2f7ef0136 [-] FO : fixed bug #PSCFV-6057 - In step 4 by pressing terms and conditions, do not load css in Internet Explorer 8 vAugagneur 2012-12-11 17:53:58 +01:00
• 58fe982f34 [-] FO : fixed bug #PSCFV-6057 - In step 4 by pressing terms and conditions, do not load css in Internet Explorer 8 vAugagneur 2012-12-11 17:53:58 +01:00
• b3b5f7a1e9 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination Rémi Gaillard 2012-12-11 17:45:06 +01:00
• 82a230aa70 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination Rémi Gaillard 2012-12-11 17:45:06 +01:00
• 05a6f856da [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 sLorenzini 2012-12-11 17:43:30 +01:00
• 0727da6aeb [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 sLorenzini 2012-12-11 17:43:30 +01:00
• bf1b491e94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2012-12-11 16:59:56 +01:00
• c9cb49d5a1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2012-12-11 16:59:56 +01:00
• ec05f5e384 [-] CORE : fixed bug #PSCFV-6084 vAugagneur 2012-12-11 16:59:35 +01:00
• fab1c02443 [-] CORE : fixed bug #PSCFV-6084 vAugagneur 2012-12-11 16:59:35 +01:00
• 8d2f5d6e42 [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 Rémi Gaillard 2012-12-11 16:59:26 +01:00
• 4c026fe0fc [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 Rémi Gaillard 2012-12-11 16:59:26 +01:00
• ef4b3576fc [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes Rémi Gaillard 2012-12-11 16:05:29 +01:00
• 5891143e5b [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes Rémi Gaillard 2012-12-11 16:05:29 +01:00
• 5698e05f63 [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO vAugagneur 2012-12-11 15:44:32 +01:00
• a4e48ccc7d [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO vAugagneur 2012-12-11 15:44:32 +01:00
• 575983a52e // Fixed stripos !== false in module search Damien Metzger 2012-12-11 15:36:51 +01:00
• 2c06839185 // Fixed stripos !== false in module search Damien Metzger 2012-12-11 15:36:51 +01:00
• e6ad7ec815 [-] FO : jquery mobile was not compatible with js minifier, I updated both Damien Metzger 2012-12-11 14:01:40 +01:00
• 8e8c1bee81 [-] FO : jquery mobile was not compatible with js minifier, I updated both Damien Metzger 2012-12-11 14:01:40 +01:00
• a0041364a1 // replace bad attribute name Rémi Gaillard 2012-12-11 12:11:47 +01:00
• a5e3bc711b // replace bad attribute name Rémi Gaillard 2012-12-11 12:11:47 +01:00
• e8718ec42f [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 Rémi Gaillard 2012-12-11 12:01:04 +01:00
• 7cd629b15b [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 Rémi Gaillard 2012-12-11 12:01:04 +01:00
• a8096c2800 [-] BO: Fix various bugs in categories ntree generation Rémi Gaillard 2012-12-11 11:19:21 +01:00
• 7eb764e596 // config.xml in english Damien Metzger 2012-12-11 11:19:40 +01:00
• b2f01058a8 [-] BO: Fix various bugs in categories ntree generation Rémi Gaillard 2012-12-11 11:19:21 +01:00
• ecac947c2e // config.xml in english Damien Metzger 2012-12-11 11:19:40 +01:00
• b7d4321e5a [-] MO : fixed backslashes in homeslider #PSCFV-5664 Damien Metzger 2012-12-11 11:16:56 +01:00
• 27eaed42bd [-] MO : fixed backslashes in homeslider #PSCFV-5664 Damien Metzger 2012-12-11 11:16:56 +01:00
• 4c31212fa5 // Only js strings need to add slashes Rémi Gaillard 2012-12-10 16:05:38 +01:00
• 68236c6a6d // Only js strings need to add slashes Rémi Gaillard 2012-12-10 16:05:38 +01:00
• 131f99eb69 [-] Core: send email when payment is remotly accepted #PSCFV-6064 Rémi Gaillard 2012-12-10 15:57:59 +01:00
• 50761112a1 [-] Core: send email when payment is remotly accepted #PSCFV-6064 Rémi Gaillard 2012-12-10 15:57:59 +01:00
• ae2c41286f [-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005 sLorenzini 2012-12-10 15:17:23 +01:00
• e5143b1ee4 [-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005 sLorenzini 2012-12-10 15:17:23 +01:00
• a68e5c1cfb [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function Rémi Gaillard 2012-12-10 15:06:03 +01:00
• 27ae42b086 [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function Rémi Gaillard 2012-12-10 15:06:03 +01:00
• 1db4c7875e //added more check on module upload part 2 vAugagneur 2012-12-10 14:45:14 +01:00
• 83318055ce //added more check on module upload part 2 vAugagneur 2012-12-10 14:45:14 +01:00
• 401b3dd41d //added more check on module upload vAugagneur 2012-12-10 14:44:11 +01:00