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

• 6ac3f1133a Merge pull request #591 from djfm/locpacks Gregory Roussac 2013-07-24 02:08:42 -07:00
• 2af3afcc13 [*] LO: Improved Argentina Localization Pack djfm 2013-07-24 08:06:52 +00:00
• 26247a18c3 Merge pull request #564 from sylwit/patch-1 Gregory Roussac 2013-07-23 10:22:54 -07:00
• 1c71dc54dc Merge pull request #556 from piotrmocko/patch-2 Gregory Roussac 2013-07-23 10:21:20 -07:00
• c025b8cb2b Merge pull request #568 from urecheatu007/development Gregory Roussac 2013-07-23 10:15:43 -07:00
• 166a133080 Merge pull request #577 from PhpMadman/patch-2 Gregory Roussac 2013-07-23 10:14:24 -07:00
• f8bff15894 Merge pull request #581 from Captain-FLAM/patch-1 Gregory Roussac 2013-07-23 10:12:50 -07:00
• 9b9e5a122a Merge pull request #586 from Captain-FLAM/patch-7 Gregory Roussac 2013-07-23 09:52:15 -07:00
• 2e3f13db95 [-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes Francois Gaillard 2013-07-23 18:47:35 +02:00
• 71271ded7f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jérôme Nadaud 2013-07-23 18:38:33 +02:00
• d241013692 [-] BO : FixBug #PSCFV-9894 undefined quantity_all_version variable in product.tpl Jérôme Nadaud 2013-07-23 18:36:51 +02:00
• 4aab4f88cd [-] BO : Fix SQL query when $join_category == false, pull request https://github.com/Captain-FLAM/PrestaShop/commit/d5f75c63b6e21dd87c77a027bf8dd293afb1a94f thanks @Captain-FLAM gRoussac 2013-07-23 18:25:32 +02:00
• abf6f0d626 Merge pull request #587 from ChristopheBoucaut/patch-2 Gregory Roussac 2013-07-23 09:18:16 -07:00
• a5e7f7fdac Merge pull request #588 from joseantgv/patch-1 Gregory Roussac 2013-07-23 09:16:39 -07:00
• 5b804d3628 // update order tab sLorenzini 2013-07-23 17:54:47 +02:00
• 2e6e5a2604 // Removed useless check in the installer Damien Metzger 2013-07-23 15:29:09 +02:00
• c829ac5b7d // Fixed fix Damien Metzger 2013-07-23 14:19:13 +02:00
• 87a4b75df4 [*] FO : updated Fancybox plug-in Damien Metzger 2013-07-23 12:53:05 +02:00
• 6ed713e847 [-] Fix #PSCFV-9038 carrier warehouse association after carrier edition Rémi Gaillard 2013-07-23 11:57:44 +02:00
• dbe26e0a1d [-] BO : Could not find cover when image table corrupted gRoussac 2013-07-23 11:47:16 +02:00
• 0ddf5d1025 // Fixed getMainShopDomain Damien Metzger 2013-07-23 11:32:54 +02:00
• a805941c1f // typo in EN string gRoussac 2013-07-23 10:34:05 +02:00
• 3b213a505c Merge pull request #583 from djfm/development Gregory Roussac 2013-07-23 00:59:31 -07:00
• 63b2f63058 Update AdminCustomerThreadsController.php joseantgv 2013-07-23 09:58:53 +02:00
• 209615d4f4 // Missing } Damien Metzger 2013-07-22 18:15:38 +02:00
• 07e3354d0e // Code cleaning Damien Metzger 2013-07-22 18:15:37 +02:00
• 9169995adc // Small fixes and code cleaning Damien Metzger 2013-07-22 17:35:59 +02:00
• 91c5d184b6 // Small backend optimization Damien Metzger 2013-07-22 17:17:46 +02:00
• 4b6642d76c // Small optimization Damien Metzger 2013-07-22 14:09:07 +02:00
• 3503670478 Update Search.php ChristopheBoucaut 2013-07-23 09:36:08 +02:00
• 928181bd1f Update Hook.php Captain FLAM 2013-07-22 21:35:20 +01:00
• 2e860d6750 Update product.js Captain FLAM 2013-07-22 18:58:59 +01:00
• 939f7d7770 //most of the translation of the NL installer is done djfm 2013-07-22 17:09:26 +00:00
• 3ecf929ff0 [-] BO : FixBug #PSCFV-9881 Remove updateCarriersList on zip code blur Jérôme Nadaud 2013-07-22 18:05:37 +02:00
• f194aec8c5 // update module and orders tab sLorenzini 2013-07-22 17:56:24 +02:00
• 0f7d59ad26 [-] BO : FixBug #PSCFV-9878 Wrong login tab order Jérôme Nadaud 2013-07-22 17:07:57 +02:00
• 9d16eb1d1b // BO fix + work on helpers + compass/codekit config Kevin Granger 2013-07-22 16:43:16 +02:00
• b88ddf4483 [-] Classes : SwiftMailer - Fix deprecated preg_replace (PHP 5. 5.0) Jérôme Nadaud 2013-07-22 15:39:50 +02:00
• b87e934a66 [-] BO : FixBug #PSCFV-8060 Error getting last quantity and price in stock mouvement Jérôme Nadaud 2013-07-22 14:58:55 +02:00
• 794475a9cc [-] BO : FixBug #PSCFV-8237 Javascript Error setting default supplier Jérôme Nadaud 2013-07-22 14:33:16 +02:00
• d79365fe4d // small fix Rémi Gaillard 2013-07-22 11:54:35 +02:00
• 32c02bba5f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-07-22 11:39:44 +02:00
• b8d272a459 // fix entities Rémi Gaillard 2013-07-22 11:39:15 +02:00
• 0e0200e71c // Rémi Gaillard 2013-07-22 11:38:30 +02:00
• a55ec5c242 // fix entities Rémi Gaillard 2013-07-22 11:37:34 +02:00
• f76fe635ff // Added queries table to the profiling mode, you can easily copy/paste it into excel or anything Damien Metzger 2013-07-22 11:37:09 +02:00
• 3c59c5e779 //replaced all js='1' with js=1 so that the translation regexes don't fail djfm 2013-07-22 09:34:18 +00:00
• ca9f2c9459 [-] BO : FixBug #PSCFV-9138 Error duplicate product group reduction Jérôme Nadaud 2013-07-22 11:25:13 +02:00
• 287cf0c955 Update 1.5.5.0.sql Captain FLAM 2013-07-22 09:55:06 +01:00
• 3556e75ce3 // Moved useless code into the block where it is useful Damien Metzger 2013-07-22 10:49:41 +02:00
• 838a4e8bc9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development djfm 2013-07-22 08:25:26 +00:00
• e317c9d636 // Rémi Gaillard 2013-07-22 10:25:02 +02:00
• e2aa783688 // missing file Rémi Gaillard 2013-07-22 10:23:23 +02:00
• 3483706951 [-] FO : Prevent unsassigned category id, thans @PrestaCaptainFLAM gRoussac 2013-07-20 19:07:10 +02:00
• 1581a371c5 [-] BO : FixBug #PSCFV-9251 Meta Tag delete previous Jérôme Nadaud 2013-07-19 18:41:46 +02:00
• 288c0d3ca8 // Css cleaning Kevin Granger 2013-07-19 18:41:15 +02:00
• aa276aeee6 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-07-19 17:51:00 +02:00
• 5825dda836 [-] MO mailalerts : infinite coverage (-1) is taken into account when sending coverage e-mails #PNM-1563 #PNM-1597 Fabio Chelly 2013-07-19 17:36:51 +02:00
• 2f6a53f971 [+] TR: Created file structure for Dutch installer djfm 2013-07-19 15:34:10 +00:00
• b1f380c120 // Fixed statsforecast category distribution Damien Metzger 2013-07-19 16:59:39 +02:00
• 19fb1da4f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jérôme Nadaud 2013-07-19 16:30:21 +02:00
• abf874d576 [-] BO : FixBug #PSCFV-9049 Bad actionOrderSlipAdd hook description Jérôme Nadaud 2013-07-19 16:30:04 +02:00
• 84d9caca81 // Blind fix Damien Metzger 2013-07-19 16:29:02 +02:00
• 5646e682bc [-] BO : FIxBug Correct image language in product Jérôme Nadaud 2013-07-19 15:21:06 +02:00
• 3389cf8acb [-] FO : fixed pagination for p = 0 #PSCFV-9746 Damien Metzger 2013-07-19 14:08:24 +02:00
• 8d034a7ebf // up Damien Metzger 2013-07-19 13:33:41 +02:00
• 95122e8849 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-07-19 12:04:39 +02:00
• 8c47ca3edf [-] BO : fixed sort by currency exchange rate #PSCFV-9840 Damien Metzger 2013-07-19 11:40:52 +02:00
• 989dafce21 [*] FO : a few more SQL improvements Damien Metzger 2013-07-19 11:29:18 +02:00
• 7570c9eb87 [-] MO loyalty : minimum amount is now taken into account when creating discount vouchers #PNM-1561 Fabio Chelly 2013-07-19 11:15:14 +02:00
• bd4ece095b [*] FO : lots of performance improvements (removed or merged useless SQL queries) Damien Metzger 2013-07-19 10:58:51 +02:00
• eb6b233e31 [-] BO : If no nb, get default 8, not 10. PhpMadman 2013-07-19 10:33:28 +02:00
• 219ec6e8be [-] FO : Removed useless live edit query #PSCFV-9845 Damien Metzger 2013-07-19 09:50:30 +02:00
• 78ddec3ac7 [-] BO : translation copy is now easier #PSCFV-8886 Damien Metzger 2013-07-18 18:51:23 +02:00
• 0b4512dbcb // some work on style sheets Kevin Granger 2013-07-18 18:51:24 +02:00
• a6a700c9d8 // parse error gRoussac 2013-07-18 18:40:19 +02:00
• 236aaa9354 [*] MAILS : add {order_name} & {attached_file} , manaul merge from https://github.com/PrestaEdit/PrestaShop/commit/e9f963174486362a0ba471c18e113f6b83e5efc8 gRoussac 2013-07-18 18:38:12 +02:00
• 54fe5dfe96 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jérôme Nadaud 2013-07-18 18:34:18 +02:00
• ac02e5191a // ups Rémi Gaillard 2013-07-18 18:34:10 +02:00
• c90ba4c406 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jérôme Nadaud 2013-07-18 18:33:51 +02:00
• 066b791cf7 [-] FO : FixBug of total products from supliers and manufacturer Jérôme Nadaud 2013-07-18 18:33:35 +02:00
• 354622857f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-07-18 18:31:35 +02:00
• 958d92c9fa [*] BO: Add an option to allow iframes on descriptions Rémi Gaillard 2013-07-18 18:31:31 +02:00
• c70fe92dac // Validate::isGenericName now allow "#" #PSCFV-6530 Damien Metzger 2013-07-18 18:22:36 +02:00
• a71a5d7c18 [-] MO : Fix bug discount display in mail, manual merge from https://github.com/202-ecommerce/PrestaShop/commit/1d5df338c46aef723d13aef3e213792df6ea92e2 gRoussac 2013-07-18 18:18:57 +02:00
• e3d9dd89e9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-18 18:18:12 +02:00
• caf321e691 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden Jérôme Nadaud 2013-07-18 18:16:57 +02:00
• d879fb15a9 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products Jérôme Nadaud 2013-07-18 18:10:29 +02:00
• dd78e97b4a [-] FO : FixBug #PSCFV-7723 Bad manufacturers list pagination Jérôme Nadaud 2013-07-18 17:09:44 +02:00
• 9b2e9586c3 // bug merge Rémi Gaillard 2013-07-18 16:55:54 +02:00
• 272365cbe0 // small fix Rémi Gaillard 2013-07-18 16:34:35 +02:00
• d25689d00f // tabs deletion Rémi Gaillard 2013-07-18 16:15:33 +02:00
• 3693349643 [-] BO : FixBug #PSCFV-5316 Translation problem in delete button link Jérôme Nadaud 2013-07-18 15:49:53 +02:00
• 9670a02a11 // permissions fixing Rémi Gaillard 2013-07-18 15:27:08 +02:00
• 2c6978e97c [-] BO : FixBug #PSCFV-6140 Pagination link error Jérôme Nadaud 2013-07-18 14:55:28 +02:00
• 6ae0717e32 // PS Cleaner now clean the img/tmp dir Damien Metzger 2013-07-18 14:48:32 +02:00
• a6b2299ed1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-18 14:08:36 +02:00
• a6da3e94f0 [-] BO : FixBug #PSCFV-9723 Exporting quantity in instant stock was not returning all rows Jérôme Nadaud 2013-07-18 14:02:22 +02:00
• 6293631ac4 [-] FO : fixed group query for cart rules #PSCFV-8992 Damien Metzger 2013-07-18 13:47:23 +02:00
• 2cde72d5a4 /////// Rémi Gaillard 2013-07-18 12:21:06 +02:00