dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,070 Commits 9 Branches 19 Tags
a994c93dee987d294016e8592c2bd161e06cfcd3
Commit Graph
9070 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Otto Nascarella a994c93dee Progressive JPEG 
https://plus.google.com/+PaulIrish/posts/5KzxfS9nNEZ
 2013-04-25 12:18:50 -03:00
François Gaillard 6106066ef1 // Release branch merged 2013-04-25 17:00:56 +02:00
François Gaillard 056709f2dd // CHANGELOG 1.5.4.1 1.5.4.1 2013-04-25 16:59:40 +02:00
Vincent Augagneur f0da3fa2ae Merge pull request #404 from MrManchot/patch-5 
Module newsletter : Send mail with the shop in the context
 2013-04-25 05:48:24 -07:00
Rémi Gaillard eb7cf3dbbb // delete char 2013-04-25 14:20:27 +02:00
Rémi Gaillard 5ac2a0d946 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-04-25 11:41:09 +02:00
Rémi Gaillard 17209a1725 // update default languages pack 2013-04-25 11:40:54 +02:00
Damien Metzger 907047165b // Added english pack in the installer 2013-04-25 11:29:35 +02:00
Cédric MouleyreandRémi Gaillard a8b89d7411 Double 'id_image' definition in product getList 
Double 'id_image' definition in product getList, the correct on is : MAX('.$alias_image.'.id_image) id_image, I remove the second.

The problem was, sometimes, image product was not display in multi-shop in the BO.
 2013-04-25 11:29:01 +02:00
Rémi Gaillard cde13e7707 Merge pull request #403 from MrManchot/patch-4 
Double 'id_image' definition in product getList
 2013-04-25 02:23:16 -07:00
Damien Metzger 45f54ce08d Merge pull request #402 from djfm/release 
[*] TR : Improved English text of installer
 2013-04-25 02:17:35 -07:00
Damien Metzger 35d3d1d6c5 [-] FO : do not use dispatcher routes for static files 2013-04-25 11:06:54 +02:00
Rémi Gaillard e827d3355d [-] BO: Fix htaccess generation for subfolders installation 2013-04-25 11:04:48 +02:00
Cédric Mouleyre bf40d68098 Send mail with the shop in the context 2013-04-25 11:59:25 +03:00
vAugagneur 1280152db9 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 2013-04-25 10:59:18 +02:00
djfm f7f137fec1 [*] TR : Removed hard-coded dot in history.tpl 2013-04-25 10:48:29 +02:00
Cédric Mouleyre e344863a3c Double 'id_image' definition in product getList 
Double 'id_image' definition in product getList, the correct on is : MAX('.$alias_image.'.id_image) id_image, I remove the second.

The problem was, sometimes, image product was not display in multi-shop in the BO.
 2013-04-25 11:31:10 +03:00
djfm 8f406fcd1d [*] TR : Improved English text of installer 2013-04-25 10:24:13 +02:00
gRoussac 125884d8c0 [-] BO : Fix bug witth shop address and no state in country 2013-04-25 10:12:23 +02:00
Damien Metzger b2b17eb041 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
Damien Metzger 08f6d1a670 // Changed default value of checkbox in install 2013-04-25 08:41:31 +02:00
Rémi Gaillard 5a3c2aa5cf // Also update the tax display for unidentified and guest group on localization import 2013-04-24 19:01:10 +02:00
Damien Metzger cc2df5b237 // Switch iframe to https 2013-04-24 18:31:51 +03:00
gRoussac 1975755d8a [-] BO : Fix bug for csv export 2013-04-24 17:29:36 +02:00
vAugagneurandFrançois Gaillard 5967c6ebbe //new addons url in install process 2013-04-24 16:39:04 +02:00
François Gaillard b5047051cd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-24 16:38:31 +02:00
Damien Metzger 7cafc7bdf5 // Fixed warning in translations 2013-04-24 16:27:45 +02:00
Damien Metzger feb1edc076 // Small translation fix 2013-04-24 15:45:58 +02:00
Damien Metzger 75dd65f207 // Small fix translations 2013-04-24 15:29:00 +02:00
Vincent Augagneur ec45ea725f Merge pull request #305 from Prestaworks/patch-9 
[-]BO: Fixes issue with logo name.
 2013-04-24 01:29:58 -07:00
Damien Metzger 83f132aa78 // Write theme translations... in the theme 2013-04-24 10:29:02 +02:00
Damien Metzger d16f30f322 // Fix module translation in the core 2013-04-23 20:25:28 +02:00
Vincent Terenti 2d1a4ed180 // Fix translation behavior 2013-04-23 19:10:31 +02:00
vAugagneur 05fd9aeaae [-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back 2013-04-23 17:41:29 +02:00
vAugagneur cc18fd1de6 //small fix on Link::getProductLink() 2013-04-23 17:33:15 +02:00
Damien Metzger 318a136553 [-] FO : invoice: do not display taxes table if there is not tax to display 2013-04-23 16:46:11 +02:00
Rémi Gaillard 697a305848 // small text change 2013-04-23 15:51:30 +02:00
Damien Metzger 8d4723247e [-] FO : Fixed product comparator CSS 2013-04-23 15:35:21 +02:00
Damien Metzger 4162591e3e // Fixed Chrome issue with cart rules 2013-04-23 15:30:17 +02:00
Damien Metzger bec335441e // Change link to the documentation in the installer 2013-04-23 14:57:24 +02:00
vAugagneur 0156ddc30a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 14:22:45 +02:00
vAugagneur e363dc8759 Merge Pull Request #167 - Thanks @Zeyckler 2013-04-23 14:22:40 +02:00
Vincent Augagneur d1c7f9c012 Merge pull request #390 from ccauw/patch-7 
[*] BO : Add block "override_form_extra" in helper
 2013-04-23 05:20:43 -07:00
Damien Metzger 4be1bef203 // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Rémi Gaillard ceddfdd8e6 // add static page to replace white page for exceptions in FO 2013-04-23 11:54:11 +02:00
vAugagneur 38eb16eb48 Merge Pull Request #53 - Thanks @Caleydon 2013-04-23 11:40:08 +02:00
François Gaillard f1e34c20b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 11:39:14 +02:00
Damien Metzger 13c435a54b // Fixed warning 2013-04-23 11:36:13 +02:00
Damien Metzger 4e21c56d1b // Changed translation tool behavior with dev mode and overrides 2013-04-23 11:21:10 +02:00
vAugagneur e466ede051 Merge Pull request #67 - Thanks @Ha99y 2013-04-23 10:02:29 +02:00