Commit Graph

18638 Commits

Author SHA1 Message Date
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
vAugagneur
18ed37127d Merge Pull Request #21 - thanks @Caleydon 2013-04-23 09:34:24 +02:00
Rémi Gaillard
75fed1a2cc Merge pull request #398 from djfm/release
[*] TR : added russian installer tabs
2013-04-22 09:42:39 -07:00
Rémi Gaillard
d8453cccfb Merge pull request #398 from djfm/release
[*] TR : added russian installer tabs
2013-04-22 09:42:39 -07:00
djfm
da1f92b85b [*] TR : added russian installer tabs 2013-04-22 18:37:28 +02:00
djfm
88dce29e32 [*] TR : added russian installer tabs 2013-04-22 18:37:28 +02:00
Rémi Gaillard
cd079f7a1a Merge pull request #397 from djfm/release
[*] TR : Fixed wrong use of translation functions
2013-04-22 08:46:15 -07:00
Rémi Gaillard
4adc9f2ccf Merge pull request #397 from djfm/release
[*] TR : Fixed wrong use of translation functions
2013-04-22 08:46:15 -07:00
djfm
0da1eb9e35 [*] TR : Fixed wrong use of translation functions in AdminTranslationsController 2013-04-22 17:24:47 +02:00
djfm
19ce381cba [*] TR : Fixed wrong use of translation functions in AdminTranslationsController 2013-04-22 17:24:47 +02:00
Damien Metzger
38adc4aaf3 Merge pull request #396 from djfm/installer_tabs
[*] TR : Added tab translations for installer languages
2013-04-22 07:01:40 -07:00
Damien Metzger
260dd12edd Merge pull request #396 from djfm/installer_tabs
[*] TR : Added tab translations for installer languages
2013-04-22 07:01:40 -07:00
djfm
7912aba499 [*] TR : Added tab translations for installer languages 2013-04-22 15:40:25 +02:00
djfm
6a70093416 [*] TR : Added tab translations for installer languages 2013-04-22 15:40:25 +02:00
vAugagneur
5fb2bb9ee2 [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
vAugagneur
3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
gRoussac
59ab9b63cf [*] FO : one_phone_at_least should be set 2013-04-22 12:20:39 +02:00
gRoussac
bcdb85c309 [*] FO : one_phone_at_least should be set 2013-04-22 12:20:39 +02:00
gRoussac
90bf119624 [-] Fo : Remove additionnal space in phone field value 2013-04-22 12:20:23 +02:00
gRoussac
5be95a8a98 [-] Fo : Remove additionnal space in phone field value 2013-04-22 12:20:23 +02:00
gRoussac
116df3b3fd [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-22 12:20:07 +02:00
gRoussac
58884b2da7 [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-22 12:20:07 +02:00
gRoussac
34688d6933 [*] FO : one_phone_at_least should be set 2013-04-22 12:18:26 +02:00
gRoussac
d8b39d060d [*] FO : one_phone_at_least should be set 2013-04-22 12:18:26 +02:00
gRoussac
4bf41c590b [-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state 2013-04-22 12:09:35 +02:00
gRoussac
c5ed733cfc [-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state 2013-04-22 12:09:35 +02:00
vAugagneur
31e7c6a08e Merged Pull request #355 - thanks to @bibendi 2013-04-22 12:06:19 +02:00
vAugagneur
aead567def Merged Pull request #355 - thanks to @bibendi 2013-04-22 12:06:19 +02:00
Damien Metzger
141772725b // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
Damien Metzger
e7b22ad8d4 // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
gRoussac
fd46c87786 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-22 11:34:02 +02:00
gRoussac
6b8c3d8612 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-22 11:34:02 +02:00
gRoussac
34a2c0191c [-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks 2013-04-22 11:33:13 +02:00
gRoussac
1acd07e063 [-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks 2013-04-22 11:33:13 +02:00
Rémi Gaillard
7c4a188ae8 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists 2013-04-22 10:50:41 +02:00
Rémi Gaillard
20f8709940 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists 2013-04-22 10:50:41 +02:00
Vincent Augagneur
7c43ae05fc Merge pull request #123 from rynge/admin_category_breadcrumbs
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
2013-04-22 01:18:15 -07:00
Vincent Augagneur
c643abcfa2 Merge pull request #123 from rynge/admin_category_breadcrumbs
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
2013-04-22 01:18:15 -07:00
vAugagneur
b1a839263d [*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger 2013-04-22 09:48:30 +02:00
vAugagneur
ec051deb31 [*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger 2013-04-22 09:48:30 +02:00
vAugagneur
5f6d0614df [*] FO : Wait for the image to be loaded before displaying the big image on product page - thanks to @romainberger 2013-04-22 09:40:48 +02:00
vAugagneur
50528a5fe3 [*] FO : Wait for the image to be loaded before displaying the big image on product page - thanks to @romainberger 2013-04-22 09:40:48 +02:00