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

69 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
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
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
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard 74a766d145 [-] MO: Fix max lenght allowed for 3 field on homeslider configuration #PSCFV-7897 2013-02-25 19:50:53 +01:00
Damien Metzger 8dc7d05272 [-] MO : you should be able to empty values in homeslider #PSCFV-7407 2013-02-21 11:05:48 +01:00
Rémi Gaillard 4a8f2f8970 [*] MO: Add smarty cache on homeslider 2013-01-07 17:39:06 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard 41ca79cc77 [-] Core: the gift wrapping taxes is now handled by tax rules group 2012-12-21 18:01:43 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Damien Metzger 27eaed42bd [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16:56 +01:00
Krystian Podemski 6c75500095 PNG in homeslider 
Allow to upload png files in homeslider
 2012-11-21 17:35:15 +01:00
lLefevre ccf15ffddd [-] BO : fix #PSCFV-4401 2012-09-28 14:50:05 +00:00
lLefevre 9ca44ba0f4 [-] FO : mobile theme : fix #PSCFV-4275 : delete calls to css and js not used 2012-09-24 12:47:49 +00:00
vAugagneur 100a17d6e5 [-] MO : fixed bug #PSCFV-4256 2012-09-21 14:38:04 +00:00
dMetzger aeb59f4a51 // 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 c0389a263c [-] MO : fixed image upload in homeslider #PSCFV-3730 2012-08-23 17:56:16 +00:00
dMetzger 3c76b22e60 // variable missing its $ 2012-08-23 07:22:06 +00:00
dMetzger 1926c4c405 // 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
lLefevre 0b8dc08acf [-] BO : Fix W3C errors 2012-07-06 14:32:35 +00:00
mDeflotte 313b98469d // Remove unusefull "unregisterhook" from the method uninstall of the module homeslider 2012-05-25 09:41:14 +00:00
vAugagneur d18746402a //remove mobile theme 2012-05-09 20:57:15 +00:00
bMancone 195ccbda9e // Fixed #PSCFV-1559 and changed default values of bxSlider 2012-04-30 09:08:21 +00:00
rMalie c3a44cdf37 // Add hooks for shop duplication, fix homeslider duplication #PSTEST-1173 2012-04-25 09:04:38 +00:00
bMancone a026cea57c // Fixed #PSFV-894 : homeslider improvements 2012-04-23 16:01:10 +00:00
bMancone 75cbc403eb // Fixed #PSFV-669 2012-03-22 13:58:06 +00:00
bMancone 2d0c219d0d // Updated homeslider module : added loop configuration 2012-03-14 16:03:26 +00:00
lLefevre 1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
mDeflotte 3c6ca0b5a1 [-] MO : #PSFV-640 - Fix bug with image upload 2012-03-08 16:46:42 +00:00
mDeflotte 11b36e805b [-] MO : #PSFV-640 - Fatal error in HomeSlider module 2012-03-08 16:17:20 +00:00
bMancone a924852514 // Fixed #PSFV-626 2012-03-06 13:39:26 +00:00
mBertholino 3ac2f335bf [*] MO : updated module homeslider for mobile theme 2012-02-28 09:11:27 +00:00
bMancone 3fc9f8f29e // Norm & fixed typo 2012-02-27 09:35:02 +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
bMancone ac32e67dc6 // Improved homeSlider 2012-01-03 14:58:02 +00:00