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

128 Commits

Author SHA1 Message Date
gRoussac
1dcc5e288c [*] FO : Move header modules to new hook, first part 1/2 2013-12-10 20:52:22 +01:00
gRoussac
99fe216413 [*] FO : Move both sliders module on new hook 2013-12-06 17:05:39 +01: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
Jerome Nadaud
f2b5e6de51 // Themeconfigurator and homeslider 2013-11-18 20:49:52 +01:00
Damien Metzger
f4560d0899 // Install 2013-11-18 20:35:42 +01:00
Damien Metzger
a3e1fdb690 // Install 2013-11-18 19:22:10 +01:00
alexey-svistunov
6f5c9044d3 Added changes from eb94b51 TMMeilleur/PrestaShop 2013-11-08 21:00:00 +02:00
Vincent Augagneur
d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
Kevin Granger
92bd59fbea Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:43:10 +01:00
gRoussac
b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
Vincent Augagneur
e03a86ad05 //homeslider new use bootstrap design 2013-11-04 10:01:29 +01:00
Daniele Giachino
c84689ec71 homeslider stores slider about multistore with virtual uri 2013-10-28 14:09:35 +01:00
Damien Metzger
a9b44884f1 // Fixed upgrade of homeslider module 2013-08-08 10:47:03 +02:00
Vincent Augagneur
c8a67fbc40 [+] CORE : new jquery UI version (1.10.3) 2013-06-25 11:16:04 +02:00
sLorenzini
c62dc3dc7a [-] BO: fixed bug button on module list 2013-06-18 15:39:48 +02:00
sLorenzini
3daf4cdb99 [-] BO: fixed bug #PSCFV-9461 2013-06-18 14:46:09 +02:00
Damien Metzger
d6b884b7b5 [-] MO : removed doubled "/" in homeslider template #PSCFV-9439 2013-06-13 10:34:35 +02:00
Damien Metzger
bc87fc478c // Fix homeslider upgrade 2013-04-25 17:21:19 +02: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
Gregory Roussac
90e42ccc09 [-] FO : Home w3c validation removed "legend" attribute and target="_blank" 2013-03-01 00:25:19 +01:00
Rémi Gaillard
6fc5459214 [-] MO: Fix max lenght allowed for 3 field on homeslider configuration #PSCFV-7897 2013-02-25 19:50:53 +01:00
Damien Metzger
669757f388 [-] MO : you should be able to empty values in homeslider #PSCFV-7407 2013-02-21 11:05:48 +01:00
Rémi Gaillard
5f1dc5d153 [*] MO: Add smarty cache on homeslider 2013-01-07 17:39:06 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
vAugagneur
321eaa191b //added translation 2012-12-28 09:27:12 +01:00
sLorenzini
21eb77fd8f [-] FO : fixed bug [HomeSlider] module homeslider.tpl double slash in image url - #PSCFV-6349 2012-12-27 10:38:12 +01:00
Rémi Gaillard
b4217046ae [-] Core: the gift wrapping taxes is now handled by tax rules group 2012-12-21 18:01:43 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Damien Metzger
7eb764e596 // config.xml in english 2012-12-11 11:19:40 +01:00
Damien Metzger
b7d4321e5a [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16: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
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
Krystian Podemski
0127079357 PNG in homeslider 
Allow to upload png files in homeslider
 2012-11-21 17:35:15 +01:00
lLefevre
8149198b8f // Small fixed 2012-10-04 13:47:40 +00:00
lLefevre
87e45e35a7 [-] BO : fix #PSCFV-4607 2012-10-04 13:33:13 +00:00
lLefevre
dda7bccdba [-] BO : fix #PSCFV-4401 2012-09-28 14:50:05 +00:00
lLefevre
d1e7ca4e7c [-] BO : fix #PSCFV-4469 2012-09-28 07:24:09 +00:00
sLorenzini
43e69c34b4 [-] FO : fixed bug #PSCFV-4368 2012-09-27 09:59:31 +00:00
lLefevre
f6d41dea32 [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
lLefevre
60fccb5a82 [-] FO : mobile theme : fix #PSCFV-4275 : delete calls to css and js not used 2012-09-24 12:47:49 +00:00
vAugagneur
ff4d3be173 [-] MO : fixed bug #PSCFV-4256 2012-09-21 14:38:04 +00:00
lLefevre
4c75f80236 [*] TR : add Deutsch translations 2012-09-13 08:32:36 +00:00
dMetzger
69d5329cb7 // Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780 2012-08-29 09:55:39 +00:00
dMetzger
36f258c5d5 [-] MO : fixed image upload in homeslider #PSCFV-3730 2012-08-23 17:56:16 +00:00
dMetzger
e9c428f101 // variable missing its $ 2012-08-23 07:22:06 +00:00
dMetzger
2f1b34a4f8 // Fixed sql error that occurred in the module duplication when you add a new shop in multishop 2012-08-22 08:58:38 +00:00