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

117 Commits

Author SHA1 Message Date
Damien Metzger c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +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
fram 931f309b45 // removed superfluous mail files 2013-11-21 10:26:02 +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
gRoussac 8d627aa522 [-] MO : Referralprogram Prevent Exception when badly configured 2013-11-18 14:58:17 +01:00
djfm 1aadb10fb2 // English emails 2013-11-06 16:20:19 +00:00
djfm f742e817da // updated English emails: now responsive 2013-11-05 18:10:31 +00:00
Vincent Augagneur d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
djfm 71e3a8a937 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 16:58:17 +00:00
djfm 5372f31b4c // updated English emails 2013-11-04 16:57:50 +00:00
Kevin Granger 889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
gRoussac b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
Rémi Gaillard b9ad576fb0 // -> mailsrc branch 2013-10-30 15:02:06 +01:00
djfm 4f8d153469 // fixed links in new English mails 2013-10-28 08:57:59 +00:00
Sarah Lorenzini f73716f902 // new design for referralprogram mails template 2013-10-25 14:56:34 +02:00
Fabio Chelly b9de912dd3 [-] MO : Fixed bug PNM-1431 - referralprogram Lack the % sign 2013-10-24 09:53:16 +02:00
Vincent Augagneur 8144935d76 //btn-primary => btn btn-default thanks @Shipow 2013-10-22 09:12:01 +02:00
Vincent Augagneur 38a7e90eff //referralprogram now use boostrap design 2013-10-11 14:29:56 +02:00
Vincent Augagneur dec213aecf //now use displayError() in modules 2013-10-02 14:39:41 +02:00
Vincent Augagneur ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Damien Metzger ad2702e609 // Config files were translated in french 2013-08-20 17:49:05 +02:00
Gregory Roussac 942a946147 Merge pull request #497 from romainberger/development 
[*] MO: Referral program: display currency in account page next to the voucher value
 2013-08-07 05:59:29 -07:00
Vincent Augagneur fcc1867a94 //merge 2013-07-30 18:02:30 +02:00
gRoussac a71a5d7c18 [-] MO : Fix bug discount display in mail, manual merge from https://github.com/202-ecommerce/PrestaShop/commit/1d5df338c46aef723d13aef3e213792df6ea92e2 2013-07-18 18:18:57 +02:00
romainberger c94dbb36ce [*] MO: Referral program: display currency in account page next to the voucher value 2013-06-14 11:04:20 +02:00
Damien Metzger ca64179950 // W3C 2013-06-06 15:27:29 +02:00
vAugagneur 3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
vAugagneur 2d2b9f76e0 Merge Pull Request #53 - Thanks @Caleydon 2013-04-23 11:40:08 +02:00
vAugagneur 0786cf617f //change the default color (#db3484) 2013-04-11 17:51:28 +02:00
Rémi Gaillard 36e7eee76b // delete also module emails 2013-03-25 18:08:34 +01:00
Francois Gaillard 6d7ea35e97 // Ignore list updated + fr translations updated 2013-03-25 14:59:01 +01:00
Rémi Gaillard f3dfbda02a [-] Core: delete lang files 2013-03-21 14:15:55 +01:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
gRoussac e385e2d19c [-] MO : Fix bug #PSCFV-7822 could not load tinymce in referral program 2013-03-01 17:16:42 +01:00
Damien Metzger eeb0f504d4 [-] MO : fixed voucher currency in referral program #PSCFV-5950 2013-02-21 12:20:32 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur 321eaa191b //added translation 2012-12-28 09:27:12 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur 4fa7eb6a3d //revert all config.xml 2012-12-06 11:41:52 +01:00
Sarah Lorenzini 2b10fcd712 // change h4, h5 2012-12-04 17:15:49 +01:00
Sarah Lorenzini fda993d05d [-] FO: fix Referral Program Email link fix generates duplicate address in the url - #PSCFV-5853 
Fixed in all languages
 2012-11-27 16:41:52 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
DamienMetzger 33ef60652f [-] MO : fixed referralprogram uninstall #PSCFV-5680 2012-11-21 19:44:14 +01:00
vAugagneur 93c3bad10e [-] MO : fixed bug #PSCFV-4932 2012-10-12 12:21:16 +00:00
dMetzger dea775261c [-] MO : fixed link in referral program #PNM-532 2012-10-03 12:17:40 +00:00
lLefevre f6d41dea32 [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
lLefevre c52c1fa171 // Fix small bug 2012-09-19 09:02:25 +00:00
lLefevre b250b25c98 [*] TR : add Italian translations 2012-09-13 08:50:32 +00:00
lLefevre f0f223455b [*] TR : add Spanish translations 2012-09-13 08:38:07 +00:00
lLefevre 4c75f80236 [*] TR : add Deutsch translations 2012-09-13 08:32:36 +00:00