dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,850 Commits 9 Branches 19 Tags
5832ab3eb5d62a81b427ff5f7c8bdea7d94ec00a
Commit Graph
17850 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Francois Gaillard 7f3678a776 Merge branch 'release' into development 2013-03-14 16:39:47 +01:00
François Gaillard da77ce1029 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Francois Gaillard 505d3be5c3 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Rémi Gaillard 83729b3cef Merge pull request #315 from PrestaEdit/followup 
[-] MO: followup - fix bug in template vars
 2013-03-14 07:52:15 -07:00
Rémi Gaillard 395192f603 Merge pull request #315 from PrestaEdit/followup 
[-] MO: followup - fix bug in template vars
 2013-03-14 07:52:15 -07:00
Rémi Gaillard 987977ecbb [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
Rémi Gaillard 0da58b215c [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
Rémi Gaillard d9bf697625 [-] BO: Fix auto-selection of default category when you have choosen one on the listing 2013-03-14 15:04:54 +01:00
Rémi Gaillard 8b4bd8e471 [-] BO: Fix auto-selection of default category when you have choosen one on the listing 2013-03-14 15:04:54 +01:00
Rémi Gaillard 441c334f09 // Fix 404 img path on pagenotfoundcontroller 2013-03-14 14:58:44 +01:00
Rémi Gaillard c7a4c4d84d // Fix 404 img path on pagenotfoundcontroller 2013-03-14 14:58:44 +01:00
Rémi GaillardandgRoussac 3d8f3f9ca9 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 14:29:20 +01:00
Rémi GaillardandgRoussac 26f0608071 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 14:29:20 +01:00
Rémi GaillardandgRoussac 313f2a5392 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 14:28:38 +01:00
Rémi GaillardandgRoussac 1c114ad4b9 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 14:28:38 +01:00
Rémi GaillardandgRoussac 37e6846aab Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 14:26:51 +01:00
Rémi GaillardandgRoussac d8b31d6a4f Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 14:26:51 +01:00
Rémi Gaillard f620645169 [-] Core: Fix search indexation when nb languages * nb shops > 50 2013-03-14 14:16:31 +01:00
Rémi Gaillard 3e8e0fe7a4 [-] Core: Fix search indexation when nb languages * nb shops > 50 2013-03-14 14:16:31 +01:00
Rémi Gaillard 13e9de16e1 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 05:58:37 -07:00
Rémi Gaillard 84b5b1ee26 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 05:58:37 -07:00
Rémi Gaillard b3e699f9a6 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 05:56:02 -07:00
Rémi Gaillard a774550067 Merge pull request #316 from ldecoker/patch-4 
[*][FO]Missing php_self variable
 2013-03-14 05:56:02 -07:00
Rémi Gaillard 974a7987d0 Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 05:55:11 -07:00
Rémi Gaillard b7b1b6c3e4 Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 05:55:11 -07:00
gRoussac 3ed335e80f [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00
gRoussac 2bb4c6c08a [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00
Damien Metzger 44a0afa34b // Added lock to class_index generation 2013-03-14 11:00:23 +01:00
Damien Metzger 1f540553b2 // Added lock to class_index generation 2013-03-14 11:00:23 +01:00
Damien Metzger 7f21c3e62a // Update profiling tools 2013-03-14 10:47:18 +01:00
Damien Metzger 2523de9a99 // Update profiling tools 2013-03-14 10:47:18 +01:00
François Gaillard 890eefce92 // Profiler, redirect method declaration fixed 2013-03-14 10:20:12 +01:00
Francois Gaillard 2d88f43206 // Profiler, redirect method declaration fixed 2013-03-14 10:20:12 +01:00
vAugagneur ac764f0d81 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 09:36:22 +01:00
vAugagneur a42c34022f Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 09:36:22 +01:00
vAugagneur 9efa51e704 //fixed multi-shipping bug 2013-03-14 09:36:17 +01:00
vAugagneur 2c2a8d552e //fixed multi-shipping bug 2013-03-14 09:36:17 +01:00
gRoussac be6ad7855a [-] FO : Check for cart rules before diplaying shopping cart in OPC 2013-03-13 18:42:40 +01:00
gRoussac 76c06ec8c6 [-] FO : Check for cart rules before diplaying shopping cart in OPC 2013-03-13 18:42:40 +01:00
vAugagneur 930e10f87c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 18:21:40 +01:00
vAugagneur ec757d90c7 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 18:21:40 +01:00
vAugagneur 37f64664d3 //small js fix 2013-03-13 18:21:21 +01:00
vAugagneur 58d08ce1b0 //small js fix 2013-03-13 18:21:21 +01:00
Rémi Gaillard b76b263ab0 [-] FO: Fix separated packages 2013-03-13 18:02:54 +01:00
Rémi Gaillard 09f70a0020 [-] FO: Fix separated packages 2013-03-13 18:02:54 +01:00
vAugagneur eae5f2d965 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 16:29:23 +01:00
vAugagneur 324ca85cb8 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 16:29:23 +01:00
vAugagneur 149407f72d //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
vAugagneur ee53bc4aea //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
vAugagneur 67e357e447 Merge translations/fr/errors.php 2013-03-13 16:16:01 +01:00