dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,638 Commits 9 Branches 19 Tags
2a28e476500cd854d9e80d4bb0ded5da170e0615
Commit Graph

18638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger 2bf6b3a82e // Cleaned modules call 2012-12-13 13:35:33 +01:00
Damien Metzger b391fc176a // Cleaned modules call 2012-12-13 13:35:33 +01:00
vAugagneur 60d2aee83b //rename upgrade file 2012-12-13 10:06:46 +01:00
vAugagneur 7fe6b95a38 //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 cb4f2bd889 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
vAugagneur 003c9666c1 [-] 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
Damien Metzger 8a8c674a95 // 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 cfa1359c87 [-] 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
vAugagneur 06a3e4709b [*] 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
Damien Metzger f78abb14b9 // 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 e0aa292a69 [-] 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
Rémi Gaillard 91ba2bfa2e // 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
vAugagneur 02f3c3c1cc 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
Vincent Augagneur d31d54a65b 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 35327e1792 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
vAugagneur 198a48491a //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
Rémi Gaillard 35a0c7c94c [-] 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 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