dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Roussac 24dc07ef85 Merge pull request #1022 from indesign47/patch-18 
[-] BO : AdminImport add image manufacturers
 2013-11-26 02:34:31 -08:00
Gregory Roussac b6a41fca69 Merge pull request #1015 from indesign47/patch-14 
[-] BO : AdminImages manufacturers/suppliers/stores image
 2013-11-26 02:34:25 -08:00
gRoussac 6de541ea1d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-26 11:27:41 +01:00
gRoussac 53b91fc0b7 attribute_anchor_separator 2013-11-26 11:27:25 +01:00
Vincent Augagneur 33b7c554f7 //small fix #PSCSX-39 2013-11-26 10:59:03 +01:00
Kevin Granger 926286eaf9 // fix switch 2013-11-26 10:33:35 +01:00
Damien Metzger 9ad56871de Merge pull request #1004 from djfm/bootstrap 
// when adding a translation pack, do not install translations for modules that are not on the disk
 2013-11-26 01:31:24 -08:00
Vincent Augagneur e3f3f8a58f //oups 2013-11-26 10:25:03 +01:00
Vincent Augagneur 690b6b160a //small js fix 2013-11-26 10:24:19 +01:00
Dh42 3c1f2f045c Adds currency to rich snippets 
The offer will not be displayed without the iso currency. There will be collisions in currencies such as AUD CAD and USD, without the sign.
 2013-11-26 01:37:55 -06:00
gRoussac 8a7d39d800 [-] BO : Undefined on image upload, revert of https://github.com/PrestaShop/PrestaShop/commit/48b7a49b1aea34a2def355ffec1d4c08dfdbdfd6 2013-11-25 22:58:22 +01:00
Jerome Nadaud 47b7bf5458 // Adding some style to tinymce 2013-11-25 19:05:58 +01:00
gRoussac 695aaa73fb [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/696 2013-11-25 19:03:15 +01:00
Jerome Nadaud 5eae3acee3 // Add new value button at attribute controller start 2013-11-25 18:29:06 +01:00
Jerome Nadaud 0d6bc850de // Update datepicker button with period buttons select 2013-11-25 18:24:06 +01:00
Jerome Nadaud a81ee41374 // Fix missing saving button in products 2013-11-25 18:01:01 +01:00
Kevin Granger d9e53486a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:56:11 +01:00
Kevin Granger 4c8c48f441 // admin import 2013-11-25 17:55:59 +01:00
gRoussac 9e7a275d8d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:39:59 +01:00
gRoussac a0373eed7a [-] MO : Dateofdelivery Fix bug #PNM-1773 when a product has an available date 2013-11-25 17:39:46 +01:00
Jerome Nadaud 48be09d82d // Missing Base uri in uploader helper 2013-11-25 17:37:26 +01:00
Kevin Granger 0e3504f3b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:17:15 +01:00
Kevin Granger fae1fd58a9 // tweak on switch + admin import 2013-11-25 17:16:59 +01:00
Jerome Nadaud 2b0224efe1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:09:20 +01:00
Jerome Nadaud 89f794ae5e // Missing Typo 2013-11-25 17:09:08 +01:00
Damien Metzger 553568a72d // Change message for permissions in the installer 2013-11-25 17:06:25 +01:00
Jerome Nadaud 12c89c1e2d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 16:45:40 +01:00
Jerome Nadaud a98002083f // Now you can click on folder icon to expand or collapse 2013-11-25 16:45:26 +01:00
rGaillard 375981378f // typo 2013-11-25 16:44:08 +01:00
Damien Metzger acdb7b0c13 // Fixed invisible chars in CSV examples 2013-11-25 16:13:46 +01:00
Jerome Nadaud 0061801bed Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 16:05:31 +01:00
Jerome Nadaud b2cee0426a // Default category was not selected 2013-11-25 16:05:18 +01:00
gRoussac 620441997c [-] CORE : No Exception when CONTENT_LENGTH is no set 2013-11-25 16:05:07 +01:00
Jerome Nadaud d30e376354 // Remove "no name" error on new product 2013-11-25 14:42:21 +01:00
Damien Metzger 93cbad2a05 [*] BO : replaced age by total spent in the customer list 2013-11-25 14:30:04 +01:00
Jérôme Nadaud 00e5bfe26e // Updating current branch 2013-11-25 14:22:59 +01:00
ccauwandJerome Nadaud eb312455e5 [-] BO : Double separator in function createTemplate() 
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
 2013-11-25 14:19:21 +01:00
Jérôme Nadaud 77f691b6ee Merge pull request #1028 from wfpaisa/patch-5 
[-] FO, Bug fix, css and js files contain a double /
 2013-11-25 04:32:19 -08:00
Felipe Uribe b2e685e126 [-] FO, Bug fix double/ 
files containing a double /, example:
{$css_dir}/b... = cssdir//bootstrap_lib/bootstrap.css
to
{$css_dir}b... = = cssdir/bootstrap_lib/bootstrap.css
 2013-11-25 07:19:37 -05:00
Damien Metzger b8c77d90b4 [*] BO : Added countries to order list (idea from PhpMadman https://github.com/PrestaShop/PrestaShop/pull/909) 2013-11-25 12:17:40 +01:00
Francois Gaillard f68c31e989 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 12:13:10 +01:00
Francois Gaillard 90d3dff381 [-] MO : Bug fix - Blockwishlist, Product image link in BO 2013-11-25 12:12:57 +01:00
Jerome Nadaud 611cfd90a0 [-] BO : FixBug #PSCSX-40 categories unchanged after select a new home category 2013-11-25 12:08:34 +01:00
Gregory Roussac c613ca5a7d Merge pull request #1009 from indesign47/patch-6 
[+] BO : AdminProducts add import products
 2013-11-25 03:00:08 -08:00
gRoussac c5184a6e0f [-] BO : AdminImport new supplier csv 2013-11-25 11:55:14 +01:00
Gregory Roussac b0436adb46 Merge pull request #1023 from indesign47/patch-19 
[-] BO : AdminImport add image suppliers
 2013-11-25 02:45:01 -08:00
Damien Metzger dec1555b32 // Fixed dashboard simulation mode switch 2013-11-25 11:30:30 +01:00
Jerome Nadaud 5afde2163b [+] MO : Add name value when hover color in blocklayered.tpl - Thanks @codeurWeb 2013-11-25 11:10:42 +01:00
Jerome Nadaud d1c9ec8e09 // Changing Typo preserving backward compatibility 2013-11-25 11:02:40 +01:00
Gregory Roussac f588a2c0c3 Merge pull request #1024 from indesign47/patch-20 
[-] BO : AdminImport products add missing fields
 2013-11-25 01:54:34 -08:00