dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 89874a063d // blockcontact switch phone 1.6 gRoussac 2013-12-11 21:28:33 +01:00
  • 4895c95a19 Merge pull request #1128 from kpodemski/patch-2 Jérôme Nadaud 2013-12-11 12:03:52 -08:00
  • edb72662bf [-] CORE : After adding cart rule redirect improvements Krystian Podemski 2013-12-11 21:00:36 +01:00
  • 1d5cf86d19 [-] MO : Blocktopmenu - Fix missing categories and cms categories options Jerome Nadaud 2013-12-11 19:26:12 +01:00
  • 1284317326 // vip homepage ( markup + css ) Kevin Granger 2013-12-11 19:05:01 +01:00
  • e2f60aa6f6 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-11 17:46:43 +01:00
  • 569c75f111 // add upload and download process icons Kevin Granger 2013-12-11 17:46:29 +01:00
  • 78c49c0da1 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 sLorenzini 2013-12-11 17:34:28 +01:00
  • b66d47083e // update schema.org on product-list sLorenzini 2013-12-11 17:34:17 +01:00
  • fce4e79b4d [-] MO : BlockLayered - FixBug #PNM-1331 Categories now filtered by groups Jerome Nadaud 2013-12-11 17:31:55 +01:00
  • bbf2899311 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-11 17:18:35 +01:00
  • e607abf2a6 // fix compilation for some scss (to be continued) Kevin Granger 2013-12-11 17:18:20 +01:00
  • b93a9cb7a3 // fix typo in filename Kevin Granger 2013-12-11 17:00:32 +01:00
  • debff833cd // missing mod gRoussac 2013-12-11 16:58:38 +01:00
  • b9db5d5023 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-11 16:56:12 +01:00
  • 36968d76b6 // header markup retake Kevin Granger 2013-12-11 16:55:53 +01:00
  • 3249a6bd99 // duplicate hooking on install gRoussac 2013-12-11 16:31:37 +01:00
  • c574b04a63 [*] FO : Move header modules to new hook, last part 2/2 gRoussac 2013-12-11 16:22:33 +01:00
  • 472742a42d // Small smarty escape fix Jerome Nadaud 2013-12-11 16:22:06 +01:00
  • 1056f295a3 [-] MO : BlockLayered - FixBug #PNM-468 Correct sprintf format Jerome Nadaud 2013-12-11 15:08:01 +01:00
  • 00253ab8b5 [-] MO : BlockLayered - FixBug #PNM-468 Wrong filter unit Jerome Nadaud 2013-12-11 15:03:11 +01:00
  • a2340079c1 [-] BO : FixBug #PSCSX-84 Fix image mapping position Jerome Nadaud 2013-12-11 12:58:08 +01:00
  • 807183b1c5 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Jerome Nadaud 2013-12-11 12:34:12 +01:00
  • a918c468ec [-] BO : FixBug #PSCSX-122 Live module favorite Jerome Nadaud 2013-12-11 12:33:33 +01:00
  • f8b7e02396 // shouldn’t change .container behavior Kevin Granger 2013-12-11 12:25:28 +01:00
  • 8f71f36be9 // css fixs Kevin Granger 2013-12-11 12:18:18 +01:00
  • 0af76e01fb Merge pull request #1124 from PhpMadman/1.6-HistoryColorFix Jérôme Nadaud 2013-12-11 03:10:38 -08:00
  • 445b5e9b99 Merge pull request #1121 from dlage/patch-1 1.5 Gregory Roussac 2013-12-11 03:00:00 -08:00
  • b40c642737 [*] FO : Fixed issue with custom statues does not have any color, and text was not visible PhpMadman 2013-12-11 11:56:13 +01:00
  • 850350c2a6 Merge pull request #1123 from PhpMadman/patch-2 Jérôme Nadaud 2013-12-11 02:46:12 -08:00
  • 347c0176a5 [-] CORE : FixBug #PSCSX-89 - Up configuration name size to 255 Jerome Nadaud 2013-12-11 11:44:34 +01:00
  • 260d31cae0 Update CONTRIBUTING.md PhpMadman 2013-12-11 11:27:40 +01:00
  • 3792fab83a // Fix missing save button on list display Jerome Nadaud 2013-12-11 11:00:50 +01:00
  • 9badb78f5b [-] BO : FixBug #PSCSX-115 Friendly URL generated Jerome Nadaud 2013-12-11 10:39:25 +01:00
  • 551358f88b [-] BO : FixBug #PSCSX-116 Wrong friendly url hint description Jerome Nadaud 2013-12-11 09:59:00 +01:00
  • fe8d9923f6 // Add new root category button to page header toolbar Jerome Nadaud 2013-12-11 09:39:47 +01:00
  • 63a04fd2dd // Fix remove filename from file input when logo removed Jerome Nadaud 2013-12-11 09:39:01 +01:00
  • c869a63f35 // Fix missing Carrier wizard cancel button Jerome Nadaud 2013-12-11 09:38:31 +01:00
  • 3389143d91 Merge pull request #1120 from aino/1.6 Jérôme Nadaud 2013-12-10 22:09:26 -08:00
  • b4c4068e41 [-] BO : fixed bug loading wrong root category in AdminCategoriesController patch-1 dlage 2013-12-11 01:38:05 +00:00
  • addb65eb5f [-] BO : Set correct table alias name in updatePosition Mikko Hellsing 2013-12-11 02:01:48 +01:00
  • 1dcc5e288c [*] FO : Move header modules to new hook, first part 1/2 gRoussac 2013-12-10 20:52:22 +01:00
  • 78df7f52f4 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-10 19:08:58 +01:00
  • 7e7e2986b2 // start css refactor + optimisation Kevin Granger 2013-12-10 19:08:42 +01:00
  • f34975f3fc Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 rGaillard 2013-12-10 18:49:58 +01:00
  • 85f1de2e8f // move RMA form on order-detail rGaillard 2013-12-10 18:49:29 +01:00
  • e92d0bb0eb // Missing space Jerome Nadaud 2013-12-10 17:38:09 +01:00
  • 5977cb0fbc Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 gRoussac 2013-12-10 17:17:02 +01:00
  • 66f3e70d8b // Homefeatured js not used > bootstrap gRoussac 2013-12-10 17:16:33 +01:00
  • 05f3c259e0 [-] BO : FixBug #PSCSX-37 - Double upload in carrier wizard Jerome Nadaud 2013-12-10 16:59:51 +01:00
  • 2cd22bbf98 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 sLorenzini 2013-12-10 16:37:50 +01:00
  • c781d8ef2d // update tpl for w3c validator and code indent sLorenzini 2013-12-10 16:37:25 +01:00
  • 46d230ed9c Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Jerome Nadaud 2013-12-10 16:19:06 +01:00
  • 5e31511117 // BlockLayered hook template backward compatibility Jerome Nadaud 2013-12-10 16:18:59 +01:00
  • c9409e8441 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 gRoussac 2013-12-10 16:18:44 +01:00
  • ffc7c2f19d Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-10 15:28:30 +01:00
  • 4a22abc2d1 // fix dual pagination id duplicate Kevin Granger 2013-12-10 15:28:17 +01:00
  • 98950b733a [-] MO : blockcms - Clean cache when "display on footer" parameter is updated Jerome Nadaud 2013-12-10 15:16:08 +01:00
  • 1d808f89b5 // fix functionnal-buttons Kevin Granger 2013-12-10 15:06:51 +01:00
  • 167a5c7921 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-10 14:25:18 +01:00
  • cfa606b12c // convert global to sass - 100% (can be compiled) Kevin Granger 2013-12-10 14:25:06 +01:00
  • 992dddcbb4 // Virtual Product bootsraping Jerome Nadaud 2013-12-10 13:51:34 +01:00
  • d511828a91 // BlockLayered removing missing template var Jerome Nadaud 2013-12-10 11:49:55 +01:00
  • a45e816e98 // ids instead of class on home tab toogle gRoussac 2013-12-10 11:45:22 +01:00
  • 70628845b7 [-] BO: call actionProductUpdate hook on status change rGaillard 2013-12-10 11:41:02 +01:00
  • a94666c4fb // convert global to sass - WIP 75% Kevin Granger 2013-12-10 10:40:14 +01:00
  • 8929bb5f21 [-] BO : FixBug #PSCSX-86 Missing color selector Jerome Nadaud 2013-12-10 10:30:46 +01:00
  • 7816664911 [-] BO : FixBug #PSCSX-91 Wrong texture display in products attributes colors Jerome Nadaud 2013-12-10 10:14:15 +01:00
  • fd1050b0db //tab module list fix Vincent Augagneur 2013-12-10 09:43:15 +01:00
  • 4a013cf537 [-] BO : FixBug #PSCSX-100 wrong checkbox integration Jerome Nadaud 2013-12-10 09:43:03 +01:00
  • 5429fd67ff // Fix small warning in dashgoals Jerome Nadaud 2013-12-10 09:32:13 +01:00
  • 808347cb2f [-] MO : Newsletter - FixBug #PSCSX-113 - Missing id in field desc Jerome Nadaud 2013-12-10 09:17:27 +01:00
  • 6d669cb5f1 // global rewrited in sass - WIP 50% (won’t compile yet) Kevin Granger 2013-12-09 19:16:27 +01:00
  • d4de6342b4 [-] MO : BlockLayered - Fix missing attribute anchor separator Jerome Nadaud 2013-12-09 18:37:55 +01:00
  • fcf568b9ea // BlockLayered 1.5 backward compatibility Jerome Nadaud 2013-12-09 18:21:31 +01:00
  • cf77deeba2 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Jerome Nadaud 2013-12-09 17:26:05 +01:00
  • ed92603472 // Small Fix in modules upload Jerome Nadaud 2013-12-09 17:25:41 +01:00
  • dc7bf76b24 Merge pull request #1114 from glafarge/patch-1 Gregory Roussac 2013-12-09 08:24:02 -08:00
  • e7ef71f32e [-] FO : Fix versatile jQuery selector Guillaume Lafarge 2013-12-09 17:17:48 +01:00
  • 24cd0bbdb0 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-09 16:48:55 +01:00
  • 79652b1704 // removed « add to compare» from the homepage Kevin Granger 2013-12-09 16:48:37 +01:00
  • ee9239b404 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 rGaillard 2013-12-09 16:40:00 +01:00
  • 0e3545186d // change behavior of displaywarning on backoffice rGaillard 2013-12-09 16:39:43 +01:00
  • 8700f15c61 // closed an attribute left behind Kevin Granger 2013-12-09 16:39:33 +01:00
  • 91c3bf48b1 // w3C product Kevin Granger 2013-12-09 14:26:17 +01:00
  • 27e8beb6a9 Merge pull request #1111 from Gamesh/patch-1 Gregory Roussac 2013-12-09 05:17:14 -08:00
  • 5c496f45a1 [*] FO: now you can download files >1G without running into max execution limitation Gamesh 2013-12-09 15:04:16 +02:00
  • b0c9e73e30 [+] BO : Add error control to modules uploading Jerome Nadaud 2013-12-09 11:30:42 +01:00
  • ea450edc4c // more W3C Kevin Granger 2013-12-09 10:15:53 +01:00
  • b2199a2f12 Merge pull request #1112 from djfm/1.6 Rémi Gaillard 2013-12-09 01:04:20 -08:00
  • 40edeff122 // take force_compile setting into account in Back-Office djfm 2013-12-09 08:59:49 +00:00
  • e448ac8de5 // Blocklayered message small fix Jerome Nadaud 2013-12-09 09:09:38 +01:00
  • 9713d38078 [*] FO: now you can download files >1G without running into max execution limitation Gamesh 2013-12-09 08:53:11 +02:00
  • 1876d4834c Merge pull request #1109 from jeanbe/patch-1 Gregory Roussac 2013-12-08 08:52:30 -08:00
  • 5b809ec536 Merge pull request #1108 from Gamesh/patch-1 Gregory Roussac 2013-12-08 08:50:09 -08:00
  • d4b39184a0 // AdminCarts order way DESC gRoussac 2013-12-08 16:39:41 +01:00
  • f055e86cc7 Met automatiquement la carte sur l'ensemble des magasins jeanbe 2013-12-07 17:47:45 +01:00
  • 02fd940124 filesize returns negavite int for realy large files Gamesh 2013-12-06 21:18:52 +02:00
  • c46159ccce Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-06 19:09:48 +01:00
  • 5fb2081054 // order-carrier preparation to be W3C validated! Kevin Granger 2013-12-06 19:09:36 +01:00