dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,579 Commits 9 Branches 19 Tags
4044ba853ec7807bc9d145eb1b554ca2e5689ce2
Commit Graph
20579 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
gRoussac ee98947e6b // manual merg of https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 and 2013-11-21 18:59:28 +01:00
Damien Metzger 47531534fc // Updated Addons API call in the search 2013-11-21 18:34:42 +01:00
Kevin Granger f7ad627b4d // fix pagination Tax Rules Group 2013-11-21 18:28:25 +01:00
Damien Metzger d89db6de45 // Fixed warning 2013-11-21 17:46:29 +01:00
Damien Metzger 3a02d6f281 [-] BO : Fixed potential errors with untranslated admin tabs #PSCFV-8104 2013-11-21 17:46:28 +01:00
Kevin Granger 5976a471a7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 17:43:59 +01:00
Kevin Granger 9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +01:00
Damien Metzger 8bdc6c9a51 [*] FO : Added getCategory getter in ProductController #PSCFV-8408 2013-11-21 16:01:50 +01:00
Kevin Granger 6431f559d7 // tree header improvement WIP 2013-11-21 15:01:54 +01:00
Damien Metzger 9c5303df1d // Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction) 2013-11-21 14:57:55 +01:00
Damien Metzger 26b90d5670 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2] 2013-11-21 14:44:00 +01:00
gRoussac d6e52bdecb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-21 14:20:00 +01:00
gRoussac 3ab28374e6 [-] BO : Remove warning with open_basdir on module list 2013-11-21 14:17:55 +01:00
Damien Metzger 9f1c39a7d6 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1] 2013-11-21 12:32:51 +01:00
Jerome Nadaud 794f729c5d // Show more info content if <= 4 2013-11-21 12:23:54 +01:00
Kevin Granger b10d50ef09 // fixs on horizontal nav + add icon on footer links 2013-11-21 12:15:21 +01:00
Fabio Chelly 5f47526ed2 [-] FO : Fixed bug #PSCFV-11076 2013-11-21 12:13:30 +01:00
Jerome Nadaud 9229d6cb52 // Features and attributes title and buttons 2013-11-21 12:10:15 +01:00