Rémi Gaillard
|
98fe8b6dd5
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-20 16:37:02 +01:00 |
|
Rémi Gaillard
|
5d054704a9
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-20 16:37:02 +01:00 |
|
 Rémi GaillardandFrançois Gaillard
|
d1ee26895e
|
// Bug fix, no language is set when a employee is not logged yet
|
2013-03-20 16:06:48 +01:00 |
|
Francois Gaillard
|
0fb8bb1127
|
// Bug fix, no language is set when a employee is not logged yet
|
2013-03-20 16:06:48 +01:00 |
|
Rémi Gaillard
|
d951460cff
|
// sometimes shit happen and no language is set when a employee is not logged yet
|
2013-03-20 15:26:51 +01:00 |
|
Rémi Gaillard
|
cc996afc13
|
// sometimes shit happen and no language is set when a employee is not logged yet
|
2013-03-20 15:26:51 +01:00 |
|
Rémi Gaillard
|
3b97989d2e
|
Merge pull request #335 from djfm/pdf
// fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv,...
|
2013-03-20 06:21:15 -07:00 |
|
Rémi Gaillard
|
0924228fcd
|
Merge pull request #335 from djfm/pdf
// fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv,...
|
2013-03-20 06:21:15 -07:00 |
|
djfm
|
adf6786d40
|
// fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk
|
2013-03-20 14:13:37 +01:00 |
|
djfm
|
6ab2ffaf12
|
// fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk
|
2013-03-20 14:13:37 +01:00 |
|
vAugagneur
|
04c3b54c38
|
// remove themeinstallator from install modules list, now install from addons
|
2013-03-20 11:25:45 +01:00 |
|
vAugagneur
|
a2362d1d6f
|
// remove themeinstallator from install modules list, now install from addons
|
2013-03-20 11:25:45 +01:00 |
|
Damien Metzger
|
2fb9b140f0
|
// Code cleaning thanks to maofree #PSCFV-7953
|
2013-03-20 11:21:56 +01:00 |
|
Damien Metzger
|
40bddde9cc
|
// Code cleaning thanks to maofree #PSCFV-7953
|
2013-03-20 11:21:56 +01:00 |
|
Rémi Gaillard
|
09d5c695bb
|
[-] FO: Fix #PSCFV-7600 display accessory in the product page even if there are no stock for the default combination (on the default theme)
|
2013-03-20 11:14:33 +01:00 |
|
Rémi Gaillard
|
a6da2c12a0
|
[-] FO: Fix #PSCFV-7600 display accessory in the product page even if there are no stock for the default combination (on the default theme)
|
2013-03-20 11:14:33 +01:00 |
|
vAugagneur
|
b70497189d
|
[+] INSTALLER : added modules install from addons
|
2013-03-20 11:04:48 +01:00 |
|
vAugagneur
|
b95b5861ef
|
[+] INSTALLER : added modules install from addons
|
2013-03-20 11:04:48 +01:00 |
|
Damien Metzger
|
155150ea00
|
[-] BO : fixed product indexation markup in import #PSCFV-7695
|
2013-03-20 10:43:18 +01:00 |
|
Damien Metzger
|
77002bb3f5
|
[-] BO : fixed product indexation markup in import #PSCFV-7695
|
2013-03-20 10:43:18 +01:00 |
|
Damien Metzger
|
967a01f2ae
|
[-] FO : fixed attributes order #PSCFV-8032
|
2013-03-20 10:31:51 +01:00 |
|
Damien Metzger
|
d683478818
|
[-] FO : fixed attributes order #PSCFV-8032
|
2013-03-20 10:31:51 +01:00 |
|
Damien Metzger
|
6fdb4890cd
|
// Made order message checks more flexible #PSCFV-8123
|
2013-03-19 16:39:02 +01:00 |
|
Damien Metzger
|
51bac2107f
|
// Made order message checks more flexible #PSCFV-8123
|
2013-03-19 16:39:02 +01:00 |
|
Damien Metzger
|
9ae5e0e12a
|
// Code cleaning
|
2013-03-19 16:39:02 +01:00 |
|
Damien Metzger
|
bbd5cc3313
|
// Code cleaning
|
2013-03-19 16:39:02 +01:00 |
|
Rémi Gaillard
|
e4890b629d
|
// small fix for value of default refund displayed
|
2013-03-19 13:50:21 +01:00 |
|
Rémi Gaillard
|
0a54da23d8
|
// small fix for value of default refund displayed
|
2013-03-19 13:50:21 +01:00 |
|
gRoussac
|
b9649c754e
|
[-] BO : Fix bug #PSCFV-8027 bad sql query on messages when private bool = true
|
2013-03-19 11:34:54 +01:00 |
|
gRoussac
|
319d6ddec8
|
[-] BO : Fix bug #PSCFV-8027 bad sql query on messages when private bool = true
|
2013-03-19 11:34:54 +01:00 |
|
François Gaillard
|
5b96943e7f
|
// Bug fix : Mobile, js errors fixed
|
2013-03-19 11:16:40 +01:00 |
|
Francois Gaillard
|
2bdb188634
|
// Bug fix : Mobile, js errors fixed
|
2013-03-19 11:16:40 +01:00 |
|
gRoussac
|
1b7a914008
|
[*] BO : remove tiny_mce hard coded setup to tinymce.inc.js
|
2013-03-19 11:10:57 +01:00 |
|
gRoussac
|
39b120bbb4
|
[*] BO : remove tiny_mce hard coded setup to tinymce.inc.js
|
2013-03-19 11:10:57 +01:00 |
|
François Gaillard
|
97c5c0d0c7
|
[*] Mobile : OPC, display carrier price, gift wrapping price and gift products
|
2013-03-19 10:01:07 +01:00 |
|
Francois Gaillard
|
cd60e6785e
|
[*] Mobile : OPC, display carrier price, gift wrapping price and gift products
|
2013-03-19 10:01:07 +01:00 |
|
François Gaillard
|
fddbfa6032
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-19 09:47:46 +01:00 |
|
Francois Gaillard
|
3cd5de42b0
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-19 09:47:46 +01:00 |
|
François Gaillard
|
a7f4f82fc0
|
// Debug removed from shopping cart
|
2013-03-19 09:47:39 +01:00 |
|
Francois Gaillard
|
fef6c04f32
|
// Debug removed from shopping cart
|
2013-03-19 09:47:39 +01:00 |
|
Damien Metzger
|
ce4148b89a
|
[-] BO : added important check of the default language for ObjectModel multilang properties
|
2013-03-18 17:48:37 +01:00 |
|
Damien Metzger
|
bf171af16a
|
[-] BO : added important check of the default language for ObjectModel multilang properties
|
2013-03-18 17:48:37 +01:00 |
|
DrÿSs'
|
6a278d405d
|
[-] FO: CMS link to conditions should not be in SSL
|
2013-03-18 17:07:41 +01:00 |
|
DrÿSs
|
b4b90669d0
|
[-] FO: CMS link to conditions should not be in SSL
|
2013-03-18 17:07:41 +01:00 |
|
DrÿSs'
|
29cc8fc782
|
[-] FO: CMS link to conditions should not be in SSL
|
2013-03-18 17:05:22 +01:00 |
|
DrÿSs
|
52f76312f0
|
[-] FO: CMS link to conditions should not be in SSL
|
2013-03-18 17:05:22 +01:00 |
|
vAugagneur
|
e9c618e55b
|
//small fix when click on install button on tab module list
|
2013-03-18 15:27:56 +01:00 |
|
vAugagneur
|
5b2465e9bb
|
//small fix when click on install button on tab module list
|
2013-03-18 15:27:56 +01:00 |
|
vAugagneur
|
734c5a7c8f
|
[-] BO : fixed bug #PSCFV-8285 - module tab listing permission
|
2013-03-18 14:54:04 +01:00 |
|
vAugagneur
|
7bcc1ff651
|
[-] BO : fixed bug #PSCFV-8285 - module tab listing permission
|
2013-03-18 14:54:04 +01:00 |
|