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

• 41196f3c5f // General modification for view and edit title Jerome Nadaud 2013-11-12 11:06:20 +01:00
• 0e1898be09 Merge pull request #963 from djfm/sprintf Gregory Roussac 2013-11-12 01:45:39 -08:00
• 44d1ed0982 // Add category name to page header title Jerome Nadaud 2013-11-12 10:45:17 +01:00
• 2a982e96f1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-12 10:44:08 +01:00
• 5ca23d44a6 // label with tooltip Kevin Granger 2013-11-12 10:43:52 +01:00
• c1969028f2 [-] FO : Customized meesage with carriage return follow up #962 gRoussac 2013-11-12 10:41:19 +01:00
• 3931914203 // Add Modernizr and Modernizr-loads check and loading for unsuported browsers Jerome Nadaud 2013-11-12 09:54:20 +01:00
• cd83ec93c7 Merge pull request #961 from joseantgv/patch-4 Gregory Roussac 2013-11-12 00:42:04 -08:00
• ab730dc3da // do not use sprintf when it is useless fram 2013-11-12 09:19:11 +01:00
• 7523828a7a Update ajax-wishlist.js joseantgv 2013-11-11 16:58:52 +01:00
• e2d8a33a81 [*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960 gRoussac 2013-11-11 14:02:11 +01:00
• a7869a1f06 [*] CORE : Remove duplicate SQL queries gRoussac 2013-11-11 13:41:23 +01:00
• 97d14e5b08 Added changes from commit 88aa49e TMMeilleur Alexey Svistunov 2013-11-11 11:30:24 +02:00
• de404706d9 [*] CORE : Profiling hide non doubles gRoussac 2013-11-11 02:09:50 +01:00
• 3f9338e13d [*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop gRoussac 2013-11-11 01:59:10 +01:00
• 38da826671 [-] FO : getTaxCalculator bad cache key again // sorry about that gRoussac 2013-11-11 01:37:20 +01:00
• fee461fdf1 [*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct gRoussac 2013-11-11 01:00:55 +01:00
• 8dd951c2df [*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory gRoussac 2013-11-11 00:36:17 +01:00
• 7e93b2cffd [-] FO : getTaxCalculator bad cache key gRoussac 2013-11-11 00:13:35 +01:00
• 19da345531 [-] BO : Could not check all modules after ajax call gRoussac 2013-11-10 21:51:14 +01:00
• d7dd85d7d0 Merge pull request #955 from alexey-svistunov/bootstrap Rémi Gaillard 2013-11-08 11:25:25 -08:00
• 6f5c9044d3 Added changes from eb94b51 TMMeilleur/PrestaShop alexey-svistunov 2013-11-08 21:00:00 +02:00
• d3100acef2 // fixs on mobile nav Kevin Granger 2013-11-08 18:31:07 +01:00
• bd8eebdc33 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-11-08 18:12:23 +01:00
• 4312d241f3 [-] MO :Fixed #PNM-1654 (Loyalty module) by using most expensive attribute instead of default one Fabio Chelly 2013-11-08 18:12:11 +01:00
• c5b3d20b96 // Fix empty file list on add Jerome Nadaud 2013-11-08 18:05:56 +01:00
• bdc996d13b // Wrong col size Jerome Nadaud 2013-11-08 17:58:09 +01:00
• a3082be2db // Remove unnecessary function Jerome Nadaud 2013-11-08 17:53:26 +01:00
• 217a79eeae // Unify thumb param in files options Jerome Nadaud 2013-11-08 17:49:56 +01:00
• ef469d7782 // Move spin and ladda js to products controller Jerome Nadaud 2013-11-08 17:47:09 +01:00
• 9065a73998 // Remove flags Jerome Nadaud 2013-11-08 17:21:36 +01:00
• 00a72a5f68 // skin uploader button Kevin Granger 2013-11-08 16:56:12 +01:00
• 5afe733e13 // Small fix on HelperUploader Jerome Nadaud 2013-11-08 16:53:32 +01:00
• bf67bd56a3 // Add uploader to products controller Jerome Nadaud 2013-11-08 16:29:07 +01:00
• 034565bc6a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-08 16:18:38 +01:00
• b214ea68ff // mobile nav Kevin Granger 2013-11-08 16:18:28 +01:00
• 7eb70486e0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-11-08 15:54:28 +01:00
• ebc3dfee62 [-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index gRoussac 2013-11-08 15:54:13 +01:00
• ee487fde59 Merge pull request #953 from Shagshag/patch-4 Gregory Roussac 2013-11-08 06:37:26 -08:00
• c7f1fcb49a kb was not translatable Shagshag 2013-11-08 15:33:49 +01:00
• 530b6dc501 // Productscomments remove warnings gRoussac 2013-11-08 15:00:56 +01:00
• 5364be686e // More simple names for csv import files gRoussac 2013-11-08 14:59:43 +01:00
• aaaf8588c1 Merge pull request #931 from PhpMadman/patch-2 Jérôme Nadaud 2013-11-08 04:01:39 -08:00
• 6ee2852fa5 [-] MO : Mailalert was not using order reference PhpMadman 2013-11-08 12:48:49 +01:00
• 64c166c311 Merge pull request #947 from PhpMadman/Boot-UpTo Jérôme Nadaud 2013-11-08 02:57:23 -08:00
• 02acd47c9e Merge pull request #950 from pelTek/patch-2 Jérôme Nadaud 2013-11-08 02:46:55 -08:00
• 6f70c77d41 Merge pull request #949 from djfm/bootstrap Jérôme Nadaud 2013-11-08 02:45:04 -08:00
• 32e92762f5 Added states to Greek localization pack Chris 2013-11-08 12:44:42 +02:00
• be38a438e2 // sprintf & English fram 2013-11-08 11:39:59 +01:00
• 3b7387ffe8 [-] Classes : Hook - Installer & context shop id Francois Gaillard 2013-11-08 11:00:14 +01:00
• 1782bc082f // made a working You Save column for Volume Discounts PhpMadman 2013-11-08 10:27:36 +01:00
• 42af175d22 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-07 21:49:11 +01:00
• 9c4ee27f20 // mobile nav WIP Kevin Granger 2013-11-07 21:48:55 +01:00
• 402221ad0f // load enquire.js Kevin Granger 2013-11-07 21:48:17 +01:00
• 2d2445efd4 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Rémi Gaillard 2013-11-07 18:34:09 +01:00
• 855c8a8de4 // add 2 useful hooks Rémi Gaillard 2013-11-07 18:33:49 +01:00
• 472dc8c27d [-] MO : Blocklayered follow up https://github.com/PrestaShop/PrestaShop/commit/a6e67b078e067445eef358e907649e843a1dc26a#commitcomment-4538556 gRoussac 2013-11-07 17:59:04 +01:00
• 4d1a4393a9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-07 17:58:32 +01:00
• 8a4c036655 // Fix cache problem Jerome Nadaud 2013-11-07 17:58:17 +01:00
• 99ad6481e6 Update productcomments.php Javsmile 2013-11-07 17:53:47 +01:00
• f5c133f6e0 // small fix Rémi Gaillard 2013-11-07 17:50:28 +01:00
• 2d609ec93c // merge fixes Rémi Gaillard 2013-11-07 17:43:26 +01:00
• 51e962195c // This Controller needs a toolbar and a title Kevin Granger 2013-11-07 17:15:40 +01:00
• e3cfacb90e // link to employee default tab and not index Rémi Gaillard 2013-11-07 17:00:55 +01:00
• 01d8376ee7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-07 16:48:56 +01:00
• 92cf31e5c3 [-] MO : Fixed #PNM-1600 by modifying getPageLink() Fabio Chelly 2013-11-07 16:46:30 +01:00
• b51b388eaa // Blockcategories thumnail uploader fix Jerome Nadaud 2013-11-07 16:44:55 +01:00
• 18718792be // Uploader helper part 3 Jerome Nadaud 2013-11-07 16:42:00 +01:00
• fa7d44d67f Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-11-07 16:39:26 +01:00
• b9c4b5d2a7 [-] FO : Prevents warning in safePostVars when $_POST has been unset Fabio Chelly 2013-11-07 16:38:53 +01:00
• fbd28f3e49 Merge pull request #942 from Jacky75/20131107_payment_and_groups Gregory Roussac 2013-11-07 06:39:57 -08:00
• 8c8340db4e [-] FO : in multistore payment module restrictions by customer group was not applied to specific shop Daniele Giachino 2013-11-07 15:18:59 +01:00
• 7cc351e83d [-] BO : Fix bug #PSCFV-10932, ranges input disabled on load gRoussac 2013-11-07 15:11:30 +01:00
• 75171c77dd Merge pull request #940 from PhpMadman/bootstrap Jérôme Nadaud 2013-11-07 05:59:36 -08:00
• c6676197e5 // better syntax PhpMadman 2013-11-07 14:57:13 +01:00
• 0a31ab8202 added check for empty value PhpMadman 2013-11-07 14:51:05 +01:00
• 3eb9a7e772 // update bootstrap + add enquire.js Kevin Granger 2013-11-07 14:19:23 +01:00
• 63e31a4585 Merge pull request #939 from djfm/bootstrap Kevin Granger 2013-11-07 05:08:16 -08:00
• 1bb550cf63 // allow hook exceptions on product comparison page djfm 2013-11-07 13:01:54 +00:00
• 30624fabd2 Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap djfm 2013-11-07 12:27:58 +00:00
• 598034efb4 // English djfm 2013-11-07 12:27:48 +00:00
• 8cb761078b // English djfm 2013-11-07 12:26:55 +00:00
• 91cde1ab3a [-] BO : getCMSPages to associated shop in cmscontroller gRoussac 2013-11-07 12:09:58 +01:00
• f83c50b264 // one is one djfm 2013-11-07 11:08:15 +00:00
• 9e76f82fb5 //merge Vincent Augagneur 2013-11-07 12:06:58 +01:00
• 3c31f1a07f //dashconfig errors return Vincent Augagneur 2013-11-07 12:05:03 +01:00
• e6f9f806bf [-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440 gRoussac 2013-11-07 12:03:35 +01:00
• 3af230118b // English djfm 2013-11-07 10:27:50 +00:00
• fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 gRoussac 2013-11-07 11:24:32 +01:00
• c7249bcc84 // Done in 1.5.6.1 Jerome Nadaud 2013-11-07 11:05:39 +01:00
• 8ef9064355 Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap djfm 2013-11-07 10:02:24 +00:00
• 3d22303b90 // sprintf djfm 2013-11-07 10:01:10 +00:00
• f3147b4e57 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-11-07 09:47:47 +01:00
• 2f1a82628c // Fixes "Notice: Undefined index: nb_results in" PhpMadman 2013-11-07 09:00:00 +01:00
• 866e7f831b // fixs highlight search Kevin Granger 2013-11-06 19:26:22 +01:00
• 514c087962 [*] BO : New import csv files gRoussac 2013-11-06 18:38:32 +01:00
• 00887942d3 // preg_last_error not available on every stacks gRoussac 2013-11-06 18:32:39 +01:00
• afe6c9bc6f // missing dir sep on is_dir (open_basedir) gRoussac 2013-11-06 18:23:01 +01:00
• 93717e910b // Repairs sake of performance on tables with many lines. Kevin Granger 2013-11-06 18:15:17 +01:00
• fc6041fa33 [-] IN : bad path in create multistore gRoussac 2013-11-06 18:06:19 +01:00