03eadb3d6a
Remove spaces before and after dot
2013-04-16 13:39:42 +04:00
70176f07e6
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:35:33 +02:00
621ca4a29b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:35:33 +02:00
661ddd7548
Merged Pull request #303 - Thanks to @kpodemski
2013-04-16 11:35:27 +02:00
5757e56864
Merged Pull request #303 - Thanks to @kpodemski
2013-04-16 11:35:27 +02:00
c0ae0c9b28
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:28:42 +02:00
3db7204f9c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:28:42 +02:00
f2bdb73d39
[-] FO : Undefined free_shipping in POC when updateQty
2013-04-16 11:28:22 +02:00
50cd001d39
[-] FO : Undefined free_shipping in POC when updateQty
2013-04-16 11:28:22 +02:00
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
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
b2f5ed838d
// remove additionnal /t
2013-04-16 10:53:08 +02:00
de7dc3faf6
// remove additionnal /t
2013-04-16 10:53:08 +02:00
a4d86f14da
[*] FO : add steps to authentication pull request 002f468958 thanks to radovanx
2013-04-16 10:51:16 +02:00
5290a3edcb
[*] FO : add steps to authentication pull request 002f468958 thanks to radovanx
2013-04-16 10:51:16 +02:00
6cdf8babca
[-] Fo : Fix big pic alt with jqzoom
2013-04-16 10:22:46 +02:00
188cddb465
[-] Fo : Fix big pic alt with jqzoom
2013-04-16 10:22:46 +02:00
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
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
00d7d78ba6
[-] FO : Class free order name for validateOrder
2013-04-15 18:51:41 +02:00
d0ae9a5a46
[-] FO : Class free order name for validateOrder
2013-04-15 18:51:41 +02:00
eca4a87082
[-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers
2013-04-15 18:30:41 +02:00
be6b938258
[-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers
2013-04-15 18:30:41 +02:00
5989481859
[-] BO : Remove undefined name when module can not be installed
2013-04-15 16:21:03 +02:00
c83bc07f20
[-] BO : Remove undefined name when module can not be installed
2013-04-15 16:21:03 +02:00
23b70c4906
// small changes in installer
2013-04-15 14:33:20 +02:00
eafaf2de03
// small changes in installer
2013-04-15 14:33:20 +02:00
df111c0662
[-] Installer : do not select activity if not defined
2013-04-15 13:42:57 +02:00
1bfe494e05
[-] Installer : do not select activity if not defined
2013-04-15 13:42:57 +02:00
bf90c8cf84
// remove sql parse error
2013-04-15 12:10:27 +02:00
dc2e2d0adf
// remove sql parse error
2013-04-15 12:10:27 +02:00
047551952e
[-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically
2013-04-15 11:48:27 +02:00
22b506dd41
[-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically
2013-04-15 11:48:27 +02:00
7a89d0596f
[-] BO: Don't delete the directory of modules before upgrade them
2013-04-15 11:17:17 +02:00
7fddcd3f38
[-] BO: Don't delete the directory of modules before upgrade them
2013-04-15 11:17:17 +02:00
0256ee7c59
[-] FO : add cart rul when cart rul has several groups
2013-04-12 18:03:38 +02:00
5d3f48354b
[-] FO : add cart rul when cart rul has several groups
2013-04-12 18:03:38 +02:00
cf874a832a
// small css fix
2013-04-12 17:17:23 +02:00
d907e52a92
// small css fix
2013-04-12 17:17:23 +02:00
bd0e467c97
// small css fix
2013-04-12 16:51:05 +02:00
60a787e4cb
// small css fix
2013-04-12 16:51:05 +02:00
0ba0a25f3d
[-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule
2013-04-12 16:45:54 +02:00
29a919c24f
[-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule
2013-04-12 16:45:54 +02:00
7f5a78a120
Update AdminThemesController.php
2013-04-12 18:51:50 +08:00
20901e5c85
Update AdminThemesController.php
2013-04-12 18:51:50 +08:00
f209d5a669
[-] Fo : Fix undefined var in cart-summary when updating id_address_delivery
2013-04-12 12:34:37 +02:00
b9ca25d3e6
[-] Fo : Fix undefined var in cart-summary when updating id_address_delivery
2013-04-12 12:34:37 +02:00
a73c09ab4c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-12 12:04:21 +02:00
b7546a6ad2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-12 12:04:21 +02:00
fcce2d2737
[-] FO : Fix login cookie issues
2013-04-12 12:03:16 +02:00
Andrew