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

• 3fcf166a9d // small fix Rémi Gaillard 2013-08-21 18:24:10 +02:00
• f6515a39eb [+] BO : List header new toolbar functionality Jerome Nadaud 2013-08-21 17:52:23 +02:00
• dd9aa9fdb5 // disable log deletion Rémi Gaillard 2013-08-21 17:43:34 +02:00
• 93e03a3c3b // update bower with latest bootstrap 3.0.0 + fix layout Kevin Granger 2013-08-21 17:17:24 +02:00
• 5faaef9f21 // fixed a few untranslatable strings in CarrierWizard djfm 2013-08-21 14:33:22 +00:00
• eb69498d2c // Missing icon Damien Metzger 2013-08-21 15:34:32 +02:00
• df418a80db [*] FO : added indexation of attributes references #PSCFV-7294 Damien Metzger 2013-08-21 15:31:10 +02:00
• d6b50a7f0c // Merge Dev + Bootstrap Jerome Nadaud 2013-08-21 15:27:14 +02:00
• 4d3fc8c314 [-] MO : fixed smarty cache on blocksearch #PSCFV-8739 Damien Metzger 2013-08-21 15:13:35 +02:00
• 600b027efd // fix root categories addition Rémi Gaillard 2013-08-21 14:37:39 +02:00
• cf35d3762b [-] MO : fixed the possibility to override/remove an override twice in the same session without redeclaration #PSCFV-10168 Damien Metzger 2013-08-21 14:32:18 +02:00
• 65c6d86e6e // Fixed simple multistore process Damien Metzger 2013-08-21 10:23:53 +02:00
• 3287e1664c // Added target blank in a transverse link Damien Metzger 2013-08-21 10:18:46 +02:00
• 65becc8550 // Fixed typo Damien Metzger 2013-08-21 10:10:33 +02:00
• 3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-08-21 09:14:10 +02:00
• 50d5a71ca6 [-] Classes : fix memcache ext #PSCFV-5225 thanks @up2date gRoussac 2013-08-20 23:09:12 +02:00
• 20e2f07939 [-] BO: Delete from attribute_shop when an attribute group is deleted #PSCFV-9902 Rémi Gaillard 2013-08-20 17:56:26 +02:00
• ad2702e609 // Config files were translated in french Damien Metzger 2013-08-20 17:48:43 +02:00
• 3fcb65ca0f [-] WS: Fix retrieve of stock_availables when stock is shared on the shop group Rémi Gaillard 2013-08-20 17:18:07 +02:00
• e80e2ac5e3 [-] BO : FixBug #PSCFV-10075 remove product attribute image association on delete product attribute Jerome Nadaud 2013-08-20 17:05:48 +02:00
• 750f374036 // error log only in dev mode for pcre backtrack limit #PSCFV-9012 Damien Metzger 2013-08-20 16:37:50 +02:00
• 17be1e7528 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-08-20 16:40:14 +02:00
• 44655ecdef // breaking things Kevin Granger 2013-08-20 16:38:31 +02:00
• 57d8d9c232 [-] BO : FixBug Preview product url Jerome Nadaud 2013-08-20 15:34:00 +02:00
• eeb469dda5 [-] FO : fixed bad search redirection #PSCFV-10158 Damien Metzger 2013-08-20 14:52:53 +02:00
• 43c544465e // Removed deprecated parameter Damien Metzger 2013-08-20 14:48:21 +02:00
• f71d4a63cf //small fix Vincent Augagneur 2013-08-20 11:46:58 +02:00
• 258d381083 [-] BO fixed bug #PSCFV-9663 - .live() method is deprecated on 1.7 jquery and it is not present into the 1.9 Vincent Augagneur 2013-08-20 11:11:21 +02:00
• 496db1d13e // Added automatic smarty cache clearing after catalog import (csv) Damien Metzger 2013-08-20 10:45:55 +02:00
• c5f635f967 // Updated some meta and translations Damien Metzger 2013-08-20 10:31:03 +02:00
• cf1798d2a1 [-] MO : multilines translations does not work #PNM-1645 Damien Metzger 2013-08-20 09:55:27 +02:00
• 787bf75304 [-] BO : FixBug missing rows and cols attributes for textareas Jerome Nadaud 2013-08-20 09:52:50 +02:00
• 00e1b7c0eb [-] BO : FixBug language in label for Jerome Nadaud 2013-08-20 09:36:00 +02:00
• 41190a66d4 [+] BO : Product tab fieldset and accordion fix Jerome Nadaud 2013-08-19 18:45:57 +02:00
• 5336467e04 [-] BO : FixBug Friendly URL by language Jerome Nadaud 2013-08-19 17:51:53 +02:00
• 68d7a320cd [-] BO : FixBug Friendly URL change Jerome Nadaud 2013-08-19 17:48:58 +02:00
• 8a0745e8de [-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore Vincent Augagneur 2013-08-19 17:21:03 +02:00
• f610b0d844 [+] MO : Bankwire, cashondelivery, cheque disable confirm button on click Jerome Nadaud 2013-08-19 16:37:48 +02:00
• 415ca83b62 // Code cleaning Damien Metzger 2013-08-19 15:23:43 +02:00
• 1a81191c09 // Code cleaning Damien Metzger 2013-08-19 15:14:05 +02:00
• d78ac1afe8 [-] BO : FixBug action link class Jerome Nadaud 2013-08-19 15:01:56 +02:00
• 155fd516ba // Misplaced if Jerome Nadaud 2013-08-19 14:41:08 +02:00
• 8cd8ede1a5 [+] BO : Add Highlighted class for default list row Jerome Nadaud 2013-08-19 13:31:23 +02:00
• 4a2e545bc4 [+] BO : Products tab fieldset Jerome Nadaud 2013-08-19 13:30:18 +02:00
• 21d5322e16 [-] BO : FixBug unset param icon Jerome Nadaud 2013-08-19 12:00:43 +02:00
• 0aa908bd25 [+] BO : Products add fileset for informations and prices tab Jerome Nadaud 2013-08-19 11:59:27 +02:00
• a7f6e91ac0 [-] BO : FixBug #PSCFV-9329 Alias problem in order by Jerome Nadaud 2013-08-19 10:35:43 +02:00
• dc4978ff57 [-] BO : FixBug valuation and real quantity sort Jerome Nadaud 2013-08-19 10:28:02 +02:00
• bad151a66f [-] BO : fixed range deletion when press enter on input 'all' on carrier wizard Vincent Augagneur 2013-08-19 10:20:22 +02:00
• 1138e8d01a [-] BO : FixBug Friendly URL change Jerome Nadaud 2013-08-19 10:17:42 +02:00
• 218ce59de6 [-] Installer : added ob_start() (required with the cookie mode when debug mode is activated) Damien Metzger 2013-08-19 10:04:23 +02:00
• c5097b19cc [-] TR : fixed missing space in RMA PDF Damien Metzger 2013-08-19 09:53:47 +02:00
• 13c5450ca1 [-] BO : FixBug sort bug on values count column Jerome Nadaud 2013-08-19 09:50:01 +02:00
• add997dbba // Traduction error Jerome Nadaud 2013-08-14 18:29:46 +02:00
• 8cd3fd0cfe [-] FO : FixBug Missing PS_STOCK_MANAGEMENT smarty variable Jerome Nadaud 2013-08-14 17:40:36 +02:00
• c180a20cf9 [-] BO : FixBug #PSCFV-7571 Error checking available product quantity Jerome Nadaud 2013-08-14 17:16:41 +02:00
• 274c90468f // Syntax error Jerome Nadaud 2013-08-14 16:14:56 +02:00
• d40d841cf3 // something is missing in 3d591be8c6 Rémi Gaillard 2013-08-14 15:15:41 +02:00
• 24ac8582bf [*] BO: Warehouse name is now displayed on each product line orders Rémi Gaillard 2013-08-14 15:02:30 +02:00
• 6cff684af1 [-] BO : FixBug update received quantity in suply order Jerome Nadaud 2013-08-14 14:38:10 +02:00
• ec39b9e701 [-] BO : fixed bug #PSCFV-10111 when carrier is free don't display ranges in summary Vincent Augagneur 2013-08-14 14:19:52 +02:00
• 3d591be8c6 [-] Core: Fix language link with multishop from another shop #PSCFV-10063 Rémi Gaillard 2013-08-14 11:25:46 +02:00
• cecaee8e68 [-] BO : Added comprehensive error display when prestashop cannot write the .htaccess file Damien Metzger 2013-08-14 11:15:57 +02:00
• 7f3652bea0 [-] BO : Added comprehensive error display when prestashop cannot write the .htaccess file Damien Metzger 2013-08-14 11:15:57 +02:00
• b22c2b28ec Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-08-14 10:29:24 +02:00
• 0bd04d9f3e [*] BO : Clear smarty cache when submitting SEO rules gRoussac 2013-08-14 10:27:39 +02:00
• 1a1666c399 // Syntax error Jerome Nadaud 2013-08-13 18:45:18 +02:00
• 533b28ce32 Merge branch 'prestarocket-duplicate_id' into release gRoussac 2013-08-13 18:26:51 +02:00
• f459af7090 Merge branch 'duplicate_id' of https://github.com/prestarocket/PrestaShop into prestarocket-duplicate_id gRoussac 2013-08-13 18:26:22 +02:00
• 7d0e0a7f38 // Removed useless Tools::safeOutput before insertion in the database Damien Metzger 2013-08-13 18:21:08 +02:00
• 26036cf7b2 //fixed min and max rang in carrier summary Vincent Augagneur 2013-08-13 17:41:43 +02:00
• b9808c5b5e //small js fix Vincent Augagneur 2013-08-13 17:26:16 +02:00
• f73f84dbf2 [+] BO : Product information tab Jerome Nadaud 2013-08-13 17:23:38 +02:00
• c6d3545b8b [-] BO :FixBug Suppliers and Warehouses accordion Jerome Nadaud 2013-08-13 17:14:57 +02:00
• f8acc2a15e //small typo Vincent Augagneur 2013-08-13 16:46:44 +02:00
• dab86dffe1 * [MO] : blocknewsletter improvements Krystian Podemski 2013-08-13 16:45:40 +02:00
• 62ab457908 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Vincent Augagneur 2013-08-13 16:42:36 +02:00
• c11c55e83c //small css fix Vincent Augagneur 2013-08-13 16:42:32 +02:00
• 1984cb6272 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-08-13 16:30:39 +02:00
• 5123d2505e [-] CORE : Do not delete index.php in smarty cache or /img/tmp/ gRoussac 2013-08-13 16:29:40 +02:00
• f9fdcb1103 [-] FO : fixed html tags that should not appear in blockcategories Damien Metzger 2013-08-13 16:21:50 +02:00
• 6e386868a6 [-] BO : fixed bug #PSCFV-10096 Vincent Augagneur 2013-08-13 16:14:09 +02:00
• 1d6f3382f5 [-] BO : FIxBug Correct image path in product Jerome Nadaud 2013-08-13 16:01:42 +02:00
• 0e353fe655 [-] BO : Fix bug to check filter values Jerome Nadaud 2013-08-13 15:42:00 +02:00
• 5e2a3e3c13 [+] BO : Modal module list Jerome Nadaud 2013-08-13 15:22:18 +02:00
• e8685b1430 [*] BO : Add clear smarty cache button gRoussac 2013-08-13 15:11:00 +02:00
• 1e10dab8f8 Merge pull request #646 from kpodemski/patch-2 Gregory Roussac 2013-08-13 05:54:40 -07:00
• 8051b0021e [*] CORE : Get instance of current category in category controller Krystian Podemski 2013-08-13 14:52:59 +02:00
• b1b636a911 // Added helpbox and fixed translation Damien Metzger 2013-08-13 14:16:40 +02:00
• e33cd2d13b [+] BO : Add active class to list view button Jerome Nadaud 2013-08-13 13:55:41 +02:00
• 86fba93f63 [-] Installer : fixed clear smarty cache Damien Metzger 2013-08-13 13:36:14 +02:00
• 1af9fdd1b2 [-] BO : Module list new action buttons Jerome Nadaud 2013-08-13 12:28:07 +02:00
• a2d005701e Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Vincent Augagneur 2013-08-13 11:36:57 +02:00
• b9b03d8259 //small css fix Vincent Augagneur 2013-08-13 11:36:52 +02:00
• 4a6d1e8ff6 [-] Installer : changed syntax from $class:func to call_user_func because it seems to be more compliant with old PHP versions Damien Metzger 2013-08-13 11:01:54 +02:00
• 2aa4237bb2 [+] BO : Add otf/woff type to htaccess generator Jerome Nadaud 2013-08-13 10:57:06 +02:00
• 407abd8a10 [+] BO : Suply order receipt list action Jerome Nadaud 2013-08-13 10:25:41 +02:00
• 9c523cf7eb // Log for product deletion was missing Rémi Gaillard 2013-08-13 10:21:01 +02:00
• da02895432 //fix carrier wizard with multistore part2 Vincent Augagneur 2013-08-13 10:10:27 +02:00
• a0d870c4eb [+] BO : Button action list improvements Jerome Nadaud 2013-08-13 10:10:24 +02:00