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

• 9ad56871de Merge pull request #1004 from djfm/bootstrap Damien Metzger 2013-11-26 01:31:24 -08:00
• e3f3f8a58f //oups Vincent Augagneur 2013-11-26 10:25:03 +01:00
• 690b6b160a //small js fix Vincent Augagneur 2013-11-26 10:24:19 +01:00
• 3c1f2f045c Adds currency to rich snippets Dh42 2013-11-26 01:37:55 -06:00
• 8a7d39d800 [-] BO : Undefined on image upload, revert of https://github.com/PrestaShop/PrestaShop/commit/48b7a49b1aea34a2def355ffec1d4c08dfdbdfd6 gRoussac 2013-11-25 22:56:50 +01:00
• 2a1c991612 [-] BO : Undefined on image upload, revert of https://github.com/PrestaShop/PrestaShop/commit/48b7a49b1aea34a2def355ffec1d4c08dfdbdfd6 gRoussac 2013-11-25 22:56:50 +01:00
• 47b7bf5458 // Adding some style to tinymce Jerome Nadaud 2013-11-25 19:05:58 +01:00
• 695aaa73fb [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/696 gRoussac 2013-11-25 19:03:15 +01:00
• fa059751fc Merge pull request #1032 from djfm/development Jérôme Nadaud 2013-11-25 09:48:47 -08:00
• 6284c55e2a // updated Italian VAT rate fram 2013-11-25 18:41:21 +01:00
• 5eae3acee3 // Add new value button at attribute controller start Jerome Nadaud 2013-11-25 18:29:06 +01:00
• 0d6bc850de // Update datepicker button with period buttons select Jerome Nadaud 2013-11-25 18:24:06 +01:00
• a81ee41374 // Fix missing saving button in products Jerome Nadaud 2013-11-25 18:01:01 +01:00
• d9e53486a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-25 17:56:11 +01:00
• 4c8c48f441 // admin import Kevin Granger 2013-11-25 17:55:59 +01:00
• 9e7a275d8d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap gRoussac 2013-11-25 17:39:59 +01:00
• a0373eed7a [-] MO : Dateofdelivery Fix bug #PNM-1773 when a product has an available date gRoussac 2013-11-25 17:39:46 +01:00
• 48be09d82d // Missing Base uri in uploader helper Jerome Nadaud 2013-11-25 17:37:26 +01:00
• 81f05b9db3 Merge pull request #780 from MyBB-Services/dev/gb/sqlmanagergroupby Rémi Gaillard 2013-11-25 08:21:23 -08:00
• 0e3504f3b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-25 17:17:15 +01:00
• fae1fd58a9 // tweak on switch + admin import Kevin Granger 2013-11-25 17:16:59 +01:00
• 2b0224efe1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-25 17:09:20 +01:00
• 89f794ae5e // Missing Typo Jerome Nadaud 2013-11-25 17:09:08 +01:00
• 553568a72d // Change message for permissions in the installer Damien Metzger 2013-11-25 17:06:13 +01:00
• 09b5d3a0b8 Merge pull request #863 from Prestaworks/patch-15 Rémi Gaillard 2013-11-25 07:52:57 -08:00
• 12c89c1e2d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-25 16:45:40 +01:00
• a98002083f // Now you can click on folder icon to expand or collapse Jerome Nadaud 2013-11-25 16:45:26 +01:00
• 375981378f // typo rGaillard 2013-11-25 16:44:08 +01:00
• acdb7b0c13 // Fixed invisible chars in CSV examples Damien Metzger 2013-11-25 16:13:19 +01:00
• 0061801bed Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-25 16:05:31 +01:00
• b2cee0426a // Default category was not selected Jerome Nadaud 2013-11-25 16:05:18 +01:00
• 620441997c [-] CORE : No Exception when CONTENT_LENGTH is no set gRoussac 2013-11-25 16:05:07 +01:00
• d30e376354 // Remove "no name" error on new product Jerome Nadaud 2013-11-25 14:42:21 +01:00
• 93cbad2a05 [*] BO : replaced age by total spent in the customer list Damien Metzger 2013-11-25 14:29:49 +01:00
• 00e5bfe26e // Updating current branch Jérôme Nadaud 2013-11-25 14:22:59 +01:00
• eb312455e5 [-] BO : Double separator in function createTemplate() ccauwandJerome Nadaud 2013-11-25 14:13:10 +01:00
• 754ba06a39 Merge pull request #1030 from ccauw/patch-13 Jérôme Nadaud 2013-11-25 05:18:28 -08:00
• 2129aebac0 Update CONTRIBUTING.md Jérôme Nadaud 2013-11-25 14:17:49 +01:00
• 04760c91e5 [-] BO : Double separator in function createTemplate() ccauw 2013-11-25 14:13:10 +01:00
• 77f691b6ee Merge pull request #1028 from wfpaisa/patch-5 Jérôme Nadaud 2013-11-25 04:32:19 -08:00
• b2e685e126 [-] FO, Bug fix double/ Felipe Uribe 2013-11-25 07:19:37 -05:00
• b8c77d90b4 [*] BO : Added countries to order list (idea from PhpMadman https://github.com/PrestaShop/PrestaShop/pull/909) Damien Metzger 2013-11-25 12:17:26 +01:00
• f68c31e989 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Francois Gaillard 2013-11-25 12:13:10 +01:00
• 90d3dff381 [-] MO : Bug fix - Blockwishlist, Product image link in BO Francois Gaillard 2013-11-25 12:12:57 +01:00
• 611cfd90a0 [-] BO : FixBug #PSCSX-40 categories unchanged after select a new home category Jerome Nadaud 2013-11-25 12:08:34 +01:00
• c613ca5a7d Merge pull request #1009 from indesign47/patch-6 Gregory Roussac 2013-11-25 03:00:08 -08:00
• c5184a6e0f [-] BO : AdminImport new supplier csv gRoussac 2013-11-25 11:55:14 +01:00
• b0436adb46 Merge pull request #1023 from indesign47/patch-19 Gregory Roussac 2013-11-25 02:45:01 -08:00
• 2eb620267c Merge pull request #835 from axometeam/patch-20 Damien Metzger 2013-11-25 02:35:23 -08:00
• dec1555b32 // Fixed dashboard simulation mode switch Damien Metzger 2013-11-25 11:30:12 +01:00
• a932ba512a Merge pull request #846 from sebastienhouzet/patch-2 Damien Metzger 2013-11-25 02:13:06 -08:00
• 5afde2163b [+] MO : Add name value when hover color in blocklayered.tpl - Thanks @codeurWeb Jerome Nadaud 2013-11-25 11:10:42 +01:00
• d1c9ec8e09 // Changing Typo preserving backward compatibility Jerome Nadaud 2013-11-25 11:02:40 +01:00
• f588a2c0c3 Merge pull request #1024 from indesign47/patch-20 Gregory Roussac 2013-11-25 01:54:34 -08:00
• c6e1fbbae9 Merge pull request #1010 from indesign47/patch-8 Gregory Roussac 2013-11-25 01:41:12 -08:00
• bc083ece83 // Manual merge from development branch Jerome Nadaud 2013-11-25 10:25:32 +01:00
• 652c370a1d Merge pull request #1025 from wfpaisa/patch-3 Jérôme Nadaud 2013-11-25 00:04:09 -08:00
• 9f5f8561f7 Merge pull request #1027 from wfpaisa/patch-4 Jérôme Nadaud 2013-11-25 00:02:56 -08:00
• f7b1fa88fa double ../ Felipe Uribe 2013-11-24 19:42:14 -05:00
• 064b9f5ce5 double ../../ Felipe Uribe 2013-11-24 17:29:15 -05:00
• 6ef28542c9 [-] BO : AdminImport products add missing fields indesign47 2013-11-24 23:10:10 +01:00
• d6d2ef6906 [-] BO : AdminImport add image suppliers indesign47 2013-11-24 22:48:27 +01:00
• f3f580cb08 [-] BO : AdminImport add image manufacturers indesign47 2013-11-24 22:42:27 +01:00
• 4044ba853e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-22 18:57:15 +01:00
• 0572fc09e8 // tweaks list + customers Kevin Granger 2013-11-22 18:56:52 +01:00
• 1337407131 Merge pull request #1019 from djfm/translations Jérôme Nadaud 2013-11-22 09:12:55 -08:00
• 0716ae1afc Merge pull request #1018 from indesign47/patch-15 Jérôme Nadaud 2013-11-22 09:10:35 -08:00
• d4dc67bc61 Merge pull request #1021 from indesign47/patch-17 Jérôme Nadaud 2013-11-22 09:09:52 -08:00
• 7f3305d5fc Merge pull request #1020 from indesign47/patch-16 Jérôme Nadaud 2013-11-22 09:08:36 -08:00
• 283fd2a9f3 [-] MO : cheque add translation for fields indesign47 2013-11-22 18:05:40 +01:00
• 94242412f2 [-] MO : cheque add translation for fields indesign47 2013-11-22 18:02:48 +01:00
• b29a30f033 // small fix rGaillard 2013-11-22 17:59:32 +01:00
• e068f7202a [-] MO : bankwire add translation for fields indesign47 2013-11-22 17:34:03 +01:00
• 01d6d7c279 // clearer message djfm 2013-11-22 16:32:54 +00:00
• dabc3d359a [-] MO : bankwire add translation for fields indesign47 2013-11-22 17:30:37 +01:00
• 1c6a58c902 // English djfm 2013-11-22 16:16:59 +00:00
• a385e1af42 // remove mod= parameters for translations in the Front-Office djfm 2013-11-22 16:11:37 +00:00
• a147806382 // Improved texts and UI in AdminImport djfm 2013-11-22 15:44:49 +00:00
• a620c5044f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-22 16:42:09 +01:00
• 3fe6608a62 // Include datetime picker for all admin controllers Jerome Nadaud 2013-11-22 16:41:52 +01:00
• 88ad2010d6 // add padding and margin to automplete width #PSCFV-5876 rGaillard 2013-11-22 16:41:25 +01:00
• 361450aab9 // Fixed entities on KPIs Damien Metzger 2013-11-22 16:15:48 +01:00
• db1c3c22fd [-] BO : Cart rules optimization / Attempt to fix #PSCFV-8895 (need to be double-checked) Damien Metzger 2013-11-22 15:59:41 +01:00
• af4b258201 // js=1, not '1' djfm 2013-11-22 14:22:26 +00:00
• 45525dac71 Merge pull request #1017 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-22 05:50:37 -08:00
• 40d15416c5 [-] FO : exclude external css from CCC #PSCFV-10839 Damien Metzger 2013-11-22 14:37:16 +01:00
• 2376dd404f fixes for cross-browser compability TMMeilleur 2013-11-22 14:55:48 +02:00
• 0a7ea9b124 Merge pull request #1016 from wfpaisa/patch-1 Jérôme Nadaud 2013-11-22 04:28:59 -08:00
• 5113125a0d Update AdminPPreferencesController.php Felipe Uribe 2013-11-22 07:23:09 -05:00
• 79791d0159 [-] BO : AdminImages manufacturers/suppliers/stores image indesign47 2013-11-22 12:22:41 +01:00
• 70180f10d4 Merge pull request #1014 from indesign47/patch-13 Rémi Gaillard 2013-11-22 03:08:04 -08:00
• dd79348748 [-] BO : getCartsRuleByCode should be retrocompatible gRoussac 2013-11-22 11:40:47 +01:00
• 6164a0d42c [-] FO : header add translation for fields indesign47 2013-11-22 11:37:30 +01:00
• f7d4dc979f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap gRoussac 2013-11-22 11:33:00 +01:00
• 799b31d1ac [-] FO : Contact-form add translation for fields indesign47 2013-11-22 10:55:56 +01:00
• 20cc8c3f42 [+] BO : AdminSearchConf add import alias indesign47 2013-11-22 09:54:53 +01:00
• a76578b094 [+] BO : AdminAttributes add import combinations indesign47 2013-11-22 09:51:20 +01:00
• a3e84a33f7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Damien Metzger 2013-11-22 09:50:05 +01:00
• c095d8f1ca [-] Core : fixed smarty escape htmlall > html Damien Metzger 2013-11-22 09:47:15 +01:00
• 569c81c0de [+] BO : AdminProducts add import products indesign47 2013-11-22 09:45:15 +01:00