Rémi Gaillard
8c5143de9e
[-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here
2013-04-16 12:01:04 +02:00
Rémi Gaillard
7bb98b16f3
[-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here
2013-04-16 12:01:04 +02:00
vAugagneur
b1b71c0c07
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:48:26 +02:00
vAugagneur
6aa2490915
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:48:26 +02:00
vAugagneur
7c626218df
Merged Pull request #302 - Thanks to @kpodemski
2013-04-16 11:48:17 +02:00
vAugagneur
e271524cc4
Merged Pull request #302 - Thanks to @kpodemski
2013-04-16 11:48:17 +02:00
gRoussac
62fd5c6195
// small change on quantity_per_user cart rule created on ValidateOrder
2013-04-16 11:44:09 +02:00
gRoussac
3615c225b3
// small change on quantity_per_user cart rule created on ValidateOrder
2013-04-16 11:44:09 +02:00
Andrew
5ab4c18396
Remove spaces before and after dot
2013-04-16 13:43:24 +04:00
Andrew
dface458a9
Remove spaces before and after dot
2013-04-16 13:43:24 +04:00
Andrew
a93cfbec07
Remove spaces before and after dot
2013-04-16 13:39:42 +04:00
Andrew
03eadb3d6a
Remove spaces before and after dot
2013-04-16 13:39:42 +04:00
vAugagneur
70176f07e6
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:35:33 +02:00
vAugagneur
621ca4a29b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:35:33 +02:00
vAugagneur
661ddd7548
Merged Pull request #303 - Thanks to @kpodemski
2013-04-16 11:35:27 +02:00
vAugagneur
5757e56864
Merged Pull request #303 - Thanks to @kpodemski
2013-04-16 11:35:27 +02:00
gRoussac
c0ae0c9b28
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:28:42 +02:00
gRoussac
3db7204f9c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:28:42 +02:00
gRoussac
f2bdb73d39
[-] FO : Undefined free_shipping in POC when updateQty
2013-04-16 11:28:22 +02:00
gRoussac
50cd001d39
[-] FO : Undefined free_shipping in POC when updateQty
2013-04-16 11:28:22 +02:00
Vincent Augagneur
df60120d5f
Merge pull request #387 from ccauw/patch-4
...
[*] BO : Add block "close_td" in list_content.tpl
2013-04-16 02:23:04 -07:00
Vincent Augagneur
30c9885624
Merge pull request #387 from ccauw/patch-4
...
[*] BO : Add block "close_td" in list_content.tpl
2013-04-16 02:23:04 -07:00
gRoussac
b2f5ed838d
// remove additionnal /t
2013-04-16 10:53:08 +02:00
gRoussac
de7dc3faf6
// remove additionnal /t
2013-04-16 10:53:08 +02:00
gRoussac
a4d86f14da
[*] FO : add steps to authentication pull request 002f468958 thanks to radovanx
2013-04-16 10:51:16 +02:00
gRoussac
5290a3edcb
[*] FO : add steps to authentication pull request 002f468958 thanks to radovanx
2013-04-16 10:51:16 +02:00
gRoussac
6cdf8babca
[-] Fo : Fix big pic alt with jqzoom
2013-04-16 10:22:46 +02:00
gRoussac
188cddb465
[-] Fo : Fix big pic alt with jqzoom
2013-04-16 10:22:46 +02:00
ccauw
7711c710d4
[*] BO : Add block "close_td" in list_content.tpl
...
[*] BO : Add block "close_td" in list_content.tpl
{block name="td_content"}
.....
{/block}
{block name="close_td"}
{/block}
So now we can override "td" and "/td" tags.
So we can create
"td" "a" ... content.... "/a" "/td"
when overriding the block open-td and close-td
and we can use "a" tag with "href" rather than "onclick" to create view links in the list.
And the user can choose to open the link in another tab or window.
2013-04-15 20:19:10 +03:00
ccauw
6e58a24325
[*] BO : Add block "close_td" in list_content.tpl
...
[*] BO : Add block "close_td" in list_content.tpl
{block name="td_content"}
.....
{/block}
{block name="close_td"}
{/block}
So now we can override "td" and "/td" tags.
So we can create
"td" "a" ... content.... "/a" "/td"
when overriding the block open-td and close-td
and we can use "a" tag with "href" rather than "onclick" to create view links in the list.
And the user can choose to open the link in another tab or window.
2013-04-15 20:19:10 +03:00
gRoussac
00d7d78ba6
[-] FO : Class free order name for validateOrder
2013-04-15 18:51:41 +02:00
gRoussac
d0ae9a5a46
[-] FO : Class free order name for validateOrder
2013-04-15 18:51:41 +02:00
gRoussac
eca4a87082
[-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers
2013-04-15 18:30:41 +02:00
gRoussac
be6b938258
[-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers
2013-04-15 18:30:41 +02:00
gRoussac
5989481859
[-] BO : Remove undefined name when module can not be installed
2013-04-15 16:21:03 +02:00
gRoussac
c83bc07f20
[-] BO : Remove undefined name when module can not be installed
2013-04-15 16:21:03 +02:00
Rémi Gaillard
23b70c4906
// small changes in installer
2013-04-15 14:33:20 +02:00
Rémi Gaillard
eafaf2de03
// small changes in installer
2013-04-15 14:33:20 +02:00
gRoussac
df111c0662
[-] Installer : do not select activity if not defined
2013-04-15 13:42:57 +02:00
gRoussac
1bfe494e05
[-] Installer : do not select activity if not defined
2013-04-15 13:42:57 +02:00
gRoussac
bf90c8cf84
// remove sql parse error
2013-04-15 12:10:27 +02:00
gRoussac
dc2e2d0adf
// remove sql parse error
2013-04-15 12:10:27 +02:00
gRoussac
047551952e
[-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically
2013-04-15 11:48:27 +02:00
gRoussac
22b506dd41
[-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically
2013-04-15 11:48:27 +02:00
Rémi Gaillard
7a89d0596f
[-] BO: Don't delete the directory of modules before upgrade them
2013-04-15 11:17:17 +02:00
Rémi Gaillard
7fddcd3f38
[-] BO: Don't delete the directory of modules before upgrade them
2013-04-15 11:17:17 +02:00
gRoussac
0256ee7c59
[-] FO : add cart rul when cart rul has several groups
2013-04-12 18:03:38 +02:00
gRoussac
5d3f48354b
[-] FO : add cart rul when cart rul has several groups
2013-04-12 18:03:38 +02:00
gRoussac
cf874a832a
// small css fix
2013-04-12 17:17:23 +02:00
gRoussac
d907e52a92
// small css fix
2013-04-12 17:17:23 +02:00
