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

20546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +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
Jerome Nadaud 2e16a1e5d4 // Better products attributes list button handle 2013-11-21 11:25:09 +01:00
Jerome Nadaud fbe7f236cb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 11:06:21 +01:00
Jerome Nadaud d49f29f79d // Remove subtitle from orders view 2013-11-21 11:06:08 +01:00
Kevin Granger a6e1309a33 Merge pull request #1008 from djfm/cleanup 
// removed superfluous mail files
 2013-11-21 01:41:15 -08:00
fram 931f309b45 // removed superfluous mail files 2013-11-21 10:26:02 +01:00
Jerome Nadaud 89f400d3fc // Remove unnecessary button from shipping options 2013-11-21 10:12:53 +01:00
Jerome Nadaud 24daa6fa05 // Changing add new title button label 2013-11-21 10:04:03 +01:00
Vincent Augagneur d2c600a5e3 //updated .gitignore 2013-11-21 09:51:22 +01:00
Jerome Nadaud 0b47dbca21 // Adding footer to customer requiered fields 2013-11-21 09:46:27 +01:00
Jerome Nadaud 2df142eb89 // Align actions button in customner view 2013-11-21 09:35:44 +01:00
Jérôme Nadaud 033bf745cd Merge pull request #1000 from studiokiwik/sk-ps15x-011 
"---<br />" string is now removed correctly from the end of customization data text
 2013-11-21 00:14:28 -08:00
Kevin Granger d4afcec83f Merge pull request #1005 from djfm/css 
// adjust markup in AdminTranslationsController
 2013-11-20 12:10:22 -08:00
Kevin Granger 104ae93936 // tweak nav sidebar 2013-11-20 19:25:11 +01:00
Jerome Nadaud a536833f52 // Some bootstrap changes in controllers 2013-11-20 18:44:20 +01:00
Rémi Gaillard c2e3e1295c Merge pull request #1006 from TMMeilleur/bootstrap 
// Added all themes for themeconfigurator and fixed Rich Snipet (availability)
 2013-11-20 09:37:56 -08:00
TMMeilleur f58018b6e4 fixes for compatibility 2013-11-20 19:31:17 +02:00
TMMeilleur 01428f9a31 added all themes for themeconfigurator 2013-11-20 19:25:12 +02:00
Jerome Nadaud a5cc9efa76 // Languages boostraping 2013-11-20 18:20:19 +01:00
fram 5bd2439e43 // css in AdminTranslationsController 2013-11-20 18:07:51 +01:00
Vincent Augagneur a3282025cf //referralprogram retro compat 1.5 when using helper form in module configuration 2013-11-20 18:05:56 +01:00
Vincent Augagneur 6ec8e4e70e mailalerts retro compat 1.5 when using helper form in module configuration 2013-11-20 17:57:58 +01:00
Vincent Augagneur 64cfe559f1 //loyalty retro compat 1.5 when using helper form in module configuration 2013-11-20 17:56:11 +01:00
Jerome Nadaud fc5b3b1d29 // Localization bootstraping 2013-11-20 17:52:05 +01:00
Jerome Nadaud 5b6cfa3cdb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 17:29:46 +01:00
Jerome Nadaud 12f3a150a7 // bootraping of import csv view 2013-11-20 17:29:35 +01:00
Kevin Granger 9e2dac8ece //fix css login 2013-11-20 17:24:52 +01:00
Damien Metzger 63f2082da3 [-] FO : fixed tax rules cache 2013-11-20 16:49:48 +01:00
Damien Metzger 4cc99ed9b6 // more image fixes 2013-11-20 16:33:34 +01:00
Damien Metzger 2d60a95fc3 // Fixed slider image 2013-11-20 16:32:14 +01:00
Damien Metzger 8d0b1e9602 [*] BO : Added combination ean13 in the backend search #PSCFV-10436 2013-11-20 16:30:25 +01:00
Gregory Roussac 6d0de6e29e Merge pull request #1003 from priyank/patch-1 
[-] FO : Homefeatured adding a position order by clause.
 2013-11-20 07:29:19 -08:00
Rémi Gaillard df4cc9d876 Merge pull request #1002 from TMMeilleur/bootstrap 
//fixed banners style
 2013-11-20 07:28:51 -08:00