dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7019af3a11fca9c117818dbfe2c4e4b8d663caaa
PrestaShop/modules
History
Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
..
bankwire
//removed unused code
2013-09-19 17:00:50 +02:00
blockadvertising
// Config files were translated in french
2013-08-20 17:49:05 +02:00
blockbestsellers
//blockcategories is now using bootstrap design
2013-09-20 11:18:30 +02:00
blockcart
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
blockcategories
//blockcategories is now using bootstrap design
2013-09-20 11:18:30 +02:00
blockcms
// Fix cms_block creation loop on shop addition
2013-08-27 09:52:14 +02:00
blockcontact
/small fix
2013-09-20 11:38:39 +02:00
blockcontactinfos
//blockcontactinfos is now using bootstrap design
2013-09-20 11:46:02 +02:00
blockcurrencies
// Better cache depth management for smarty
2013-09-20 10:26:58 +02:00
blockcustomerprivacy
//blockcustomerprivacy now use bootstrap design
2013-09-20 13:22:35 +02:00
blocklanguages
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blocklayered
Fix pagination incompatibility
2013-09-25 18:33:58 +02:00
blocklink
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
blockmanufacturer
//blockmanufacturer is now using bootstrap design
2013-09-20 14:56:41 +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-09-30 11:01:23 +02:00
blocknewsletter
//blockrss now use boostrap design
2013-09-20 17:14:50 +02:00
blockpaymentlogo
//blockpaymentlogo now use boostrap design
2013-09-20 17:02:15 +02:00
blockpermanentlinks
// W3C
2013-06-06 15:27:29 +02:00
blockreinsurance
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blockrss
//blockrss now use boostrap design
2013-09-20 17:14:50 +02:00
blocksearch
[-] MO : fixed smarty cache on blocksearch #PSCFV-8739
2013-08-21 15:13:49 +02:00
blocksharefb
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blocksocial
//blocksocial now use boostrap design
2013-09-20 17:22:15 +02:00
blockspecials
//blockspecials now use bootstrap design
2013-09-20 17:51:24 +02:00
blockstore
//now blockstore use bootstrap design
2013-09-23 09:48:59 +02:00
blocksupplier
//blocksupplier now use bootstrap design
2013-09-23 09:52:58 +02:00
blocktags
//blocktags now use boostrap design
2013-09-23 10:03:28 +02:00
blocktopmenu
[+] MO : add link to all manufacturer page and the feature to show All Suppliers
2013-09-02 11:57:16 +02: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
//blockviewed now use boostrap design
2013-09-23 10:06:43 +02:00
blockwishlist
[-] MO : Missing image in my account for MODULE WishList
2013-08-07 10:56:09 +02:00
carriercompare
//carriercompare now use bootstrap design
2013-09-23 10:24:26 +02:00
cashondelivery
[+] MO : Bankwire, cashondelivery, cheque disable confirm button on click
2013-08-19 16:37:48 +02:00
cheque
//cheque module now use boostrap design
2013-09-23 15:10:46 +02:00
crossselling
//crossselling module now use boostrap design
2013-09-23 15:22:42 +02:00
dashactivity
[*] BO : Customers KPIs
2013-09-24 15:32:05 +02:00
dashproducts
// Fixed most viewed conversion rate
2013-09-12 18:24:18 +02:00
dashtrends
// Fixed typo
2013-09-23 14:40:25 +02:00
dateofdelivery
// Config files were translated in french
2013-08-20 17:49:05 +02: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
Merge pull request #393 from PrestaEdit/patch-33
2013-05-23 06:25:19 -07:00
followup
// Config files were translated in french
2013-08-20 17:49:05 +02:00
gapi
// Gapi choose between 1.3 and 3.0 versions
2013-09-12 18:24:17 +02:00
graphnvd3
// Finished nvd3 chart
2013-09-20 18:12:10 +02:00
gridhtml
// update tabs stats
2013-09-17 17:49:49 +02:00
homefeatured
// Config files were translated in french
2013-08-20 17:49:05 +02:00
homeslider
// Fixed upgrade of homeslider module
2013-08-08 10:47:03 +02:00
importerosc
fix value of date_add
2013-09-04 16:40:12 +02:00
loyalty
[-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore
2013-09-25 14:43:30 +02:00
mailalerts
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
newsletter
//newsletter now use bootstrap design
2013-09-24 17:26:28 +02:00
pagesnotfound
// update tabs stats
2013-09-17 17:49:49 +02:00
productcomments
[-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice
2013-09-27 11:27:58 +02:00
productscategory
//productscategory now use bootstrap design
2013-09-26 15:09:18 +02:00
producttooltip
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
pscleaner
//MERGE branche release
2013-08-26 10:59:36 +02:00
referralprogram
//MERGE branche release
2013-08-26 10:59:36 +02:00
sekeywords
// update tabs stats
2013-09-17 17:49:49 +02:00
sendtoafriend
[-] MO sendtoafriend: The method used to check all required input fields could lead to errors
2013-09-27 16:08:00 +02:00
shopimporter
Merge pull request #707 from sjousse/development
2013-09-09 08:31:15 -07:00
statsbestcategories
// update tabs stats
2013-09-17 17:49:49 +02: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
// update tabs stats
2013-09-17 17:49:49 +02:00
statsbestsuppliers
// update tabs stats
2013-09-17 17:49:49 +02:00
statsbestvouchers
// update tabs stats
2013-09-17 17:49:49 +02: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
// update tabs stats
2013-09-17 17:49:49 +02:00
statsdata
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsequipment
// update tabs stats
2013-09-17 17:49:49 +02:00
statsforecast
// update tabs stats
2013-09-18 17:47:42 +02: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
// update tabs stats
2013-09-17 17:49:49 +02: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
// update tabs stats
2013-09-17 17:49:49 +02:00
statsvisits
// update tabs stats
2013-09-18 17:47:42 +02:00
trackingfront
// Config files were translated in french
2013-08-20 17:49:05 +02:00
vatnumber
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
watermark
[-] Core: delete lang files
2013-03-21 14:15:55 +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