 Francois Gaillard
|
50d52baa7b
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-04-24 16:38:31 +02:00 |
|
|
Damien Metzger
|
7cafc7bdf5
|
// Fixed warning in translations
|
2013-04-24 16:27:45 +02:00 |
|
|
Damien Metzger
|
4df54ce743
|
// Fixed warning in translations
|
2013-04-24 16:27:45 +02:00 |
|
|
Damien Metzger
|
feb1edc076
|
// Small translation fix
|
2013-04-24 15:45:58 +02:00 |
|
|
Damien Metzger
|
71f0986535
|
// Small translation fix
|
2013-04-24 15:45:58 +02:00 |
|
|
Damien Metzger
|
75dd65f207
|
// Small fix translations
|
2013-04-24 15:29:00 +02:00 |
|
|
Damien Metzger
|
64684fe6c9
|
// Small fix translations
|
2013-04-24 15:29:00 +02:00 |
|
|
Vincent Augagneur
|
ec45ea725f
|
Merge pull request #305 from Prestaworks/patch-9
[-]BO: Fixes issue with logo name.
|
2013-04-24 01:29:58 -07:00 |
|
|
Vincent Augagneur
|
fd23578e1a
|
Merge pull request #305 from Prestaworks/patch-9
[-]BO: Fixes issue with logo name.
|
2013-04-24 01:29:58 -07:00 |
|
|
Damien Metzger
|
83f132aa78
|
// Write theme translations... in the theme
|
2013-04-24 10:29:02 +02:00 |
|
|
Damien Metzger
|
3948903884
|
// Write theme translations... in the theme
|
2013-04-24 10:29:02 +02:00 |
|
|
Damien Metzger
|
d16f30f322
|
// Fix module translation in the core
|
2013-04-23 20:25:28 +02:00 |
|
|
Damien Metzger
|
9eb84825a6
|
// Fix module translation in the core
|
2013-04-23 20:25:28 +02:00 |
|
|
Vincent Terenti
|
2d1a4ed180
|
// Fix translation behavior
|
2013-04-23 19:10:31 +02:00 |
|
|
Vincent Terenti
|
2c802ad4ec
|
// Fix translation behavior
|
2013-04-23 19:10:31 +02:00 |
|
|
vAugagneur
|
05fd9aeaae
|
[-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back
|
2013-04-23 17:41:29 +02:00 |
|
|
vAugagneur
|
3607c2264f
|
[-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back
|
2013-04-23 17:41:29 +02:00 |
|
|
vAugagneur
|
cc18fd1de6
|
//small fix on Link::getProductLink()
|
2013-04-23 17:33:15 +02:00 |
|
|
vAugagneur
|
c7bbf74913
|
//small fix on Link::getProductLink()
|
2013-04-23 17:33:15 +02:00 |
|
|
Damien Metzger
|
318a136553
|
[-] FO : invoice: do not display taxes table if there is not tax to display
|
2013-04-23 16:46:11 +02:00 |
|
|
Damien Metzger
|
6f96f0ac9a
|
[-] FO : invoice: do not display taxes table if there is not tax to display
|
2013-04-23 16:46:11 +02:00 |
|
|
Rémi Gaillard
|
697a305848
|
// small text change
|
2013-04-23 15:51:30 +02:00 |
|
|
Rémi Gaillard
|
913d0d9711
|
// small text change
|
2013-04-23 15:51:30 +02:00 |
|
|
Damien Metzger
|
8d4723247e
|
[-] FO : Fixed product comparator CSS
|
2013-04-23 15:35:21 +02:00 |
|
|
Damien Metzger
|
9395d95548
|
[-] FO : Fixed product comparator CSS
|
2013-04-23 15:35:21 +02:00 |
|
|
Damien Metzger
|
4162591e3e
|
// Fixed Chrome issue with cart rules
|
2013-04-23 15:30:17 +02:00 |
|
|
Damien Metzger
|
c191b36fb6
|
// Fixed Chrome issue with cart rules
|
2013-04-23 15:30:17 +02:00 |
|
|
Damien Metzger
|
bec335441e
|
// Change link to the documentation in the installer
|
2013-04-23 14:57:24 +02:00 |
|
|
Damien Metzger
|
23dacfd754
|
// Change link to the documentation in the installer
|
2013-04-23 14:57:24 +02:00 |
|
|
vAugagneur
|
0156ddc30a
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-04-23 14:22:45 +02:00 |
|
|
vAugagneur
|
b84b44a44c
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-04-23 14:22:45 +02:00 |
|
|
vAugagneur
|
e363dc8759
|
Merge Pull Request #167 - Thanks @Zeyckler
|
2013-04-23 14:22:40 +02:00 |
|
|
vAugagneur
|
ece02e6bf3
|
Merge Pull Request #167 - Thanks @Zeyckler
|
2013-04-23 14:22:40 +02:00 |
|
|
Vincent Augagneur
|
d1c7f9c012
|
Merge pull request #390 from ccauw/patch-7
[*] BO : Add block "override_form_extra" in helper
|
2013-04-23 05:20:43 -07:00 |
|
|
Vincent Augagneur
|
5e9ba185ef
|
Merge pull request #390 from ccauw/patch-7
[*] BO : Add block "override_form_extra" in helper
|
2013-04-23 05:20:43 -07:00 |
|
|
Damien Metzger
|
4be1bef203
|
// Remove "core" for the themes translations in the translation tool
|
2013-04-23 12:37:09 +02:00 |
|
|
Damien Metzger
|
d8313760ec
|
// Remove "core" for the themes translations in the translation tool
|
2013-04-23 12:37:09 +02:00 |
|
|
Rémi Gaillard
|
ceddfdd8e6
|
// add static page to replace white page for exceptions in FO
|
2013-04-23 11:54:11 +02:00 |
|
|
Rémi Gaillard
|
9282e310f4
|
// add static page to replace white page for exceptions in FO
|
2013-04-23 11:54:11 +02:00 |
|
|
vAugagneur
|
38eb16eb48
|
Merge Pull Request #53 - Thanks @Caleydon
|
2013-04-23 11:40:08 +02:00 |
|
|
vAugagneur
|
2d2b9f76e0
|
Merge Pull Request #53 - Thanks @Caleydon
|
2013-04-23 11:40:08 +02:00 |
|
|
François Gaillard
|
f1e34c20b8
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-04-23 11:39:14 +02:00 |
|
|
Francois Gaillard
|
e61bd7c185
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-04-23 11:39:14 +02:00 |
|
|
Damien Metzger
|
13c435a54b
|
// Fixed warning
|
2013-04-23 11:36:13 +02:00 |
|
|
Damien Metzger
|
b9a877625c
|
// Fixed warning
|
2013-04-23 11:36:13 +02:00 |
|
|
Damien Metzger
|
4e21c56d1b
|
// Changed translation tool behavior with dev mode and overrides
|
2013-04-23 11:21:10 +02:00 |
|
|
Damien Metzger
|
7ce6502600
|
// Changed translation tool behavior with dev mode and overrides
|
2013-04-23 11:21:10 +02:00 |
|
|
vAugagneur
|
e466ede051
|
Merge Pull request #67 - Thanks @Ha99y
|
2013-04-23 10:02:29 +02:00 |
|
|
vAugagneur
|
da96eb6651
|
Merge Pull request #67 - Thanks @Ha99y
|
2013-04-23 10:02:29 +02:00 |
|
|
vAugagneur
|
5b7da618b5
|
Merge Pull Request #21 - thanks @Caleydon
|
2013-04-23 09:34:24 +02:00 |
|