dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

2342 Commits

Author SHA1 Message Date
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 1d5df338c4 2013-07-18 18:18:57 +02:00
Damien Metzger
6ae0717e32 // PS Cleaner now clean the img/tmp dir 2013-07-18 14:48:47 +02:00
Damien Metzger
3be36f9897 [*] MO : added configuration cleaning to pscleaner 2013-07-18 09:36:01 +02:00
Fabio Chelly
a6d0ef744e Merge remote-tracking branch 'origin/development' into development 2013-07-15 19:37:19 +02:00
Fabio Chelly
b67ffb1a50 [-] MO loyalty : categories are now taken into account when creating discount vouchers 
#PNM-1492
#PNM-1191
#PNM-1223
 2013-07-15 19:36:32 +02:00
gRoussac
f9c5bf0bf2 [-] Fix bug #PSCFV-9633 again could not see delete href in block cart 2013-07-15 17:29:08 +02:00
Damien Metzger
db7f0da746 // Improved display in pscleaner 2013-07-15 10:48:48 +02:00
Damien Metzger
38b32f7e1a [-] MO : fixed disappearing form in sekeyword #PSCFV-9743 2013-07-12 15:56:54 +02:00
Damien Metzger
f82e748fc8 [*] MO : you can now exclude IP addresses from the online visitors module #PSCFV-9056 2013-07-12 15:38:36 +02:00
gRoussac
24d124f190 [*] MODULE : Multi-shop compatibility in newsletter module tanks @axometeam 2013-07-12 14:17:49 +02:00
gRoussac
5d8d7c0383 [-] MO : Followup : don't send emails for empty carts thanks @axometeam 2013-07-11 18:57:37 +02:00
Gregory Roussac
293d1afbc7 Merge pull request #484 from axome/module_followup_guests 
[-] MO : Followup : Don't send followup vouchers to guest accounts
 2013-07-11 09:13:39 -07:00
Gregory Roussac
27a72f9b2c Merge pull request #482 from axome/module_followup_cron 
[-] MO : Followup : Don't execute crontasks if the module is disabled
 2013-07-11 09:08:51 -07:00
Damien Metzger
184515a27c [-] MO : fixed bad redirection in trackingfront #PSCFV-8378 2013-07-11 18:03:39 +02:00
Rémi Gaillard
c0cdd0a0e1 Merge pull request #547 from PiotrKaczor/patch-1 
[*] MO : pscleaner reset employees notyfications
 2013-07-11 00:46:30 -07:00
Vincent Augagneur
53ec2aab7e //remove unused configuration 2013-07-10 17:33:02 +02:00
Fabio Chelly
391c7301da Merge remote-tracking branch 'origin/development' into development 2013-07-05 17:18:50 +02:00
Fabio Chelly
a70d3145cd [-] MO Blockwishlist : images are displayed in wishlist page loaded through a permalink. Add to cart is restored and quantity is correctly calculated for each product with or without combinations 
#PNM-573
#PNM-663
#PNM-1268
#PNM-1302
#PNM-1303
#PNM-1313
#PNM-1512
#PNM-1541
 2013-07-05 17:18:28 +02:00
Damien Metzger
62ff976d69 // Removed redundant function calls 2013-07-05 14:25:22 +02:00
Fabio Chelly
2489778b3c [-] MO Blocknewsletter : deletes e-mail from newsletter table only if newsletter checkbox has been checked on subscription page 
#PNM-1419
 2013-07-05 11:53:04 +02:00
Piotr Kaczor
54b882e936 [*] MO : pscleaner reset employees notyfications 
pscleaner afetr truncating orders, messages and customers reset also employees notyfications
 2013-07-05 08:05:51 +02:00
gRoussac
8a7edf3668 [-] FO : Fix bug #PSCFV-9355 dleete button missing for custo in blockcart 2013-07-04 17:42:35 +02:00
gRoussac
c335115f68 // remove console.log 2013-07-04 16:48:56 +02:00
gRoussac
c360e841b3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-04 16:48:14 +02:00
gRoussac
0bddd17889 // remove console.log 2013-07-04 16:43:17 +02:00
Damien Metzger
d2440df8ca [*] FO : added smarty cache on productscategory 2013-07-03 15:49:32 +02:00
Damien Metzger
f78f3dc3a8 [*] FO : added smarty cache on crossselling module 2013-07-03 15:30:31 +02:00
gRoussac
36e3956267 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-03 15:06:05 +02:00
gRoussac
ae0299a6eb [-] FO :Fix bug #PSCFV-9650 could not see delete href in block cart 2013-07-03 15:04:11 +02:00
Sébastien
16e90488c4 [-] MO : Bug fix - PS Cleaner, check if module favoriteproducts is installed. 
Fix Bug when favoriteproducts is not install.
 2013-07-03 14:55:32 +02:00
Damien Metzger
854c16997c [*] FO : improved entity links retrieval (no need to instanciate an object when there is no need... to instanciate un object) 2013-07-02 15:08:56 +02:00
Vincent Augagneur
cab425e819 //remove useless css 2013-07-02 08:41:51 +02:00
Vincent Augagneur
0ff23eee9f //miss to delete some files 2013-07-02 08:02:05 +02:00
Vincent Augagneur
0c2aa996a2 //oups 😋 2013-07-01 16:48:25 +02:00
Vincent Augagneur
24db6b13c5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-01 16:40:39 +02:00
Vincent Augagneur
a519f4a7cb //small fix 2013-07-01 16:40:08 +02:00
Rémi Gaillard
c5fc26ed0b // same for unregister hook 2013-07-01 16:30:53 +02:00
Rémi Gaillard
09359d011f [-] MO: exec hook on hook registration #PSCFV-8977 2013-07-01 16:12:33 +02:00
Vincent Augagneur
1657db9743 [-] MO : fixed bug #PSCFV-5724 - 1.5.2.0 cms block error when adding more than one column to the categories block in the footer 2013-07-01 11:02:32 +02:00
Damien Metzger
3d85e81c3d // Oops, removing a block is a sure way to optimize... 2013-06-28 18:52:08 +02:00
Fabio Chelly
901d695e32 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-28 18:35:58 +02:00
Damien Metzger
d574f92411 [*] FO : added smarty cache to blockspecials 2013-06-28 18:27:19 +02:00