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

7799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger 623300419d [-] MO : pagesnotfound module fixed #PSCFV-5949 2012-12-14 15:51:45 +01:00
Damien Metzger 4b9e70a092 [-] Core : removed outdated file that may interfere with override #PSCFV-5911 2012-12-14 15:31:25 +01:00
Damien Metzger 5d32c7004e [-] Core : maxmind geoip API was outdated #PSCFV-5941 2012-12-14 15:29:35 +01:00
Damien Metzger 02b4df024b [-] MO : fixed override deployment from module #PSCFV-5999 2012-12-14 14:58:35 +01:00
Damien Metzger cba1bdf9ee // Fixed confirmation message display in some modules 2012-12-14 14:53:14 +01:00
Damien Metzger 310eac9f69 [-] Core : cannot throw an exception in the autoload #PSCFV-6018 2012-12-14 14:28:33 +01:00
Damien Metzger 689a10d9bd [-] FO : fixed default order by manufacturer #PSCFV-6105 2012-12-14 10:30:13 +01:00
Damien Metzger d930c479fb [-] BO : added check on a key in the helper list #PSCFV-6137 2012-12-14 10:13:28 +01:00
Damien Metzger b391fc176a // Cleaned modules call 2012-12-13 13:35:33 +01:00
vAugagneur 7fe6b95a38 //rename upgrade file 2012-12-13 10:06:46 +01:00
vAugagneur cb4f2bd889 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-13 09:41:32 +01:00
vAugagneur 003c9666c1 [-] FO : small js fix on gift checkbox update on mobile 2012-12-13 09:41:20 +01:00
Damien Metzger 8a8c674a95 // French translations 2012-12-13 09:32:04 +01:00
vAugagneur cfa1359c87 [-] FO : small fix on mobile logo url 2012-12-13 09:30:55 +01:00
vAugagneur 06a3e4709b [*] BO : moved sample csv file 2012-12-13 09:16:03 +01:00
Damien Metzger f78abb14b9 // New user assistance in the installer 2012-12-12 20:34:13 +01:00
Rémi Gaillard e0aa292a69 [-] BO: Fix catalog price rules creation with mysql strict mod #PSCFV-5916 2012-12-12 19:38:40 +01:00
Rémi Gaillard 91ba2bfa2e // fix js arg missing for translations in javascript 2012-12-12 19:07:29 +01:00
vAugagneur 02f3c3c1cc removed unused files 2012-12-12 19:00:57 +01:00
Vincent Augagneur d31d54a65b Merge pull request #87 from ivancasasempere/patch-1 
[*] Modules : blocktopmenu css improvement
 2012-12-12 09:59:48 -08:00
vAugagneur 35327e1792 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 18:43:15 +01:00
vAugagneur 198a48491a //small fix 2012-12-12 18:43:11 +01:00
Rémi Gaillard 35a0c7c94c [-] MO: Fix Wishlist controller with ssl #PSCFV-5943 2012-12-12 18:01:57 +01:00
vAugagneur a100b1d220 [-] 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 b5037d4bfe Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 16:24:41 +01:00
vAugagneur 4471a1a140 //small fix #310dbaaf2492042953c5e65ffb7fa1c6afd0b0a8 2012-12-12 16:24:35 +01:00
Rémi Gaillard 87798d1193 // small fix 2012-12-12 16:18:48 +01:00
vAugagneur f6b46f47c5 //added PS_MAIL_COLOR in upgrade 2012-12-12 16:01:32 +01:00
Vincent Augagneur ebff913250 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 39f108d79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 14:37:40 +01:00
vAugagneur 42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
Damien Metzger 6180cb1fa9 // And another 2012-12-12 14:33:54 +01:00
Rémi Gaillard ed65ab64de [-] BO: useSSL global does not exist anymore #PSCFV-6113 2012-12-12 14:33:42 +01:00
Damien Metzger 6532868e1d // Fixed duplicated lines #PSCFV-6109 2012-12-12 14:31:46 +01:00
Damien Metzger 0f6b60a3af // Merged 4 lignes of code in the Configuration class 2012-12-12 14:29:37 +01:00
Vincent Augagneur e060a32e60 Merge pull request #79 from PrestaEdit/PSCFV-3877 
[-] FO : mobile template - states management
 2012-12-12 03:34:09 -08:00
Jonathan Danse 1780a5ea7b [*] FO : mobile template - states management 
Put "p" and "div" in the same selector
 2012-12-12 12:30:10 +01:00
Vincent Augagneur 651743734e Merge pull request #74 from mcdado/patch-1 
[-] FO : order-carrier more compatible with opc
 2012-12-12 03:21:19 -08:00
ivancasasempere 1547539c43 [*] 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 1d909b1248 [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops 2012-12-12 11:46:19 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Vincent Augagneur 04ad50908e 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 98d9575c4c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 18:05:02 +01:00
Rémi Gaillard 4061c67c5b [-] MO: Mailalert should send alert for new order independently of the stock management 2012-12-11 18:04:33 +01:00
vAugagneur a2f7ef0136 [-] 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 b3b5f7a1e9 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
sLorenzini 05a6f856da [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
Rémi Gaillard bf1b491e94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
vAugagneur ec05f5e384 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
Rémi Gaillard 8d2f5d6e42 [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00