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

67 Commits

Author SHA1 Message Date
TMMeilleur
689fcb005d small fixes 2013-12-04 10:08:35 +02:00
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
gRoussac
8dd951c2df [*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory 2013-11-11 00:36:17 +01:00
Vincent Augagneur
d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01: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
Vincent Augagneur
8144935d76 //btn-primary => btn btn-default thanks @Shipow 2013-10-22 09:12:01 +02:00
gRoussac
a05c748e81 // addJqueryPlugin receives array in first argument 2013-10-21 15:05:03 +02:00
gRoussac
a9e45fccf3 [-] MO : ScrollTo not loaded 2013-10-21 14:35:23 +02:00
Vincent Augagneur
0b35c5506c //crossselling module now use boostrap design 2013-09-23 15:22:42 +02:00
Damien Metzger
ad2702e609 // Config files were translated in french 2013-08-20 17:49:05 +02:00
Damien Metzger
d2440df8ca [*] FO : added smarty cache on productscategory 2013-07-03 15:49:32 +02:00
Damien Metzger
f78f3dc3a8 [*] FO : added smarty cache on crossselling module 2013-07-03 15:30:31 +02:00
Rémi Gaillard
dfd2b8f604 [-] Core: delete lang files 2013-03-21 14:15:55 +01:00
sLorenzini
919439e1b9 [-] FO: fixed bug Module crosselling not working properly (Scroll / JS) - #PSCFV-8080 2013-03-06 10:39:26 +01:00
Vincent Augagneur
83183a7ee0 Merge pull request #103 from damonsk/patch4 
[*] MO : crossselling - moved javascript include into header hook.
 2013-02-05 01:42:46 -08:00
Vincent Augagneur
9be771e9d5 Merge pull request #156 from PrestaEdit/patch-5 
[*] MO: choose the number of products...
 2013-01-07 02:23:45 -08:00
Jonathan Danse
b08e3a43ff [-] MO: coding standard 2013-01-07 11:11:28 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a35469768f //added translation 2012-12-28 09:27:12 +01:00
Damon Skelhorn
144081ae9e [-] MO : crossselling - Added in condition to test element is present. 2012-12-18 14:38:48 +00:00
vAugagneur
17350c6149 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
Damon Skelhorn
403ce760b2 [*] MO : crossselling - moved javascript include into header hook. 2012-12-18 11:52:25 +00:00
vAugagneur
76b435b639 //revert all config.xml 2012-12-06 11:41:52 +01:00
Sarah Lorenzini
31efb947ab // change h4, h5 2012-12-04 17:15:49 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
sLorenzini
ad9677f14d [-] FO : fixed bug #PSCFV-4175 2012-09-27 12:24:18 +00:00
sLorenzini
8a5c034a67 // image source modified again 2012-09-27 11:59:46 +00:00
lLefevre
55adbb5bbb [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
lLefevre
46b391114b [*] TR : update English translations key for Modules 2012-07-12 10:08:13 +00:00
lLefevre
21d507e976 [*] TR : Update English translation : step 1 2012-07-09 09:43:17 +00:00
lLefevre
4134945127 [*] BO : Update Deutsch translations 2012-07-03 16:05:43 +00:00
lLefevre
0d6dd2f8c9 // Add spanish translations 2012-05-23 15:57:25 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
lLefevre
1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
fSerny
641d3847ef // Regen all modules config file (in english this time ^^') 2012-03-14 09:41:04 +00:00
fSerny
4ea89fe96e // Regen all modules config file 2012-03-14 09:37:58 +00:00
vChabot
77774d0d94 // id_category_default is now for multishop 2012-02-27 13:53:52 +00:00
rMalie
8f0257fc87 // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 2012-02-27 12:15:30 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
ca698a6ccd // French translations (by Xavier) 2012-02-15 13:22:27 +00:00
rMalie
eb5b329a28 // Modules langs files moved to modules/*/translations/ folder 2012-02-01 14:42:15 +00:00
bMancone
35738e814d // #PSFV-124 Licenses update 2012-01-04 14:54:25 +00:00
rMalie
c24ff8e9c7 // Normalize + use $this->smarty instead of $this->context->smarty in modules 2011-12-30 14:59:57 +00:00
sThiebaut
beb40fcb05 // maj 2011-12-14 09:17:50 +00:00
mMarinetti
7320307212 [+] Project : default theme added 2011-12-02 15:24:40 +00:00
vKham
5eedee4129 // new icon for adminhome, adminmodules and header 2011-11-21 09:21:26 +00:00
rMalie
e6f45e54a6 // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction() 2011-10-17 09:46:08 +00:00
rMalie
d79fcf00fb // Merge -> revision 9352 2011-10-14 08:20:54 +00:00