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
Grégoire Bélorgey
3c129a0e64 Merge remote-tracking branch 'upstream/development' into development 2013-05-25 13:15:00 +02:00
gRoussac
b05ffb6a89 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 17:22:20 +02:00
gRoussac
95e46afc99 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-24 17:21:56 +02:00
Franois Gaillard
adb0da00f6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 11:39:37 +02:00
Franois Gaillard
3b1a9f9f80 [-] BO : Fixed unregistered version field for some modules 2013-05-24 11:39:20 +02:00
Rémi Gaillard
3de79c7015 // same for attributes and attributegroups 2013-05-24 11:33:58 +02:00
Rémi Gaillard
6f901cea37 [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 2013-05-24 11:28:07 +02:00
Rémi Gaillard
3b5f18a96d [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 2013-05-24 11:28:07 +02:00
vAugagneur
377eb8435d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 10:48:15 +02:00
vAugagneur
bc0c8ba2e5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 10:48:15 +02:00
vAugagneur
220dda354b [-] BO : fixed bug #PSCFV-9178 - is_color_group is not inserted correctly 2013-05-24 10:47:48 +02:00
vAugagneur
cc79b6a675 [-] BO : fixed bug #PSCFV-9178 - is_color_group is not inserted correctly 2013-05-24 10:47:48 +02:00
gRoussac
a28a8598ba Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 16:14:37 +02:00
gRoussac
b6937b243c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 16:14:37 +02:00
gRoussac
4b64afd4ee [-] BO : Fix bug #PSCFI-6755 "+" in email 2013-05-23 16:14:31 +02:00
gRoussac
9e2c5bfcb9 [-] BO : Fix bug #PSCFI-6755 "+" in email 2013-05-23 16:14:31 +02:00
Vincent Augagneur
288e88b183 Merge pull request #393 from PrestaEdit/patch-33 
[-] MO: feeder / RSS Valid
 2013-05-23 06:25:19 -07:00
Vincent Augagneur
9baeada7a3 Merge pull request #393 from PrestaEdit/patch-33 
[-] MO: feeder / RSS Valid
 2013-05-23 06:25:19 -07:00
vAugagneur
92da1ffa83 //Merged pull request 124 - thanks to @rynge 2013-05-23 15:24:25 +02:00
vAugagneur
6d0c69a07f //Merged pull request 124 - thanks to @rynge 2013-05-23 15:24:25 +02:00
gRoussac
2b5d600452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 14:49:20 +02:00
gRoussac
b2bb233dc9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 14:49:20 +02:00
gRoussac
66fbbf4825 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files 2013-05-23 14:49:07 +02:00
gRoussac
dd2d7491b4 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files 2013-05-23 14:49:07 +02:00
Vincent Augagneur
56831b9f33 Merge pull request #422 from e-gaulue/AuthController_patch 
[*] FO : AuthController can now have its own template
 2013-05-23 05:45:05 -07:00
Vincent Augagneur
444f59c9aa Merge pull request #422 from e-gaulue/AuthController_patch 
[*] FO : AuthController can now have its own template
 2013-05-23 05:45:05 -07:00
Vincent Augagneur
a5f8263c9d Merge pull request #424 from AntonLejon/patch-3 
[*] MO: blockcart animation optimization
 2013-05-23 05:33:36 -07:00
Vincent Augagneur
c9c458a64c Merge pull request #424 from AntonLejon/patch-3 
[*] MO: blockcart animation optimization
 2013-05-23 05:33:36 -07:00
Damien Metzger
36acfc1227 // Updated russian translation of the installer 2013-05-23 14:29:57 +02:00
Damien Metzger
bf525275e3 // Updated russian translation of the installer 2013-05-23 14:29:57 +02:00
Vincent Augagneur
bbb24c3d1b Merge pull request #428 from AntonLejon/patch-1 
[-] MO: blockcart ajax cart product insert missing html class
 2013-05-23 05:27:30 -07:00
Vincent Augagneur
3c73ec5deb Merge pull request #428 from AntonLejon/patch-1 
[-] MO: blockcart ajax cart product insert missing html class
 2013-05-23 05:27:30 -07:00
Vincent Augagneur
dd363be433 Merge pull request #444 from PrestaEdit/patch-38 
[*] Class: Module / Use method instead of SQL query
 2013-05-23 05:21:11 -07:00
Vincent Augagneur
f234d847fb Merge pull request #444 from PrestaEdit/patch-38 
[*] Class: Module / Use method instead of SQL query
 2013-05-23 05:21:11 -07:00
Damien Metzger
affca31558 [-] IN : updated support phone number and website in the installer 2013-05-23 14:11:13 +02:00
Damien Metzger
a57003749b [-] IN : updated support phone number and website in the installer 2013-05-23 14:11:13 +02:00
Damien Metzger
9e7d2ac9c7 [-] Core : fixed URL regexp #PSCFV-8986 2013-05-23 12:13:28 +02:00
Damien Metzger
478dd0d39d [-] Core : fixed URL regexp #PSCFV-8986 2013-05-23 12:13:28 +02:00
Damien Metzger
c6ab6005f5 // Added error reporting level in dev mode 2013-05-23 10:50:22 +02:00
Damien Metzger
d8f1226bd7 // Added error reporting level in dev mode 2013-05-23 10:50:22 +02:00
Damien Metzger
0b503a0c8b // Inverted 2 steps in the installer 2013-05-22 16:55:01 +02:00
Damien Metzger
8d012e30d4 // Inverted 2 steps in the installer 2013-05-22 16:55:01 +02:00
Rémi Gaillard
de945adf79 [*] MO: Add smarty cache on blocksupplier and blockmanufacturer 2013-05-22 15:46:30 +02:00
Rémi Gaillard
5fed3e99e0 [*] MO: Add smarty cache on blocksupplier and blockmanufacturer 2013-05-22 15:46:30 +02:00
vAugagneur
487c567224 //small fix 2013-05-22 14:38:39 +02:00
vAugagneur
4f8b73ef9d //small fix 2013-05-22 14:38:39 +02:00
Rémi Gaillard
1ab6befe0d Merge pull request #447 from djfm/development 
// parse error
 2013-05-22 05:14:50 -07:00
Rémi Gaillard
da109d56f6 Merge pull request #447 from djfm/development 
// parse error
 2013-05-22 05:14:50 -07:00
gRoussac
f0abc2298c [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not uptodate 2013-05-22 12:29:20 +02:00
gRoussac
2590465a7c [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not uptodate 2013-05-22 12:29:20 +02:00