dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9eefcfd0588a8552f109d27992fa3e4881c847b1
PrestaShop/modules
T
History
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
..
addsharethis
//Fix addsharethis error
2013-11-15 15:38:51 +01:00
bankwire
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockadvertising
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockbanner
// Install
2013-11-18 19:22:10 +01:00
blockbestsellers
// Update blockbestsellers
2013-11-20 10:28:39 +01:00
blockcart
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
blockcategories
// Fix small error
2013-11-18 14:29:32 +01:00
blockcms
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockcmsinfo
// Update fixture in blockcms
2013-11-18 19:26:30 +01:00
blockcontact
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockcontactinfos
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockcurrencies
// Better cache depth management for smarty
2013-09-20 10:26:58 +02:00
blockcustomerprivacy
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockfacebook
// small clean
2013-11-13 11:58:11 +01:00
blocklanguages
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blocklayered
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
blocklink
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockmanufacturer
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockmyaccount
// same for unregister hook
2013-07-01 16:30:53 +02:00
blockmyaccountfooter
[-] MO : My account column block should not display module icon in list
2013-08-08 10:38:39 +02:00
blocknewproducts
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blocknewsletter
// removed superfluous mail files
2013-11-21 10:26:02 +01:00
blockpaymentlogo
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockpermanentlinks
// W3C
2013-06-06 15:27:29 +02:00
blockreinsurance
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockrss
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blocksearch
// typo, sorry about this
2013-11-18 14:35:39 +01:00
blocksharefb
[*] MO : New modules version since 1.5.6.0
2013-11-04 11:57:31 +01:00
blocksocial
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockspecials
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
blockstore
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blocksupplier
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blocktags
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blocktopmenu
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
blockuserinfo
[-] FO: Fixed bug PrestaShop 1.5.4.1 Catalog Mode Display Incorrect Header (mis-aligned) - #PSCFV-9327
2013-06-17 16:35:16 +02:00
blockviewed
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
blockwishlist
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
carriercompare
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
cashondelivery
[+] MO : Bankwire, cashondelivery, cheque disable confirm button on click
2013-08-19 16:37:48 +02:00
cheque
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
crossselling
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
dashactivity
// Reverted revert
2013-11-18 17:00:23 +01:00
dashgoals
// Some bootstrap changes in controllers
2013-11-20 18:44:20 +01:00
dashproducts
added default configuration value for dashproducts
2013-11-13 09:27:48 +01:00
dashtrends
[*] BO : Added simulation mode to the dashboard
2013-11-15 18:07:23 +01:00
dateofdelivery
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
editorial
[-] MO : Editorial could not delete image
2013-09-18 16:16:36 +02:00
favoriteproducts
//replace some escape:'html' by addslashes in .tpl with javascript
2013-06-28 11:06:08 +02:00
feeder
[*] MO : New modules version since 1.5.6.0
2013-11-04 11:57:31 +01:00
followup
// removed superfluous mail files
2013-11-21 10:26:02 +01:00
gapi
// Fixed bootstrap mode for modules
2013-11-05 17:29:51 +01:00
graphnvd3
// moved nv.d3.css to vendor directory
2013-11-05 17:15:36 +01:00
gridhtml
// Stats cleaning
2013-10-29 14:36:27 +01:00
homefeatured
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
homeslider
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
loyalty
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
mailalerts
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
newsletter
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
pagesnotfound
// update tabs stats
2013-09-17 17:49:49 +02:00
productcomments
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
productpaymentlogos
updates and fixes 14.11.2013
2013-11-14 18:08:05 +02:00
productscategory
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
producttooltip
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
pscleaner
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
referralprogram
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
sekeywords
// update tabs stats
2013-09-17 17:49:49 +02:00
sendtoafriend
// removed superfluous mail files
2013-11-21 10:26:02 +01:00
statsbestcategories
// Stats cleaning
2013-10-29 14:36:27 +01:00
statsbestcustomers
// update tabs stats
2013-09-17 17:49:49 +02:00
statsbestmanufacturers
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsbestproducts
// Stats cleaning
2013-10-29 15:29:55 +01:00
statsbestsuppliers
// update tabs stats
2013-09-17 17:49:49 +02:00
statsbestvouchers
// Stats cleaning
2013-10-29 15:29:55 +01:00
statscarrier
// update tabs stats
2013-09-17 17:49:49 +02:00
statscatalog
// update tabs stats
2013-09-17 17:49:49 +02:00
statscheckup
// Stats cleaning
2013-10-29 15:29:55 +01:00
statsdata
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
statsequipment
// no line breaks in $this->l()
2013-11-15 10:44:01 +01:00
statsforecast
// Stats cleaning
2013-10-29 14:36:27 +01:00
statslive
// update tabs stats
2013-09-18 17:47:42 +02:00
statsnewsletter
// update tabs stats
2013-09-17 17:49:49 +02:00
statsorigin
// update tabs stats
2013-09-17 17:49:49 +02:00
statspersonalinfos
// Code cleaning stats modules
2013-10-28 13:39:39 +01:00
statsproduct
// no line breaks in $this->l()
2013-11-15 10:44:01 +01:00
statsregistrations
// update stats tab
2013-09-16 17:51:03 +02:00
statssales
// update stats tab
2013-09-16 17:51:03 +02:00
statssearch
// update tabs stats
2013-09-17 17:49:49 +02:00
statsstock
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
statsvisits
// update tabs stats
2013-09-18 17:47:42 +02:00
themeconfigurator
fixes for compatibility
2013-11-20 19:31:17 +02:00
trackingfront
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
vatnumber
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
watermark
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-21 17:43:51 +01:00
.htaccess
// MERGE with 1.4 r7770
2011-07-28 09:20:57 +00:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00