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

• d2440df8ca [*] FO : added smarty cache on productscategory Damien Metzger 2013-07-03 15:49:32 +02:00
• f78f3dc3a8 [*] FO : added smarty cache on crossselling module Damien Metzger 2013-07-03 15:30:17 +02:00
• 36e3956267 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-03 15:06:05 +02:00
• afda9cdd94 // Small fix Damien Metzger 2013-07-03 15:04:51 +02:00
• ae0299a6eb [-] FO :Fix bug #PSCFV-9650 could not see delete href in block cart gRoussac 2013-07-03 15:04:11 +02:00
• 16e90488c4 [-] MO : Bug fix - PS Cleaner, check if module favoriteproducts is installed. SébastienandFrancois Gaillard 2013-07-03 11:58:47 +02:00
• 1208e45958 [-] BO : products comments impossible if quantity > 0 indesign47 2013-07-03 14:09:44 +02:00
• 8d3f330b2d [-] IN : Fixed bug with database creation Francois Gaillard 2013-07-03 12:19:34 +02:00
• 5789e6eb51 [*] IN : only display the button to create the database if you can actually create the database Damien Metzger 2013-07-03 11:28:55 +02:00
• fe660c097c [*] BO : Correct the getList() request for quantity and id_product Axome 2013-07-03 11:18:04 +02:00
• bfa2f33c65 [*] IN : the installer can now attempt to create the database for you Damien Metzger 2013-07-03 11:04:34 +02:00
• 0ad4b44866 // Refactor helper list + fixs Kevin Granger 2013-07-02 18:55:43 +02:00
• 92959311d9 [*] Core : Smarty updated from 3.1.13 to 3.1.14 (cache issues fixed) Damien Metzger 2013-07-02 18:45:07 +02:00
• c60c3da6a1 [*] WS : improved web service performances Damien Metzger 2013-07-02 17:46:00 +02:00
• 86bdcd99e9 [-] FO: OrderHistory - Unclosed tag PrestaEdit 2013-07-02 17:08:49 +02:00
• 6b71ec8b09 [-] BO: product supplier price should not be converted on product page #PSCFV-9420 Rémi Gaillard 2013-07-02 15:45:12 +02:00
• 854c16997c [*] FO : improved entity links retrieval (no need to instanciate an object when there is no need... to instanciate un object) Damien Metzger 2013-07-02 15:07:48 +02:00
• 84c88dab65 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-02 14:55:28 +02:00
• b8bfdcd3f5 // .gitattributes files added Francois Gaillard 2013-07-02 14:53:58 +02:00
• 75942074d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-02 14:53:18 +02:00
• 9dfe65cb17 [-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency gRoussac 2013-07-02 14:51:25 +02:00
• 25dc4e25ac // Code cleaning Damien Metzger 2013-07-02 11:48:48 +02:00
• 9eeaf524c5 //initial commit for carrier wizard Vincent Augagneur 2013-07-02 11:27:00 +02:00
• f204f80c99 // Improved profiling tool Damien Metzger 2013-07-02 11:08:24 +02:00
• d05968823e // Try to fix warning Damien Metzger 2013-07-02 10:46:29 +02:00
• cab425e819 //remove useless css Vincent Augagneur 2013-07-02 08:41:51 +02:00
• 0ff23eee9f //miss to delete some files Vincent Augagneur 2013-07-02 08:02:05 +02:00
• 312dabbc60 //parse error gRoussac 2013-07-02 00:30:50 +02:00
• 6e3a2449e8 [-] INSTALLER : Fix SQL warnings when upgrading gRoussac 2013-07-01 23:39:00 +02:00
• f17b865214 (-] INSTALLER Remove errors during upgrade gRoussac 2013-07-01 19:23:42 +02:00
• 508cc0bd1a [-) CORE : Remove undefined constant in class declaration gRoussac 2013-07-01 19:17:54 +02:00
• 41219ad258 [-] INSTALLLER : Remove seesion name based on base_uri gRoussac 2013-07-01 19:01:49 +02:00
• 1da44dbb7a [-] Mobile : Bug fix - Order address template fixed François Gaillard 2013-07-01 16:52:16 +02:00
• 0c2aa996a2 //oups 😋 Vincent Augagneur 2013-07-01 16:48:25 +02:00
• 24db6b13c5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-07-01 16:40:39 +02:00
• a519f4a7cb //small fix Vincent Augagneur 2013-07-01 16:40:08 +02:00
• c5fc26ed0b // same for unregister hook Rémi Gaillard 2013-07-01 16:30:53 +02:00
• 09359d011f [-] MO: exec hook on hook registration #PSCFV-8977 Rémi Gaillard 2013-07-01 16:12:33 +02:00
• 0e0d8c58d0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-01 15:42:10 +02:00
• 725c2221df [-] INSTALLER : fix bug when updating add_new_tab not defined gRoussac 2013-07-01 15:41:15 +02:00
• d656297884 // Removed call to a deprecated file Damien Metzger 2013-07-01 14:00:01 +02:00
• 006e8718f2 // Improved label of IETF language tag Damien Metzger 2013-07-01 12:35:32 +02:00
• 56aab3c676 // Fixed references to a "conversion rate" that was in fact the "exchange rate" Damien Metzger 2013-07-01 12:14:36 +02:00
• f824b537cf [-] BO : Fix bug #PSCFV-8619 update order weight when modifying products gRoussac 2013-07-01 11:32:09 +02:00
• c90e574cb8 // Remove additionnal files from gitignore gRoussac 2013-07-01 11:28:00 +02:00
• 68cb702350 [-] Mobile : Bug fix : Authentication & phone number Staging 2013-07-01 11:08:14 +02:00
• 1657db9743 [-] MO : fixed bug #PSCFV-5724 - 1.5.2.0 cms block error when adding more than one column to the categories block in the footer Vincent Augagneur 2013-07-01 11:02:32 +02:00
• 0d7af59657 Update .gitignore Gregory Roussac 2013-07-01 10:58:54 +02:00
• 7c2323f1cc Update .gitignore Gregory Roussac 2013-07-01 10:56:31 +02:00
• 38c4ea2775 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-07-01 10:11:31 +02:00
• d6dcf7058f [-] BO : fixed bug #PSCFV-9622 Vincent Augagneur 2013-07-01 10:11:13 +02:00
• 1eb992f542 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-06-30 19:46:31 +02:00
• 127b046c0e //remove warning gRoussac 2013-06-30 19:46:04 +02:00
• 85da11181d //remove warning gRoussac 2013-06-30 19:42:07 +02:00
• 679ee351df [-] BO: remove old icon into New Version block PrestaEdit 2013-06-29 16:28:03 +02:00
• d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch Kevin Granger 2013-06-28 19:35:32 +02:00
• 3d85e81c3d // Oops, removing a block is a sure way to optimize... Damien Metzger 2013-06-28 18:51:49 +02:00
• 901d695e32 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Fabio Chelly 2013-06-28 18:35:58 +02:00
• d574f92411 [*] FO : added smarty cache to blockspecials Damien Metzger 2013-06-28 18:26:42 +02:00
• 668181d8ec Newsletter field is always shown in create account form even if blocknewsletter module is disabled Fabio Chelly 2013-06-28 18:11:44 +02:00
• ae2491c402 Prevent email to be stored twice (1 in customer newsletter and 1 in module newsletter) by removing email in newsletter table when creating a new account #PNM-1419 Fabio Chelly 2013-06-28 18:10:13 +02:00
• 349a10e2a9 // fix warnings gRoussac 2013-06-28 17:58:04 +02:00
• 09bbff8737 [*] FO : added smarty cache on blockbestsellers Damien Metzger 2013-06-28 17:42:43 +02:00
• 583346bbb7 [*] FO : added smarty cache on homefeatured module Damien Metzger 2013-06-28 17:19:06 +02:00
• a617bec39b Update shopping-cart.tpl ldecoker 2013-06-28 16:46:12 +02:00
• a8d96ed0c0 // Removed useless feature Damien Metzger 2013-06-28 16:38:08 +02:00
• a387ff5e2f [-] FO : added smarty cache to blockcms Damien Metzger 2013-06-28 16:20:04 +02:00
• 8acf308639 [*] FO : added smarty cache on blocknewproducts Damien Metzger 2013-06-28 15:17:53 +02:00
• 42f8a0a67a [*] BO : improved unicode characters replacement in URLs Damien Metzger 2013-06-28 12:19:02 +02:00
• 97370946d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Vincent Augagneur 2013-06-28 11:06:13 +02:00
• dfc7456980 //replace some escape:'html' by addslashes in .tpl with javascript Vincent Augagneur 2013-06-28 11:06:08 +02:00
• cf9c73a854 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-06-28 10:19:03 +02:00
• ec3095ac32 [-] BO: Fix manufacturer addresses duplication #PSCFV-9601 Rémi Gaillard 2013-06-28 10:18:49 +02:00
• 32d3dd3e0f [-] MO : fixed bug #PSCFV-8654 - 1.5.4.0 My Favorites doesn't add product Vincent Augagneur 2013-06-28 10:13:09 +02:00
• c025024b40 // fix php warning if no image is associated to the producr Rémi Gaillard 2013-06-27 18:14:07 +02:00
• ce7fe6c128 // Removed @ in front of a function (We need the errors!) #PSCFV-9078 Damien Metzger 2013-06-27 18:11:57 +02:00
• 8f01b35f46 [-] BO : fixed translation and languages issues Damien Metzger 2013-06-27 17:51:25 +02:00
• 75cddbae99 // Protected smarty variable in JS Damien Metzger 2013-06-27 16:41:38 +02:00
• 374de1b6c8 Merge pull request #515 from axometeam/patch-3 Vincent Augagneur 2013-06-27 06:52:11 -07:00
• 0de8c2dbc6 Update OrderDetailController.php ChristopheBoucaut 2013-06-27 15:49:40 +02:00
• 9bafc25878 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-06-27 15:41:57 +02:00
• 17579de481 [-] FO: Fix #PSCFV-9325 all was included on 301 for root deprecated controllers Rémi Gaillard 2013-06-27 15:41:37 +02:00
• 6368409ec6 [-] BO : fixed addslashes on tpl translations (compatibility between "slashes" and "js" parameters) #PSCFV-9427 Damien Metzger 2013-06-27 15:30:01 +02:00
• 1f5c1927c6 Merge pull request #521 from misthero/patch-1 Vincent Augagneur 2013-06-27 06:01:40 -07:00
• a7885fef1c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-06-27 10:57:25 +02:00
• 13b7bc959e [*] BO : Fix #PSCFV-8504 carrier on invoice and delivery slip gRoussac 2013-06-27 10:56:50 +02:00
• 453bb826ef [-] BO : fixed bug #PSCFV-9586 - Unable to sort CMS page in back office Vincent Augagneur 2013-06-27 10:19:22 +02:00
• 7f1b44f451 [-] INSTALLER : Remove warnings gRoussac 2013-06-26 18:27:02 +02:00
• 3524ccc99b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-06-26 18:13:38 +02:00
• e33e5229b4 [-] Installer: Fix some sql queries Rémi Gaillard 2013-06-26 18:13:09 +02:00
• 2b94a338b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-06-26 18:12:09 +02:00
• 9e9a1761f5 [-] INTSALLER : Fix bug #PSCFV-8776 Mysql has gone away during upgrade gRoussac 2013-06-26 18:08:05 +02:00
• 56e75d0e9a [-] CORE : fixed bug #PSCFV-8745 Contact form e-mail template with incomplete information Vincent Augagneur 2013-06-26 18:01:26 +02:00
• b8df8e6fb1 [-] Classes : Db : Fixed $link Francois Gaillard 2013-06-26 17:39:53 +02:00
• 8c5c7e1bb4 [-] MO : fixed bug #PSCFV-9040 - Block CMS Multishop bug Vincent Augagneur 2013-06-26 17:31:04 +02:00
• 4c28d49487 [-] FO : fixed remove button for free product in the cart block #PSCFV-8465 Damien Metzger 2013-06-26 16:51:45 +02:00
• 57dd992c28 [-] FO : fixed entities issue in javascript alerts #PSCFV-9001 Damien Metzger 2013-06-26 16:22:57 +02:00
• 7427efdb6f // Added addlashes for some js messages Damien Metzger 2013-06-26 15:52:40 +02:00
• 19ee2c953f [*] IN : removed the possibility to choose his own storage engine, automatically select the best one Damien Metzger 2013-06-26 14:26:22 +02:00
• 9257dc80c2 [-] BO: Fix #PSCFV-9455 stock was resetted if adv stock management is enable and product preference is submited on shop context Rémi Gaillard 2013-06-26 14:17:45 +02:00