dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
bcfd092a1db3cd222701e3bf5dc0cab9db3adfca
PrestaShop/modules
History
Kevin Granger c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
2013-09-13 11:41:14 +02:00
..
bankwire
[+] MO : Bankwire, cashondelivery, cheque disable confirm button on click
2013-08-19 16:37:48 +02:00
blockadvertising
// Config files were translated in french
2013-08-20 17:49:05 +02:00
blockbestsellers
[*] FO : added smarty cache on blockbestsellers
2013-06-28 17:42:43 +02:00
blockcart
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-02 10:00:24 +02:00
blockcategories
[-] FO : fixed html tags that should not appear in blockcategories
2013-08-13 16:22:38 +02:00
blockcms
// Fix cms_block creation loop on shop addition
2013-08-27 09:52:14 +02:00
blockcontact
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blockcontactinfos
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blockcurrencies
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
blockcustomerprivacy
[*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages
2013-07-25 12:26:57 +02:00
blocklanguages
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blocklayered
[-] MO : Fixed a bug when displaying textures
2013-09-12 07:01:55 +02:00
blocklink
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
blockmanufacturer
// Config files were translated in french
2013-08-20 17:49:05 +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
Fix variable context
2013-09-01 22:47:41 +01:00
blocknewsletter
// Config files were translated in french
2013-08-20 17:49:05 +02:00
blockpaymentlogo
// W3C
2013-06-06 15:27:29 +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
// Config files were translated in french
2013-08-20 17:49:05 +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
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
blockspecials
//miss to delete some files
2013-07-02 08:02:05 +02:00
blockstore
// small change in blockstore logo name
2013-08-26 10:33:25 +02:00
blocksupplier
// W3C
2013-06-06 15:27:29 +02:00
blocktags
// W3C
2013-06-06 15:27:29 +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
// Config files were translated in french
2013-08-20 17:49:05 +02:00
blockwishlist
[-] MO : Missing image in my account for MODULE WishList
2013-08-07 10:56:09 +02:00
carriercompare
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
2013-09-10 12:01:38 +02:00
cashondelivery
[+] MO : Bankwire, cashondelivery, cheque disable confirm button on click
2013-08-19 16:37:48 +02:00
cheque
[+] MO : Bankwire, cashondelivery, cheque disable confirm button on click
2013-08-19 16:37:48 +02:00
crossselling
// Config files were translated in french
2013-08-20 17:49:05 +02:00
dashactivity
// Dashboard is almost complete
2013-09-12 18:24:17 +02:00
dashproducts
// Fixed most viewed conversion rate
2013-09-12 18:24:18 +02:00
dashtrends
// Rounded sales on dashboard
2013-09-12 19:26:38 +02:00
dateofdelivery
// Config files were translated in french
2013-08-20 17:49:05 +02:00
editorial
[-] MO : fixed editorial issue when the entity does not exist yet for a shop #PSCFV-9442
2013-06-13 10:31:39 +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
graphartichow
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
graphgooglechart
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
graphvisifire
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
graphxmlswfcharts
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
gridhtml
// Fixed a few UI bugs in the stats
2013-04-22 11:57:36 +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 loyalty : minimum amount is now taken into account when creating discount vouchers
2013-07-19 11:15:14 +02:00
mailalerts
Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop
2013-09-12 10:09:25 +02:00
newsletter
// Config files were translated in french
2013-08-20 17:49:05 +02:00
pagesnotfound
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
productcomments
[-] MO productcomments :
2013-09-06 17:54:12 +02:00
productscategory
// Config files were translated in french
2013-08-20 17:49:05 +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
[-] MO : fix bug #PSCFV-9906 again, bad url parsing
2013-09-05 18:39:07 +02:00
sendtoafriend
[-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not
2013-09-06 11:40:41 +02:00
shopimporter
Merge pull request #707 from sjousse/development
2013-09-09 08:31:15 -07:00
statsbestcategories
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsbestcustomers
[-] MO : multilines translations does not work #PNM-1645
2013-08-20 09:55:44 +02:00
statsbestmanufacturers
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsbestproducts
//remove debug
2013-09-04 14:24:17 +02:00
statsbestsuppliers
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsbestvouchers
// too fast
2013-04-11 17:25:44 +03:00
statscarrier
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statscatalog
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statscheckup
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsdata
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsequipment
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsforecast
// Config files were translated in french
2013-08-20 17:49:05 +02:00
statsgeolocation
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statslive
// Config files were translated in french
2013-08-20 17:49:05 +02:00
statsnewsletter
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsorigin
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statspersonalinfos
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsproduct
[-] BO : remove deprecated parameter when call Tools::displayDate()
2013-05-20 16:55:52 +02:00
statsregistrations
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statssales
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statssearch
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsstock
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
statsvisits
[-] Core: delete lang files
2013-03-21 14:15:55 +01: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