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

7768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Rémi Gaillard 68236c6a6d // Only js strings need to add slashes 2012-12-10 16:05:38 +01:00
Rémi Gaillard 50761112a1 [-] Core: send email when payment is remotly accepted #PSCFV-6064 2012-12-10 15:57:59 +01:00
sLorenzini e5143b1ee4 [-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005 2012-12-10 15:17:23 +01:00
Rémi Gaillard 27ae42b086 [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function 2012-12-10 15:06:03 +01:00
vAugagneur 83318055ce //added more check on module upload part 2 2012-12-10 14:45:14 +01:00
vAugagneur 337437be74 //added more check on module upload 2012-12-10 14:44:11 +01:00
Rémi Gaillard 29b4adb032 [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 2012-12-10 13:52:09 +01:00
sLorenzini 05d5ab2df3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 11:43:51 +01:00
sLorenzini dbe2d7998a [-] FO: fix Image attributes not set - #PSCFV-5957 2012-12-10 11:42:13 +01:00
François Gaillard 8b97a15405 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 11:39:11 +01:00
François Gaillard 6173a98b58 [*] FO : Bug fix : h4 -> title_block 2012-12-10 11:38:48 +01:00
vAugagneur 1b71add855 [-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules 2012-12-10 11:16:33 +01:00
vAugagneur eb451604af [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
Rémi Gaillard 60e99d6b66 // Display exception in admin regardless mode dev 2012-12-10 10:47:41 +01:00
François Gaillard 6483525900 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 10:18:53 +01:00
François Gaillard 312df517fb [*] FO : Cart vouchers style edited 2012-12-10 10:18:41 +01:00
vAugagneur 20187807e1 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
PrestaEdit 5e563f2a48 [-] FO : mobile template - states management 2012-12-08 23:46:14 +01:00
montes 48d6b63d8e Fixed variable typo (redution instead of reduction in some places) 2012-12-07 23:24:41 +01:00
Rémi Gaillard db9ff416c0 // small fix 2012-12-07 18:01:32 +01:00
vAugagneur 1d70dad851 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-07 18:01:46 +01:00