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

18638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
djfm
838a4e8bc9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-22 08:25:26 +00:00
gRoussac
3483706951 [-] FO : Prevent unsassigned category id, thans @PrestaCaptainFLAM 2013-07-20 19:07:10 +02:00
Jérôme Nadaud
1581a371c5 [-] BO : FixBug #PSCFV-9251 Meta Tag delete previous 2013-07-19 18:41:46 +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
djfm
2f6a53f971 [+] TR: Created file structure for Dutch installer 2013-07-19 15:34:10 +00:00
Damien Metzger
b1f380c120 // Fixed statsforecast category distribution 2013-07-19 16:59:54 +02:00
Jérôme Nadaud
19fb1da4f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-19 16:30:21 +02:00
Jérôme Nadaud
abf874d576 [-] BO : FixBug #PSCFV-9049 Bad actionOrderSlipAdd hook description 2013-07-19 16:30:04 +02:00
Damien Metzger
84d9caca81 // Blind fix 2013-07-19 16:29:17 +02:00
Jérôme Nadaud
5646e682bc [-] BO : FIxBug Correct image language in product 2013-07-19 15:21:06 +02:00
Damien Metzger
3389cf8acb [-] FO : fixed pagination for p = 0 #PSCFV-9746 2013-07-19 14:08:24 +02:00
Damien Metzger
8d034a7ebf // up 2013-07-19 13:33:56 +02:00
Fabio Chelly
95122e8849 Merge remote-tracking branch 'origin/development' into development 2013-07-19 12:04:39 +02:00
Damien Metzger
8c47ca3edf [-] BO : fixed sort by currency exchange rate #PSCFV-9840 2013-07-19 11:40:52 +02:00
Damien Metzger
989dafce21 [*] FO : a few more SQL improvements 2013-07-19 11:29:18 +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
Damien Metzger
bd4ece095b [*] FO : lots of performance improvements (removed or merged useless SQL queries) 2013-07-19 10:58:51 +02:00
PhpMadman
eb6b233e31 [-] BO : If no nb, get default 8, not 10. 2013-07-19 10:33:28 +02:00
Damien Metzger
219ec6e8be [-] FO : Removed useless live edit query #PSCFV-9845 2013-07-19 09:50:30 +02:00
Damien Metzger
78ddec3ac7 [-] BO : translation copy is now easier #PSCFV-8886 2013-07-18 18:51:37 +02:00
gRoussac
a6a700c9d8 // parse error 2013-07-18 18:40:19 +02:00
gRoussac
236aaa9354 [*] MAILS : add {order_name} & {attached_file} , manaul merge from e9f9631744 2013-07-18 18:38:12 +02:00
Jérôme Nadaud
54fe5dfe96 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:34:18 +02:00
Rémi Gaillard
ac02e5191a // ups 2013-07-18 18:34:10 +02:00
Jérôme Nadaud
c90ba4c406 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:33:51 +02:00
Jérôme Nadaud
066b791cf7 [-] FO : FixBug of total products from supliers and manufacturer 2013-07-18 18:33:35 +02:00
Rémi Gaillard
354622857f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:31:35 +02:00
Rémi Gaillard
958d92c9fa [*] BO: Add an option to allow iframes on descriptions 2013-07-18 18:31:31 +02:00
Damien Metzger
c70fe92dac // Validate::isGenericName now allow "#" #PSCFV-6530 2013-07-18 18:22:50 +02:00
gRoussac
a71a5d7c18 [-] MO : Fix bug discount display in mail, manual merge from 1d5df338c4 2013-07-18 18:18:57 +02:00
gRoussac
e3d9dd89e9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:18:12 +02:00
Jérôme Nadaud
caf321e691 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden 2013-07-18 18:16:57 +02:00
Jérôme Nadaud
d879fb15a9 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products 2013-07-18 18:10:29 +02:00
Jérôme Nadaud
dd78e97b4a [-] FO : FixBug #PSCFV-7723 Bad manufacturers list pagination 2013-07-18 17:09:44 +02:00
Jérôme Nadaud
3693349643 [-] BO : FixBug #PSCFV-5316 Translation problem in delete button link 2013-07-18 15:49:53 +02:00
Jérôme Nadaud
2c6978e97c [-] BO : FixBug #PSCFV-6140 Pagination link error 2013-07-18 14:55:28 +02:00
Damien Metzger
6ae0717e32 // PS Cleaner now clean the img/tmp dir 2013-07-18 14:48:47 +02:00
gRoussac
a6b2299ed1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 14:08:36 +02:00
Jérôme Nadaud
a6da3e94f0 [-] BO : FixBug #PSCFV-9723 Exporting quantity in instant stock was not returning all rows 2013-07-18 14:02:22 +02:00
Damien Metzger
6293631ac4 [-] FO : fixed group query for cart rules #PSCFV-8992 2013-07-18 13:47:43 +02:00
Jérôme Nadaud
69066361a6 [-] BO : FixBug #PSCFV-8234 Products tags not correctly indexed in search 2013-07-18 12:15:42 +02:00
gRoussac
d99a1eba24 [-] BO : Bad return value for AdminCountries::processStatus() 2013-07-18 12:12:05 +02:00
Damien Metzger
108bd92c3b [-] FO : Fixed partial use of cart rules which does not offer free shipping #PSCFV-9216 2013-07-18 12:09:48 +02:00
Damien Metzger
c1a4dd6b66 // Added readme in the override directory 2013-07-18 11:31:08 +02:00
Damien Metzger
3be36f9897 [*] MO : added configuration cleaning to pscleaner 2013-07-18 09:36:01 +02:00
Jérôme Nadaud
2e3ec0f038 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 08:52:56 +02:00
Jérôme Nadaud
40389822c3 [-] BO : FixBug Directory Separator on URL 2013-07-18 08:52:39 +02:00
gRoussac
5939f65fac //norms 2013-07-17 19:05:01 +02:00
Jérôme Nadaud
eecfdae0b6 [-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change 2013-07-17 18:23:59 +02:00