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

• 89ac0bc439 [-] FO : Fix #PSCFV-10480 again, css fix gRoussac 2013-09-24 16:34:18 +02:00
• a175e603ef // Wharehouse view bootstrap fix Jerome Nadaud 2013-09-24 16:20:05 +02:00
• 479662aa10 // Fix missing table id for shop asso in helper Jerome Nadaud 2013-09-24 16:19:38 +02:00
• 003ba20238 // Products multistore bootstrap fix Jerome Nadaud 2013-09-24 16:19:00 +02:00
• 3d477c62eb // remove notice gRoussac 2013-09-24 16:03:39 +02:00
• d26336aa77 // Copy KPIs from customer to cart Damien Metzger 2013-09-24 15:54:45 +02:00
• c9b53685c5 // parse error gRoussac 2013-09-24 15:44:56 +02:00
• 1cc92fc9c2 [-] CORE : Could not add too long tags gRoussac 2013-09-24 15:40:18 +02:00
• 799efcba3f [*] BO : Customers KPIs Damien Metzger 2013-09-24 15:31:52 +02:00
• 17323a04b6 [-] CORE : Missing tag max size gRoussac 2013-09-24 15:10:14 +02:00
• a913a43b17 //mailalerts now use bootstrap design Vincent Augagneur 2013-09-24 14:49:56 +02:00
• 00ddfeba05 // CMS select size in form Jerome Nadaud 2013-09-24 13:09:22 +02:00
• c9eb5b5be6 // Products multistore design Jerome Nadaud 2013-09-24 12:29:12 +02:00
• 6e2337df44 // Add id attribute to tree header button Jerome Nadaud 2013-09-24 12:27:51 +02:00
• 8f08f67812 [+] BO : Added fees configuration for the dashboard Damien Metzger 2013-09-24 12:22:40 +02:00
• 1d6593612f [-] FO : Fix #PSCFV-10480 again css fix gRoussac 2013-09-24 12:21:10 +02:00
• 4c399875d9 Merge pull request #737 from codeurWeb/patch-3 Gregory Roussac 2013-09-24 01:54:18 -07:00
• 92b987c0f8 Merge pull request #736 from codeurWeb/patch-2 Gregory Roussac 2013-09-24 01:40:16 -07:00
• 41af17e06b [-] BO: Fix data validation when iframe is allowed on some entities like CMS Rémi Gaillard 2013-09-24 10:28:04 +02:00
• 8804720cb6 Add action to export directly to Excel xlsx files. export_excel dlage 2013-09-23 20:37:46 +01:00
• 6acebca8fa [-] BO : fix postProcess override on AdminImportController Julien 2013-09-23 21:04:55 +02:00
• 6850db0612 [-] BO : fix contructor override on AdminImportController Julien 2013-09-23 20:23:45 +02:00
• 284fcc72f7 add PHPExcel to tools. dlage 2013-09-23 19:01:59 +01:00
• 18a621e022 // Multistore invisible description in options Jerome Nadaud 2013-09-23 19:02:22 +02:00
• aefab21a62 Merge pull request #735 from djfm/release Gregory Roussac 2013-09-23 09:54:01 -07:00
• d9a24d61ac // change comment djfm 2013-09-23 16:37:13 +00:00
• 6195d0c319 [*] LO : Use single quote as thousands separator for CHF currency djfm 2013-09-23 16:32:40 +00:00
• b3a425c73a [-] MO : Blockcart, wrong tbody gRoussac 2013-09-23 18:20:35 +02:00
• f04126c436 // Customers groups - Add special tree handle for categories tree Jerome Nadaud 2013-09-23 18:16:47 +02:00
• ccb3179c1a [-] CORE : Partial fix for #PSCFV-10482 getCacheId is different in back office gRoussac 2013-09-23 18:07:46 +02:00
• c78c8b04bd // Multistore checkbox js functions Jerome Nadaud 2013-09-23 18:05:16 +02:00
• 69f97baa6a // Search conf list size Jerome Nadaud 2013-09-23 18:04:48 +02:00
• 202c6fe463 // Carrier list size Jerome Nadaud 2013-09-23 18:04:18 +02:00
• 320e1512df // Multistore checkbox design Jerome Nadaud 2013-09-23 18:03:32 +02:00
• b4547568a5 Merge pull request #734 from djfm/release Gregory Roussac 2013-09-23 08:38:57 -07:00
• d37f545058 [-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name gRoussac 2013-09-23 17:26:36 +02:00
• 5c4de83e91 // no quotes around 1 in js=1 please djfm 2013-09-23 15:20:26 +00:00
• 6796b64e18 Merge pull request #691 from djfm/development Damien Metzger 2013-09-23 07:51:57 -07:00
• 3b075e049b // bad commit gRoussac 2013-09-23 16:33:44 +02:00
• 84dc75f57e [-] CORE : Fix bug #PSCFV-10471 Cart item count problem, unique_id grouping error for id_product and id_product_attribute gRoussac 2013-09-23 16:32:38 +02:00
• 92382e347c [-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page gRoussac 2013-09-23 16:08:44 +02:00
• 0b35c5506c //crossselling module now use boostrap design Vincent Augagneur 2013-09-23 15:22:42 +02:00
• dedc59f1db [-] IN : FIX #PSCFV-10246 errors in stricts sql-mode, thanks @enumag gRoussac 2013-09-23 15:10:44 +02:00
• a2d770e04f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-09-23 15:10:49 +02:00
• 642ff59bef //cheque module now use boostrap design Vincent Augagneur 2013-09-23 15:10:46 +02:00
• 590e738254 // Fixed typo Damien Metzger 2013-09-23 14:40:25 +02:00
• e8420f24d1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-09-23 14:19:12 +02:00
• e128e17f4e // Geoloc bootstrap design Jerome Nadaud 2013-09-23 14:04:15 +02:00
• 748d6271a9 // Stores controller bootstrap Jerome Nadaud 2013-09-23 13:56:30 +02:00
• 234b6de1b0 // Stores controller bootstrap design Jerome Nadaud 2013-09-23 13:31:45 +02:00
• 4bb0a5f794 // Preferences images bootstrap design Jerome Nadaud 2013-09-23 11:43:31 +02:00
• c6222c51c8 // commit 6b47f5713e is missing Rémi Gaillard 2013-09-23 11:36:15 +02:00
• a1555c3fc8 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-09-23 11:24:26 +02:00
• 31697fde3c [-] MO productcomments: confirmation message takes moderation mode into account Fabio Chelly 2013-09-23 11:24:14 +02:00
• 5206496f64 [-] BO : Fix Bug For new Fancy Box events Jerome Nadaud 2013-09-23 11:22:51 +02:00
• cf82157d47 // oops Jerome Nadaud 2013-09-23 10:48:56 +02:00
• 7dbb6088a4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-09-23 10:42:30 +02:00
• 50bbf1a547 // small fix Rémi Gaillard 2013-09-23 10:46:41 +02:00
• 32a7a28567 [-] MO : FixBug #PNM-1683 - Treeview problem Jerome Nadaud 2013-09-23 10:42:10 +02:00
• 12f67a825b //carriercompare now use bootstrap design Vincent Augagneur 2013-09-23 10:24:26 +02:00
• a578cfb2e2 [-] FO: Fix #PSCFV-10461 Rémi Gaillard 2013-09-23 10:20:22 +02:00
• f4e0f63ef7 // Add lingerie to activities list Jerome Nadaud 2013-09-23 10:14:23 +02:00
• 45c7cb7757 // Cms categories list Jerome Nadaud 2013-09-23 10:13:45 +02:00
• 39d84759a3 //blockviewed now use boostrap design Vincent Augagneur 2013-09-23 10:06:43 +02:00
• 0fa8b4305e //blocktags now use boostrap design Vincent Augagneur 2013-09-23 10:03:28 +02:00
• 6e24fe1411 //blocksupplier now use bootstrap design Vincent Augagneur 2013-09-23 09:52:58 +02:00
• 39468476ab [-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request https://github.com/kpodemski/kp-PrestaShop/commit/361ebc72e09d00463bb7a7b7af670e3235ab6a5a gRoussac 2013-09-23 09:50:12 +02:00
• d71a6a90da //now blockstore use bootstrap design Vincent Augagneur 2013-09-23 09:48:59 +02:00
• c1a9aa5936 //helper form input type file now can display thumb Vincent Augagneur 2013-09-23 09:45:20 +02:00
• 67f05340c0 // Remove list header button link title and remove shop column center Jerome Nadaud 2013-09-23 09:18:44 +02:00
• c93eb9f40a // orders WIP Kevin Granger 2013-09-20 19:11:08 +02:00
• 214b844ef7 // Removed useless tiny mce src Damien Metzger 2013-09-20 18:52:42 +02:00
• 0e87409bd6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-20 18:31:47 +02:00
• 8e1cb5cc34 // Kpi update for customers orders Jerome Nadaud 2013-09-20 18:31:35 +02:00
• dadf83d6f6 [*] BO : removed deprecated chart engines Damien Metzger 2013-09-20 18:27:35 +02:00
• 5c3b8015e5 [-] BO : fixed the redirection to a 404 page when loging in in the updater Damien Metzger 2013-09-20 18:20:55 +02:00
• 1fe17f0eb1 // Removed deprecated option form in stats Damien Metzger 2013-09-20 18:18:04 +02:00
• ed1574e9ed // Finished nvd3 chart Damien Metzger 2013-09-20 18:11:59 +02:00
• 02e5913dd6 // Fixed potential warning Damien Metzger 2013-09-20 14:44:51 +02:00
• 504485cef3 //blockspecials now use bootstrap design Vincent Augagneur 2013-09-20 17:51:24 +02:00
• 4136697c5e //blocksocial now use boostrap design Vincent Augagneur 2013-09-20 17:22:15 +02:00
• e332de1d50 //blockrss now use boostrap design Vincent Augagneur 2013-09-20 17:14:50 +02:00
• 3ef36400bf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-20 17:02:55 +02:00
• c1e6df873d // Fix birthday bootstrap design Jerome Nadaud 2013-09-20 17:02:44 +02:00
• 24b6d3d387 //blockpaymentlogo now use boostrap design Vincent Augagneur 2013-09-20 17:02:15 +02:00
• 4b4622a1c7 //blocknewsletter now use boostrap design Vincent Augagneur 2013-09-20 16:52:48 +02:00
• b7045b998a //blocknewproducts now use boostrap design Vincent Augagneur 2013-09-20 16:41:31 +02:00
• e9cd8ac145 // Search tree toolbar button Jerome Nadaud 2013-09-20 16:20:27 +02:00
• f44ecb9fc8 // Products section list adjustment Jerome Nadaud 2013-09-20 16:19:50 +02:00
• 7aa348eb93 // bad char Rémi Gaillard 2013-09-20 15:48:22 +02:00
• caa1dbc7ea //Fix tree search toolbar button design Jerome Nadaud 2013-09-20 15:39:44 +02:00
• f51ffe4c55 // Start design of multistore toolbar Jerome Nadaud 2013-09-20 15:30:59 +02:00
• e2a1f5101c [-] BO : Bad input radio names gRoussac 2013-09-20 15:27:31 +02:00
• 7d05da1618 [-] IN : Lower by two flush limit in migrate_orders gRoussac 2013-09-20 15:12:57 +02:00
• 429c9442a3 [*] CORE : bad else if in getTemplatePath gRoussac 2013-09-20 15:10:14 +02:00
• f312a055b1 // Multistore bootstrap design Jerome Nadaud 2013-09-20 15:04:43 +02:00
• 2f3d736f13 //blockmanufacturer is now using bootstrap design Vincent Augagneur 2013-09-20 14:56:41 +02:00
• eeb3b540e2 // orders + css highlight / fixed-width Kevin Granger 2013-09-20 14:42:09 +02:00
• 2dc91758c3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-09-20 14:12:56 +02:00
• 9b878a33a8 // fix canonical and ssl page without ssl Rémi Gaillard 2013-09-20 14:12:41 +02:00