dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,625 Commits 9 Branches 19 Tags
0d6bc850deba4fa96754a0e68d5d30cbc4e33352
Commit Graph

20625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ccauw 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
Gregory Roussac c6e1fbbae9 Merge pull request #1010 from indesign47/patch-8 
[+] BO : AdminAttributes add import combinations
 2013-11-25 01:41:12 -08:00
Jerome Nadaud bc083ece83 // Manual merge from development branch 2013-11-25 10:25:32 +01:00
Jérôme Nadaud 652c370a1d Merge pull request #1025 from wfpaisa/patch-3 
double ../../
 2013-11-25 00:04:09 -08:00
Jérôme Nadaud 9f5f8561f7 Merge pull request #1027 from wfpaisa/patch-4 
double ../
 2013-11-25 00:02:56 -08:00
Felipe Uribe f7b1fa88fa double ../ 
header.tpl=
{$css_dir}/jquery/uniform.default.css |
..homedir//jquery/uniform.default.css

ok=
{$css_dir}jquery/uniform.default.css |=
homedir/jquery/uniform.default.css
 2013-11-24 19:42:14 -05:00
Felipe Uribe 064b9f5ce5 double ../../ 
correct ../
 2013-11-24 17:29:15 -05:00
indesign47 6ef28542c9 [-] BO : AdminImport products add missing fields 
Add to file header : Width, Height, Depth, Minimal quantity, Visibility, Additional shipping cost, Unity, Unit price ratio
 2013-11-24 23:10:10 +01:00
indesign47 d6d2ef6906 [-] BO : AdminImport add image suppliers 2013-11-24 22:48:27 +01:00
Kevin Granger 4044ba853e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 18:57:15 +01:00
Kevin Granger 0572fc09e8 // tweaks list + customers 2013-11-22 18:56:52 +01:00
Jérôme Nadaud 1337407131 Merge pull request #1019 from djfm/translations 
Translations
 2013-11-22 09:12:55 -08:00
Jérôme Nadaud 0716ae1afc Merge pull request #1018 from indesign47/patch-15 
[-] MO : bankwire add translation for fields
 2013-11-22 09:10:35 -08:00
Jérôme Nadaud d4dc67bc61 Merge pull request #1021 from indesign47/patch-17 
[-] MO : cheque add translation for fields
 2013-11-22 09:09:52 -08:00
Jérôme Nadaud 7f3305d5fc Merge pull request #1020 from indesign47/patch-16 
[-] MO : bankwire add translation for fields
 2013-11-22 09:08:36 -08:00