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

20596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
indesign47 283fd2a9f3 [-] MO : cheque add translation for fields 2013-11-22 18:05:40 +01:00
indesign47 94242412f2 [-] MO : cheque add translation for fields 2013-11-22 18:02:48 +01:00
rGaillard b29a30f033 // small fix 2013-11-22 17:59:32 +01:00
indesign47 e068f7202a [-] MO : bankwire add translation for fields 2013-11-22 17:34:03 +01:00
djfm 01d6d7c279 // clearer message 2013-11-22 16:32:54 +00:00
indesign47 dabc3d359a [-] MO : bankwire add translation for fields 2013-11-22 17:30:37 +01:00
djfm 1c6a58c902 // English 2013-11-22 16:16:59 +00:00
djfm a385e1af42 // remove mod= parameters for translations in the Front-Office 2013-11-22 16:11:37 +00:00
djfm a147806382 // Improved texts and UI in AdminImport 2013-11-22 15:44:49 +00:00
Jerome Nadaud a620c5044f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 16:42:09 +01:00
Jerome Nadaud 3fe6608a62 // Include datetime picker for all admin controllers 2013-11-22 16:41:52 +01:00
rGaillard 88ad2010d6 // add padding and margin to automplete width #PSCFV-5876 2013-11-22 16:41:25 +01:00
Damien Metzger 361450aab9 // Fixed entities on KPIs 2013-11-22 16:15:48 +01:00
Damien Metzger db1c3c22fd [-] BO : Cart rules optimization / Attempt to fix #PSCFV-8895 (need to be double-checked) 2013-11-22 15:59:52 +01:00
djfm af4b258201 // js=1, not '1' 2013-11-22 14:22:26 +00:00
Rémi Gaillard 45525dac71 Merge pull request #1017 from TMMeilleur/bootstrap 
// fixes for cross-browser compability
 2013-11-22 05:50:37 -08:00
Damien Metzger 40d15416c5 [-] FO : exclude external css from CCC #PSCFV-10839 2013-11-22 14:37:27 +01:00
TMMeilleur 2376dd404f fixes for cross-browser compability 2013-11-22 14:55:48 +02:00
Jérôme Nadaud 0a7ea9b124 Merge pull request #1016 from wfpaisa/patch-1 
Update AdminPPreferencesController.php
 2013-11-22 04:28:59 -08:00
Felipe Uribe 5113125a0d Update AdminPPreferencesController.php 
Falta coma:

),
					'PS_DISPLAY_DISCOUNT_PRICE' => array(
 2013-11-22 07:23:09 -05:00
Rémi Gaillard 70180f10d4 Merge pull request #1014 from indesign47/patch-13 
[-] FO : header add translation for fields
 2013-11-22 03:08:04 -08:00
gRoussac dd79348748 [-] BO : getCartsRuleByCode should be retrocompatible 2013-11-22 11:40:47 +01:00
indesign47 6164a0d42c [-] FO : header add translation for fields 2013-11-22 11:37:30 +01:00
gRoussac f7d4dc979f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 11:33:00 +01:00
indesign47 a76578b094 [+] BO : AdminAttributes add import combinations 2013-11-22 09:51:20 +01:00
Damien Metzger a3e84a33f7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 09:50:05 +01:00
Damien Metzger c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
indesign47 569c81c0de [+] BO : AdminProducts add import products 2013-11-22 09:45:15 +01:00
gRoussac ee98947e6b // manual merg of https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 and 2013-11-21 18:59:28 +01:00