dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,082 Commits 9 Branches 19 Tags
1fc507d8d27160132cfa4db1bea4d8fa227becaa
Commit Graph

2386 Commits

Author SHA1 Message Date
Damien Metzger 1fc507d8d2 // Added configuration checks to the Google Analytics modules 
// Implemented the first real data in the dashboard
 2013-09-02 20:18:51 +02:00
Kevin Granger 268183f4d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 19:05:55 +02:00
Kevin Granger 2f5054cb92 // fix anime dashboard loading 2013-09-02 19:05:34 +02:00
Damien Metzger 63a9fd0236 [*] MO : Added help in the Google Analytics API module 2013-09-02 18:54:39 +02:00
Vincent Augagneur 11cd88cf63 //data bind dashtrends module 2013-09-02 17:25:33 +02:00
Vincent Augagneur 9265676f0d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-02 17:23:00 +02:00
Vincent Augagneur f165dae15d //now you can refresh each dashboard module you want 2013-09-02 17:22:51 +02:00
Damien Metzger 48d7bc890a // Fixed warning in AdminModulesController (variable conflict) 2013-09-02 17:11:41 +02:00
Damien Metzger c1cdc90343 [+] MO : new module Gapi for Google Analytics API 2013-09-02 17:07:19 +02:00
Kevin Granger 121554026c // adjustments on modules dash 2013-09-02 16:41:48 +02:00
Kevin Granger 399f60b900 // BO Dashboard loading et trends 2013-09-02 15:17:05 +02:00
Vincent Augagneur d10a339542 //kevin special commit 2013-09-02 14:47:47 +02:00
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
Vincent Augagneur 10e720b93d //added new modules for dashboard 2013-09-02 09:40:24 +02:00
Jerome Nadaud f610b0d844 [+] MO : Bankwire, cashondelivery, cheque disable confirm button on click 2013-08-19 16:37:48 +02:00
Jerome Nadaud a38fe5ddd3 // W3C validation error 2013-08-09 14:10:38 +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
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
Jerome Nadaud 55fc51f20b [-] MO : CarrierCompare FixBug #PSCFV-9975 Ajax SSL error 2013-08-08 10:41:22 +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 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
Axome 9dfeb1d528 All fields available in the RSS 
Not just link & title but all available fields
 2013-08-05 17:58:49 +02:00
Sarah Lorenzini 166d8a69fa [-] FO: fixed bug shopping cart price misplaced - #9971 2013-08-05 10:21:46 +02:00
Vincent Augagneur fcc1867a94 //merge 2013-07-30 18:02:30 +02:00
Jérôme Nadaud 7d57255b70 [-] BO : FixBug #PSCFV-9959 file_get_contents error 2013-07-30 10:27:55 +02:00
Damien Metzger 192940946d // Fixed pscleaner method 2013-07-30 09:21:41 +02:00
Gregory Roussac 5f791dc839 Merge pull request #541 from indesign47/patch-4 
[-] MO : products comments impossible if quantity > 0
 2013-07-29 09:36:32 -07:00
Jérôme Nadaud 72dc8b943f [-] FO : FixBug #PSCFV-9961 Remove wishlists icon 2013-07-29 17:58:31 +02:00
Jérôme Nadaud 23e0467993 [-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date 2013-07-26 11:48:18 +02:00
gRoussac d2acb9dedb [-] MO : Fix sort order for combinations, report of pull request https://github.com/PrestaShop/PrestaShop/pull/364 2013-07-25 18:15:06 +02:00
gRoussac 9848468f3e [-] MO : blockviewed Fix bug adding last product to list, thanks @kluevandrew 2013-07-25 17:58:22 +02:00
gRoussac bff2844adf [*] MO : Added customer and product object to hook sending email 2013-07-25 14:50:35 +02:00
gRoussac ae7ee01028 [*] FO : Fix bug #PSCFV-9611, autocomplete to off on opc page and other pages 2013-07-25 12:26:57 +02:00
Captain FLAM daec59d13d Update blocklayered.js 2013-07-24 11:55:05 +01:00
Gregory Roussac 166a133080 Merge pull request #577 from PhpMadman/patch-2 
[-] MO : If no homefeatured nb, get default 8 not 10
 2013-07-23 10:14:24 -07:00
Jérôme Nadaud 3ecf929ff0 [-] BO : FixBug #PSCFV-9881 Remove updateCarriersList on zip code blur 2013-07-22 18:05:37 +02:00
Fabio Chelly aa276aeee6 Merge remote-tracking branch 'origin/development' into development 2013-07-19 17:51:00 +02:00
Fabio Chelly 5825dda836 [-] MO mailalerts : infinite coverage (-1) is taken into account when sending coverage e-mails 
#PNM-1563
#PNM-1597
 2013-07-19 17:36:51 +02:00
Damien Metzger b1f380c120 // Fixed statsforecast category distribution 2013-07-19 16:59:54 +02:00
Damien Metzger 8d034a7ebf // up 2013-07-19 13:33:56 +02:00
Fabio Chelly 7570c9eb87 [-] MO loyalty : minimum amount is now taken into account when creating discount vouchers 
#PNM-1561
 2013-07-19 11:15:14 +02:00
PhpMadman eb6b233e31 [-] BO : If no nb, get default 8, not 10. 2013-07-19 10:33:28 +02:00
gRoussac a71a5d7c18 [-] MO : Fix bug discount display in mail, manual merge from https://github.com/202-ecommerce/PrestaShop/commit/1d5df338c46aef723d13aef3e213792df6ea92e2 2013-07-18 18:18:57 +02:00