3389143d91
Merge pull request #1120 from aino/1.6
...
[-] BO : Set correct table alias name in updatePosition
2013-12-10 22:09:26 -08:00
addb65eb5f
[-] BO : Set correct table alias name in updatePosition
2013-12-11 02:09:45 +01:00
1dcc5e288c
[*] FO : Move header modules to new hook, first part 1/2
2013-12-10 20:52:22 +01:00
78df7f52f4
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-10 19:08:58 +01:00
7e7e2986b2
// start css refactor + optimisation
2013-12-10 19:08:42 +01:00
f34975f3fc
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-10 18:49:58 +01:00
85f1de2e8f
// move RMA form on order-detail
2013-12-10 18:49:29 +01:00
e92d0bb0eb
// Missing space
2013-12-10 17:38:09 +01:00
5977cb0fbc
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-10 17:17:02 +01:00
66f3e70d8b
// Homefeatured js not used > bootstrap
2013-12-10 17:16:33 +01:00
05f3c259e0
[-] BO : FixBug #PSCSX-37 - Double upload in carrier wizard
2013-12-10 16:59:51 +01:00
2cd22bbf98
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-10 16:37:50 +01:00
c781d8ef2d
// update tpl for w3c validator and code indent
2013-12-10 16:37:25 +01:00
46d230ed9c
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-10 16:19:06 +01:00
5e31511117
// BlockLayered hook template backward compatibility
2013-12-10 16:18:59 +01:00
c9409e8441
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-10 16:18:44 +01:00
ffc7c2f19d
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-10 15:28:30 +01:00
4a22abc2d1
// fix dual pagination id duplicate
2013-12-10 15:28:17 +01:00
98950b733a
[-] MO : blockcms - Clean cache when "display on footer" parameter is updated
2013-12-10 15:16:08 +01:00
1d808f89b5
// fix functionnal-buttons
2013-12-10 15:06:51 +01:00
167a5c7921
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-10 14:25:18 +01:00
cfa606b12c
// convert global to sass - 100% (can be compiled)
2013-12-10 14:25:06 +01:00
992dddcbb4
// Virtual Product bootsraping
2013-12-10 13:51:34 +01:00
d511828a91
// BlockLayered removing missing template var
2013-12-10 11:49:55 +01:00
a45e816e98
// ids instead of class on home tab toogle
2013-12-10 11:45:22 +01:00
70628845b7
[-] BO: call actionProductUpdate hook on status change
2013-12-10 11:41:02 +01:00
a94666c4fb
// convert global to sass - WIP 75%
2013-12-10 10:40:14 +01:00
8929bb5f21
[-] BO : FixBug #PSCSX-86 Missing color selector
2013-12-10 10:30:46 +01:00
7816664911
[-] BO : FixBug #PSCSX-91 Wrong texture display in products attributes colors
2013-12-10 10:14:15 +01:00
4a013cf537
[-] BO : FixBug #PSCSX-100 wrong checkbox integration
2013-12-10 09:43:03 +01:00
5429fd67ff
// Fix small warning in dashgoals
2013-12-10 09:32:13 +01:00
808347cb2f
[-] MO : Newsletter - FixBug #PSCSX-113 - Missing id in field desc
2013-12-10 09:17:27 +01:00
6d669cb5f1
// global rewrited in sass - WIP 50% (won’t compile yet)
2013-12-09 19:16:27 +01:00
d4de6342b4
[-] MO : BlockLayered - Fix missing attribute anchor separator
2013-12-09 18:37:55 +01:00
fcf568b9ea
// BlockLayered 1.5 backward compatibility
2013-12-09 18:21:31 +01:00
cf77deeba2
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-09 17:26:05 +01:00
ed92603472
// Small Fix in modules upload
2013-12-09 17:25:41 +01:00
dc7bf76b24
Merge pull request #1114 from glafarge/patch-1
...
[-] FO : Fix versatile jQuery selector
2013-12-09 08:24:02 -08:00
e7ef71f32e
[-] FO : Fix versatile jQuery selector
...
`:hidden` selects form elements with `type="hidden"` but also : elements with `display:none`, elements with their width/height equal to zero and which the ancestor element is hidden.
`input[type=hidden]` is more appropriate for those reasons.
2013-12-09 17:17:48 +01:00
24cd0bbdb0
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-09 16:48:55 +01:00
79652b1704
// removed « add to compare» from the homepage
2013-12-09 16:48:37 +01:00
ee9239b404
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-09 16:40:00 +01:00
0e3545186d
// change behavior of displaywarning on backoffice
2013-12-09 16:39:43 +01:00
8700f15c61
// closed an attribute left behind
2013-12-09 16:39:33 +01:00
91c3bf48b1
// w3C product
2013-12-09 14:26:17 +01:00
27e8beb6a9
Merge pull request #1111 from Gamesh/patch-1
...
[*] FO: now you can download files >1G without running into max executio...
2013-12-09 05:17:14 -08:00
5c496f45a1
[*] FO: now you can download files >1G without running into max execution limitation
...
Added @ to suppress warning i safe mode.
2013-12-09 15:04:16 +02:00
b0c9e73e30
[+] BO : Add error control to modules uploading
2013-12-09 11:30:42 +01:00
ea450edc4c
// more W3C
2013-12-09 10:15:53 +01:00
b2199a2f12
Merge pull request #1112 from djfm/1.6
...
// take force_compile setting into account in Back-Office
2013-12-09 01:04:20 -08:00
Jérôme Nadaud