Commit Graph

2908 Commits

Author SHA1 Message Date
Vincent Augagneur a6aed9632a //dashboard data binding first part 2013-09-02 11:43:50 +02:00
Vincent Augagneur 252eb868d9 //dashtrends before dashproducts 2013-09-02 10:15:57 +02:00
Vincent Augagneur d8c4483265 //oups 2013-09-02 10:13:47 +02:00
Vincent Augagneur d0f2a37fff //dashboard module view tpl init 2013-09-02 10:10:20 +02:00
gRoussac a013be8380 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Conflicts:
	modules/blockcart/ajax-cart.js
2013-09-02 10:00:24 +02:00
Vincent Augagneur 10e720b93d //added new modules for dashboard 2013-09-02 09:40:24 +02:00
dlage 5f1e08e7e2 Fix variable context
Avoid attribution to the variable $newProducts inside the if. It caused the code to potentially misbehave throwing errors of:
"variable $newProducts not defined".
2013-09-01 22:47:41 +01:00
sagaradonis 9cd73b411d Update ajax-cart.js
.size() replaced by .length as .size() is outdated
2013-08-31 19:05:14 +05:30
gr4devel 39c8a8fc2d [+] MO : add the option to show all Manufacturer
Add the option to show all Manufacturer in blocktopmenu module.
2013-08-29 21:32:10 +02:00
Jerome Nadaud 40c64b54e2 [+] MO : Mailalerts - Add Total tax paid to order confirmation 2013-08-29 17:13:48 +02:00
Rémi Gaillard 2620242176 // Fix cms_block creation loop on shop addition 2013-08-27 09:52:14 +02:00
sjousse 536bdb550b fix file validation to use PHP native method 2013-08-26 18:23:39 +02:00
Vincent Augagneur ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Rémi Gaillard b7a03bdffa // sometimes image was not the cover one for blocklayered 2013-08-26 10:37:59 +02:00
Rémi Gaillard a23772dfb7 // small change in blockstore logo name 2013-08-26 10:33:25 +02:00
Damien Metzger eb69498d2c // Missing icon 2013-08-21 15:34:32 +02:00
Damien Metzger 4d3fc8c314 [-] MO : fixed smarty cache on blocksearch #PSCFV-8739 2013-08-21 15:13:49 +02:00
Damien Metzger ad2702e609 // Config files were translated in french 2013-08-20 17:49:05 +02:00
Damien Metzger eeb469dda5 [-] FO : fixed bad search redirection #PSCFV-10158 2013-08-20 14:52:53 +02:00
Damien Metzger cf1798d2a1 [-] MO : multilines translations does not work #PNM-1645 2013-08-20 09:55:44 +02:00
Jerome Nadaud f610b0d844 [+] MO : Bankwire, cashondelivery, cheque disable confirm button on click 2013-08-19 16:37:48 +02:00
Jerome Nadaud add997dbba // Traduction error 2013-08-14 18:29:46 +02:00
Damien Metzger f9fdcb1103 [-] FO : fixed html tags that should not appear in blockcategories 2013-08-13 16:22:38 +02:00
Jerome Nadaud 54189a5d97 [-] MO : sendtofriend FixBug Form error 2013-08-09 19:03:43 +02:00
Jerome Nadaud 8be3344e41 // W3C validation error 2013-08-09 18:49:47 +02:00
Jerome Nadaud bc7d16ede6 [-] FO : FixBug generated_date error 2013-08-09 18:48:26 +02:00
Damien Metzger eb0d2d47e4 // The blunder wasn't mine :) 2013-08-09 17:31:00 +02:00
Damien Metzger 971b45e630 // fixed variable that does not exists 2013-08-09 17:21:24 +02:00
Jerome Nadaud a38fe5ddd3 // W3C validation error 2013-08-09 14:10:38 +02:00
Damien Metzger 2820314586 [-] MO : fixed potential warning in pscleaner #PSCFV-10070 2013-08-09 11:40:59 +02:00
Rémi Gaillard 1183b14ea9 [-] MO: no more 1.4 support for blocklayered 2013-08-09 11:24:21 +02:00
Damien Metzger cac7b267e6 [-] MO : fixed category link on blocklayered #PNM-1427 2013-08-09 10:37:23 +02:00
Damien Metzger eed7ceb37a [-] MO : blocklayered also try to find the translations in the translations directory 2013-08-09 10:21:37 +02:00
Damien Metzger 0fc1c9184c [-] MO : added visibility IN ("both", "catalog") in blocklayered 2013-08-09 10:11:01 +02:00
Jerome Nadaud 64698d1590 [-] FO : FixBug generated_date error 2013-08-09 09:10:53 +02:00
Jerome Nadaud d5cdcab859 [-] MO : sendtofriend FixBug Form error 2013-08-08 13:06:18 +02:00
Jerome Nadaud 7d4feac247 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-08 11:17:07 +02:00
Jerome Nadaud 8e72d122e6 [-] MO : blockcategories FixBug html tags in categories link title 2013-08-08 11:16:45 +02:00
Damien Metzger 4709f4a3c0 [-] MO : fixed module upgrade with common version number 2013-08-08 11:03:22 +02:00
Gregory Roussac bb45c93d4f Merge pull request #563 from Prestaworks/patch-12
[-] MO : Fix bug #PNM-1241 with 1.4 translations, url indexing not working for all languages.
2013-08-08 02:00:57 -07:00
Damien Metzger a9b44884f1 // Fixed upgrade of homeslider module 2013-08-08 10:47:03 +02:00
gRoussac c31c2ca0e9 [-] MO: cover image issue with layered block on multishop, thanks @theginie 2013-08-08 10:46:22 +02:00
Jerome Nadaud 55fc51f20b [-] MO : CarrierCompare FixBug #PSCFV-9975 Ajax SSL error 2013-08-08 10:41:22 +02:00
gRoussac 1bfa43fa8b [-] MO : My account column block should not display module icon in list 2013-08-08 10:38:39 +02:00
gRoussac 0f4562eb44 [*] MO : added manufactureres order by name, thanks@Jacky75 2013-08-08 10:24:05 +02:00
Damien Metzger 05946f2932 [-] MO : blocktopmenu should clear cache when adding a new subcategory 2013-08-08 09:35:19 +02:00
Gregory Roussac 942a946147 Merge pull request #497 from romainberger/development
[*] MO: Referral program: display currency in account page next to the voucher value
2013-08-07 05:59:29 -07:00
gRoussac ac21fa9808 [-] MO : Missing image in my account for MODULE WishList 2013-08-07 10:56:09 +02:00
gRoussac 7089ce10ef // remove warnings in blockwishlist 2013-08-06 19:05:08 +02:00
gRoussac dbb2b50555 [-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl 2013-08-06 15:15:03 +02:00