dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
889a2006ecc7e70f5076f75d200459c5bf64703c
PrestaShop/modules
History
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
..
addsharethis
// addsharethis cache
2013-11-02 15:41:40 +01:00
bankwire
//missing file btn-primary => btn btn-default
2013-10-22 09:15:46 +02:00
blockadvertising
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blockbestsellers
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blockcart
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
blockcategories
// Fixed warning and prepared next commit
2013-10-31 15:09:14 +01:00
blockcms
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
blockcontact
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blockcontactinfos
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blockcurrencies
// Better cache depth management for smarty
2013-09-20 10:26:58 +02:00
blockcustomerprivacy
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02: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-10-14 12:21:29 +02:00
blocklink
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blockmanufacturer
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02: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
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
blocknewsletter
// -> mailsrc branch
2013-10-30 15:02:06 +01:00
blockpaymentlogo
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blockpermanentlinks
// W3C
2013-06-06 15:27:29 +02:00
blockquickview
tm theme
2013-10-31 15:51:25 +02:00
blockreinsurance
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blockrss
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blocksearch
[-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities
2013-11-03 22:59:04 +01:00
blocksharefb
[*] MO: blocksharefb optimization
2013-10-28 23:24:32 +01:00
blocksocial
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blockspecials
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
blockstore
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blocksupplier
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blocktags
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blocktopmenu
// English
2013-10-29 14:37:55 +00: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
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
blockwishlist
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
carriercompare
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
cashondelivery
[+] MO : Bankwire, cashondelivery, cheque disable confirm button on click
2013-08-19 16:37:48 +02:00
cheque
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
crossselling
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
dashactivity
// Fixed traffic sources chart on dashboard
2013-10-29 16:38:40 +01:00
dashgoals
// Code review
2013-10-24 17:49:18 +02:00
dashproducts
// Fixed product images on the dashboard
2013-10-29 16:17:40 +01:00
dashtrends
// dashboard improvements
2013-10-24 15:04:06 +02:00
dateofdelivery
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +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
// rewrited urls for feeder module
2013-10-24 17:54:44 +02:00
followup
// -> mailsrc branch
2013-10-30 15:02:06 +01:00
gapi
// Gapi choose between 1.3 and 3.0 versions
2013-09-12 18:24:17 +02:00
graphnvd3
// graph update
2013-10-16 12:18:27 +02:00
gridhtml
// Stats cleaning
2013-10-29 14:36:27 +01:00
homefeatured
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
homeslider
homeslider stores slider about multistore with virtual uri
2013-10-28 14:09:35 +01:00
loyalty
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
mailalerts
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
newsletter
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02: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-04 14:43:01 +01:00
productscategory
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
producttooltip
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
pscleaner
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
referralprogram
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
sekeywords
// update tabs stats
2013-09-17 17:49:49 +02:00
sendtoafriend
// -> mailsrc branch
2013-10-30 15:02:06 +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
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
statsequipment
// update tabs stats
2013-09-17 17:49:49 +02: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
// update tabs stats
2013-09-17 17:49:49 +02: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
trackingfront
[-] MO : Trackingfront, could not load employee stats date
2013-10-12 23:24:32 +02:00
vatnumber
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
watermark
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +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