Commit Graph

20989 Commits

Author SHA1 Message Date
Jérôme Nadaud 0af76e01fb Merge pull request #1124 from PhpMadman/1.6-HistoryColorFix
[*] FO : Fixed issue with custom statues does not have any color, ...
2013-12-11 03:10:38 -08:00
PhpMadman b40c642737 [*] FO : Fixed issue with custom statues does not have any color, and text was not visible 2013-12-11 11:56:13 +01:00
Jérôme Nadaud 850350c2a6 Merge pull request #1123 from PhpMadman/patch-2
Update CONTRIBUTING.md
2013-12-11 02:46:12 -08:00
Jerome Nadaud 347c0176a5 [-] CORE : FixBug #PSCSX-89 - Up configuration name size to 255 2013-12-11 11:44:34 +01:00
PhpMadman 260d31cae0 Update CONTRIBUTING.md 2013-12-11 11:27:40 +01:00
Jerome Nadaud 3792fab83a // Fix missing save button on list display 2013-12-11 11:00:50 +01:00
Jerome Nadaud 9badb78f5b [-] BO : FixBug #PSCSX-115 Friendly URL generated 2013-12-11 10:39:25 +01:00
Jerome Nadaud 551358f88b [-] BO : FixBug #PSCSX-116 Wrong friendly url hint description 2013-12-11 09:59:00 +01:00
Jerome Nadaud fe8d9923f6 // Add new root category button to page header toolbar 2013-12-11 09:39:47 +01:00
Jerome Nadaud 63a04fd2dd // Fix remove filename from file input when logo removed 2013-12-11 09:39:01 +01:00
Jerome Nadaud c869a63f35 // Fix missing Carrier wizard cancel button 2013-12-11 09:38:31 +01:00
Jérôme Nadaud 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
Mikko Hellsing addb65eb5f [-] BO : Set correct table alias name in updatePosition 2013-12-11 02:09:45 +01:00
gRoussac 1dcc5e288c [*] FO : Move header modules to new hook, first part 1/2 2013-12-10 20:52:22 +01:00
Kevin Granger 78df7f52f4 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 19:08:58 +01:00
Kevin Granger 7e7e2986b2 // start css refactor + optimisation 2013-12-10 19:08:42 +01:00
rGaillard f34975f3fc Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 18:49:58 +01:00
rGaillard 85f1de2e8f // move RMA form on order-detail 2013-12-10 18:49:29 +01:00
Jerome Nadaud e92d0bb0eb // Missing space 2013-12-10 17:38:09 +01:00
gRoussac 5977cb0fbc Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 17:17:02 +01:00
gRoussac 66f3e70d8b // Homefeatured js not used > bootstrap 2013-12-10 17:16:33 +01:00
Jerome Nadaud 05f3c259e0 [-] BO : FixBug #PSCSX-37 - Double upload in carrier wizard 2013-12-10 16:59:51 +01:00
sLorenzini 2cd22bbf98 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 16:37:50 +01:00
sLorenzini c781d8ef2d // update tpl for w3c validator and code indent 2013-12-10 16:37:25 +01:00
Jerome Nadaud 46d230ed9c Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 16:19:06 +01:00
Jerome Nadaud 5e31511117 // BlockLayered hook template backward compatibility 2013-12-10 16:18:59 +01:00
gRoussac c9409e8441 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 16:18:44 +01:00
Kevin Granger ffc7c2f19d Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 15:28:30 +01:00
Kevin Granger 4a22abc2d1 // fix dual pagination id duplicate 2013-12-10 15:28:17 +01:00
Jerome Nadaud 98950b733a [-] MO : blockcms - Clean cache when "display on footer" parameter is updated 2013-12-10 15:16:08 +01:00
Kevin Granger 1d808f89b5 // fix functionnal-buttons 2013-12-10 15:06:51 +01:00
Kevin Granger 167a5c7921 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 14:25:18 +01:00
Kevin Granger cfa606b12c // convert global to sass - 100% (can be compiled) 2013-12-10 14:25:06 +01:00
Jerome Nadaud 992dddcbb4 // Virtual Product bootsraping 2013-12-10 13:51:34 +01:00
Jerome Nadaud d511828a91 // BlockLayered removing missing template var 2013-12-10 11:49:55 +01:00
gRoussac a45e816e98 // ids instead of class on home tab toogle 2013-12-10 11:45:22 +01:00
rGaillard 70628845b7 [-] BO: call actionProductUpdate hook on status change 2013-12-10 11:41:02 +01:00
Kevin Granger a94666c4fb // convert global to sass - WIP 75% 2013-12-10 10:40:14 +01:00
Jerome Nadaud 8929bb5f21 [-] BO : FixBug #PSCSX-86 Missing color selector 2013-12-10 10:30:46 +01:00
Jerome Nadaud 7816664911 [-] BO : FixBug #PSCSX-91 Wrong texture display in products attributes colors 2013-12-10 10:14:15 +01:00
Jerome Nadaud 4a013cf537 [-] BO : FixBug #PSCSX-100 wrong checkbox integration 2013-12-10 09:43:03 +01:00
Jerome Nadaud 5429fd67ff // Fix small warning in dashgoals 2013-12-10 09:32:13 +01:00
Jerome Nadaud 808347cb2f [-] MO : Newsletter - FixBug #PSCSX-113 - Missing id in field desc 2013-12-10 09:17:27 +01:00
Kevin Granger 6d669cb5f1 // global rewrited in sass - WIP 50% (won’t compile yet) 2013-12-09 19:16:27 +01:00
Jerome Nadaud d4de6342b4 [-] MO : BlockLayered - Fix missing attribute anchor separator 2013-12-09 18:37:55 +01:00
Jerome Nadaud fcf568b9ea // BlockLayered 1.5 backward compatibility 2013-12-09 18:21:31 +01:00
Jerome Nadaud cf77deeba2 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-09 17:26:05 +01:00
Jerome Nadaud ed92603472 // Small Fix in modules upload 2013-12-09 17:25:41 +01:00
Gregory Roussac dc7bf76b24 Merge pull request #1114 from glafarge/patch-1
[-] FO : Fix versatile jQuery selector
2013-12-09 08:24:02 -08:00
Guillaume Lafarge 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