dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph
18608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 c3c0441316 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 16:24:41 +01:00
vAugagneur b5037d4bfe 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
vAugagneur 4471a1a140 //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
Rémi Gaillard 87798d1193 // 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
vAugagneur f6b46f47c5 //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
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 4cbf8d380f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-12 14:37:40 +01:00
vAugagneur 39f108d79d 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
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 16b726349f // And another 2012-12-12 14:33:54 +01:00
Damien Metzger 6180cb1fa9 // 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
Rémi Gaillard ed65ab64de [-] 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 6532868e1d // 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
Damien Metzger 0f6b60a3af // 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
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 9d5611f9fe [*] FO : mobile template - states management 
Put "p" and "div" in the same selector
 2012-12-12 12:30:10 +01: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 90c7578637 Merge pull request #74 from mcdado/patch-1 
[-] FO : order-carrier more compatible with opc
 2012-12-12 03:21:19 -08: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 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
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 d49b13579b [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops 2012-12-12 11:46:19 +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 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur bfff958b1f 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
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 be71bed3d8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 18:05:02 +01: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 a825982242 [-] MO: Mailalert should send alert for new order independently of the stock management 2012-12-11 18:04:33 +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 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
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 82a230aa70 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +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 0727da6aeb [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +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 c9cb49d5a1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +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