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
6aa2490915
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:48:26 +02:00
e271524cc4
Merged Pull request #302 - Thanks to @kpodemski
2013-04-16 11:48:17 +02:00
3615c225b3
// small change on quantity_per_user cart rule created on ValidateOrder
2013-04-16 11:44:09 +02:00
621ca4a29b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:35:33 +02:00
5757e56864
Merged Pull request #303 - Thanks to @kpodemski
2013-04-16 11:35:27 +02:00
3db7204f9c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 11:28:42 +02:00
50cd001d39
[-] FO : Undefined free_shipping in POC when updateQty
2013-04-16 11:28:22 +02: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
de7dc3faf6
// remove additionnal /t
2013-04-16 10:53:08 +02:00
5290a3edcb
[*] FO : add steps to authentication pull request 002f468958 thanks to radovanx
2013-04-16 10:51:16 +02:00
188cddb465
[-] Fo : Fix big pic alt with jqzoom
2013-04-16 10:22:46 +02: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
d0ae9a5a46
[-] FO : Class free order name for validateOrder
2013-04-15 18:51: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
c83bc07f20
[-] BO : Remove undefined name when module can not be installed
2013-04-15 16:21:03 +02:00
eafaf2de03
// small changes in installer
2013-04-15 14:33:20 +02:00
1bfe494e05
[-] Installer : do not select activity if not defined
2013-04-15 13:42:57 +02:00
dc2e2d0adf
// remove sql parse error
2013-04-15 12:10:27 +02:00
22b506dd41
[-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically
2013-04-15 11:48:27 +02:00
7fddcd3f38
[-] BO: Don't delete the directory of modules before upgrade them
2013-04-15 11:17:17 +02:00
5d3f48354b
[-] FO : add cart rul when cart rul has several groups
2013-04-12 18:03:38 +02:00
d907e52a92
// small css fix
2013-04-12 17:17:23 +02:00
60a787e4cb
// small css fix
2013-04-12 16:51:05 +02:00
29a919c24f
[-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule
2013-04-12 16:45:54 +02:00
b9ca25d3e6
[-] Fo : Fix undefined var in cart-summary when updating id_address_delivery
2013-04-12 12:34:37 +02:00
b7546a6ad2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-12 12:04:21 +02:00
5b48649242
[-] FO : Fix login cookie issues
2013-04-12 12:03:16 +02:00
03262debd4
//Merge Pull request #319
2013-04-12 11:55:57 +02:00
7e3640e3b7
[-] FO: fixed bug #PSCFV-3238 - compareController typo
2013-04-12 11:51:38 +02:00
329ff2fe39
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-12 11:46:44 +02:00
846d6c489d
//small spellchecking
2013-04-12 11:46:38 +02:00
a7d61c551e
[-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image
2013-04-12 11:46:19 +02:00
a89c8964b5
Merge pull request #346 from pxls/patch-1
...
[-] FO : bad variable used for free product text
2013-04-12 02:42:24 -07:00
4a1892843a
[-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch
2013-04-12 11:39:56 +02:00
f8dd047f99
Merge pull request #371 from PrestaEdit/patch-26
...
[-] Config: juste more beautifull :)
2013-04-12 01:50:54 -07:00
f30749449f
// fix for commit 3cbd8444d6
2013-04-12 10:49:30 +02:00
30fd9ac6e0
[-] CORE : Fix bug #PSCFV-5624 set order reference to CHAR(10)
2013-04-11 18:53:10 +02:00
8d06ff3044
[-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong
2013-04-11 18:09:35 +02:00
94d6b597a2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-11 17:51:34 +02:00
0786cf617f
//change the default color (#db3484)
2013-04-11 17:51:28 +02:00
6d869cc804
[-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading
2013-04-11 17:34:15 +02:00
8070739347
[-] Remove /
2013-04-11 18:18:15 +03:00
710783c066
Merge pull request #377 from PrestaEdit/patch-28
...
[+] BO: show all languages in setting of employee
2013-04-11 07:43:05 -07:00
590b0a6576
Merge pull request #375 from MrManchot/patch-1
...
Update blocknewsletter.php
2013-04-11 07:35:04 -07:00
a2f137f9de
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-11 16:31:48 +02:00
2b575e0c96
//removed commented code
2013-04-11 16:31:43 +02:00
f231cd5bd0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-11 15:59:58 +02:00
467a6f45fd
//small change in table creation of linkstopmenu again
2013-04-11 15:59:23 +02:00
8bdcaa2c2d
Merge pull request #65 from Ha99y:mobile-them-HR-fix2
2013-04-11 15:52:07 +02:00
Rémi Gaillard