Commit Graph
159 Commits
Author SHA1 Message Date
sLorenzini b66d47083e // update schema.org on product-list 2013-12-11 17:34:17 +01:00
Kevin Granger bbf2899311 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 17:18:35 +01:00
Kevin Granger e607abf2a6 // fix compilation for some scss (to be continued) 2013-12-11 17:18:20 +01:00
Kevin Granger b93a9cb7a3 // fix typo in filename 2013-12-11 17:00:32 +01:00
gRoussac debff833cd // missing mod 2013-12-11 16:58:38 +01:00
Kevin Granger b9db5d5023 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 16:56:12 +01:00
Kevin Granger 36968d76b6 // header markup retake 2013-12-11 16:55:53 +01:00
gRoussac c574b04a63 [*] FO : Move header modules to new hook, last part 2/2 2013-12-11 16:22:33 +01:00
Jerome Nadaud 472742a42d // Small smarty escape fix 2013-12-11 16:22:06 +01:00
Jerome Nadaud 1056f295a3 [-] MO : BlockLayered - FixBug #PNM-468 Correct sprintf format 2013-12-11 15:08:01 +01:00
Jerome Nadaud 00253ab8b5 [-] MO : BlockLayered - FixBug #PNM-468 Wrong filter unit 2013-12-11 15:03:11 +01:00
Kevin Granger f8b7e02396 // shouldn’t change .container behavior 2013-12-11 12:25:28 +01:00
Kevin Granger 8f71f36be9 // css fixs 2013-12-11 12:18:18 +01: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
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
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
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 4a22abc2d1 // fix dual pagination id duplicate 2013-12-10 15:28:17 +01:00
Kevin Granger 1d808f89b5 // fix functionnal-buttons 2013-12-10 15:06:51 +01:00
Kevin Granger cfa606b12c // convert global to sass - 100% (can be compiled) 2013-12-10 14:25:06 +01:00
gRoussac a45e816e98 // ids instead of class on home tab toogle 2013-12-10 11:45:22 +01:00
Kevin Granger a94666c4fb // convert global to sass - WIP 75% 2013-12-10 10:40:14 +01:00
Kevin Granger 6d669cb5f1 // global rewrited in sass - WIP 50% (won’t compile yet) 2013-12-09 19:16:27 +01: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
Kevin Granger 79652b1704 // removed « add to compare» from the homepage 2013-12-09 16:48:37 +01:00
Kevin Granger 8700f15c61 // closed an attribute left behind 2013-12-09 16:39:33 +01:00
Kevin Granger 91c3bf48b1 // w3C product 2013-12-09 14:26:17 +01:00
Kevin Granger ea450edc4c // more W3C 2013-12-09 10:15:53 +01:00
jeanbe f055e86cc7 Met automatiquement la carte sur l'ensemble des magasins
Met automatiquement la carte a l'ouverture sur l'ensemble des magasins plutot que sur un point fixe au US.
2013-12-07 17:47:45 +01:00
Kevin Granger 5fb2081054 // order-carrier preparation to be W3C validated! 2013-12-06 19:09:36 +01:00
Kevin Granger 95d5e9d819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:25:23 +01:00
Kevin Granger 71ac20c819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Conflicts:
	themes/default-bootstrap/js/products-comparison.js
2013-12-06 17:24:00 +01:00
sLorenzini cfee36f609 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:19:59 +01:00
sLorenzini 31c5f204b1 // update pages for w3c 2013-12-06 17:19:49 +01:00
Kevin Granger db37e42b21 // checkout W3C valid - wip 2013-12-06 17:19:47 +01:00
Kevin Granger ed5496479d // removed console.log() 2013-12-06 17:18:20 +01:00
gRoussac 03e0cb7515 // break line 2013-12-06 17:09:14 +01:00
gRoussac 99fe216413 [*] FO : Move both sliders module on new hook 2013-12-06 17:05:39 +01:00
sLorenzini 97937a8aa1 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 15:57:50 +01:00
sLorenzini ff08c1311b // update my account page for w3c 2013-12-06 15:57:38 +01:00
Kevin Granger 9f106d06ef // valid W3C checkout - WIP 2013-12-06 15:43:12 +01:00
gRoussac 0af0601cc7 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 12:18:59 +01:00