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

28 Commits

Author SHA1 Message Date
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
fchellypresta 71139df65f Merge pull request #796 from PhpMadman/patch-1 
[*] BO: #PNM-1472 Changed label and transparency range check to 1
 2013-11-06 03:06:47 -08:00
Vincent Augagneur d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
gRoussac b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
Vincent Augagneur b38073ad72 //watermark now use bootstrap design 2013-10-23 18:01:23 +02:00
Fabio Chelly d1a7ff50d5 [*] BO Module watermark: minimum transparency level is 1 and not 0. 2013-10-11 10:51:28 +02:00
PhpMadman 18ab409eeb [*] BO: #PNM-1472 Changed label and transparency range check to 1 
Changed label to 1-100 since, there is no need to set transparency to 0, since it will pretty much will be invisible already at 1
 2013-10-04 10:38:03 +02:00
Fabio Chelly ea57b3fdd1 [-] MO watermark: original pictures are now protected through htaccess 
#PNM-109
 2013-10-03 15:32:10 +02:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rGaillard 4e5f28f6c1 // Fix PSCFV-3933 2012-09-06 15:43:45 +00:00
fBrignoli 8882b67de8 [-] MO : Watermark - Bug Fixed #PSCFV-2770 - Watermark is not working 2012-07-25 09:30:56 +00:00
lLefevre f97093af7a [*] MO : change calls method Tools::displayError() by $name_module->l() && Translations 2012-05-09 10:06:23 +00:00
vAugagneur c91279f459 //remove useless code 2012-05-03 16:25:15 +00:00
rMalie 4f5665d0c7 // Normalize 2012-03-05 10:31:27 +00:00
rMalie 14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie 91aae3e665 // Improve multishop API 2012-02-23 15:39:44 +00:00
mMarinetti 1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
rMalie 84f4d0838c [*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead 2012-01-23 10:21:51 +00:00
rGaillard 4d36ed0619 // watermark is now multishop 2011-12-21 20:14:46 +00:00
rMalie 91083e190c // Merge -> revision 8800 2011-09-27 14:30:06 +00:00
tDidierjean 7cd878079c [*] BO : Removed size limit for image upload (BL006, CC136) 2011-09-12 09:14:07 +00:00
rMalie d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
tDidierjean 0310674fe0 // Context part 29 2011-08-08 13:17:12 +00:00
rGaillard 8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard d1a13007b9 2011-07-06 10:10:43 +00:00
aFolletete 05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00