dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,790 Commits 9 Branches 19 Tags
60d2aee83b015f96c8defecf02f0ee13c0c417e2
Commit Graph

7790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vAugagneur 60d2aee83b //rename upgrade file 2012-12-13 10:06:46 +01:00
vAugagneur df06579e02 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-13 09:41:32 +01:00
vAugagneur 668a7e35e7 [-] FO : small js fix on gift checkbox update on mobile 2012-12-13 09:41:20 +01:00
Damien Metzger e4d7a331fd // French translations 2012-12-13 09:32:04 +01:00
vAugagneur c1bbd15fb0 [-] FO : small fix on mobile logo url 2012-12-13 09:30:55 +01:00
vAugagneur c6f9d13800 [*] BO : moved sample csv file 2012-12-13 09:16:03 +01:00
Damien Metzger d8c4db1d1b // New user assistance in the installer 2012-12-12 20:34:13 +01:00
Rémi Gaillard 1c5f8b968c [-] BO: Fix catalog price rules creation with mysql strict mod #PSCFV-5916 2012-12-12 19:38:40 +01:00
Rémi Gaillard d4ba675273 // fix js arg missing for translations in javascript 2012-12-12 19:07:29 +01:00
vAugagneur 04695dccbf removed unused files 2012-12-12 19:00:57 +01:00
Vincent Augagneur 2b8aae9280 Merge pull request #87 from ivancasasempere/patch-1 
[*] Modules : blocktopmenu css improvement
 2012-12-12 09:59:48 -08:00
vAugagneur 72f4c102e6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 18:43:15 +01:00
vAugagneur 0b95f0c30d //small fix 2012-12-12 18:43:11 +01:00
Rémi Gaillard 80bbeac35c [-] MO: Fix Wishlist controller with ssl #PSCFV-5943 2012-12-12 18:01:57 +01:00
vAugagneur cd0eb0c6a4 [-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag 2012-12-12 17:38:31 +01:00
vAugagneur c3c0441316 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 16:24:41 +01:00
vAugagneur 7e95ccb76c //small fix #310dbaaf2492042953c5e65ffb7fa1c6afd0b0a8 2012-12-12 16:24:35 +01:00
Rémi Gaillard a48798e8f1 // small fix 2012-12-12 16:18:48 +01:00
vAugagneur b1b42dc8e6 //added PS_MAIL_COLOR in upgrade 2012-12-12 16:01:32 +01:00
Vincent Augagneur 6445fea198 Merge pull request #69 from PrestaEdit/mails 
[+] Project: add the possibility to change the default color (#db3484)
 2012-12-12 06:59:04 -08:00
vAugagneur 4cbf8d380f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 14:37:40 +01:00
vAugagneur ed836e081c //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
Damien Metzger 16b726349f // And another 2012-12-12 14:33:54 +01:00
Rémi Gaillard 07c47f7001 [-] BO: useSSL global does not exist anymore #PSCFV-6113 2012-12-12 14:33:42 +01:00
Damien Metzger 490213a550 // Fixed duplicated lines #PSCFV-6109 2012-12-12 14:31:46 +01:00
Damien Metzger 51dff4de4e // Merged 4 lignes of code in the Configuration class 2012-12-12 14:29:37 +01:00
Vincent Augagneur 0cd93a517b Merge pull request #79 from PrestaEdit/PSCFV-3877 
[-] FO : mobile template - states management
 2012-12-12 03:34:09 -08:00
Jonathan Danse 9d5611f9fe [*] FO : mobile template - states management 
Put "p" and "div" in the same selector
 2012-12-12 12:30:10 +01:00
Vincent Augagneur 90c7578637 Merge pull request #74 from mcdado/patch-1 
[-] FO : order-carrier more compatible with opc
 2012-12-12 03:21:19 -08:00
ivancasasempere 645498fc65 [*] Modules : blocktopmenu css improvement 
Same CSS style than block headers

http://i.imgur.com/5SQsA.png

More clean, no-images used, and more easiest customizable
 2012-12-12 12:05:27 +01:00
Rémi Gaillard d49b13579b [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops 2012-12-12 11:46:19 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Vincent Augagneur 33fcc16467 Merge pull request #78 from montes/redution-typo 
[-] FO : Fixed variable typo (redution instead of reduction in some places)
 2012-12-12 00:53:00 -08:00
Rémi Gaillard be71bed3d8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 18:05:02 +01:00
Rémi Gaillard a825982242 [-] MO: Mailalert should send alert for new order independently of the stock management 2012-12-11 18:04:33 +01:00
vAugagneur 58fe982f34 [-] FO : fixed bug #PSCFV-6057 - In step 4 by pressing terms and conditions, do not load css in Internet Explorer 8 2012-12-11 17:53:58 +01:00
Rémi Gaillard 82a230aa70 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
sLorenzini 0727da6aeb [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
Rémi Gaillard c9cb49d5a1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
vAugagneur fab1c02443 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
Rémi Gaillard 4c026fe0fc [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard 5891143e5b [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes 2012-12-11 16:05:29 +01:00
vAugagneur a4e48ccc7d [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO 2012-12-11 15:44:32 +01:00
Damien Metzger 2c06839185 // Fixed stripos !== false in module search 2012-12-11 15:36:51 +01:00
Damien Metzger 8e8c1bee81 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
Rémi Gaillard a5e3bc711b // replace bad attribute name 2012-12-11 12:11:47 +01:00
Rémi Gaillard 7cd629b15b [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard b2f01058a8 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Damien Metzger ecac947c2e // config.xml in english 2012-12-11 11:19:40 +01:00
Damien Metzger 27eaed42bd [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16:56 +01:00