dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph

123 Commits

Author SHA1 Message Date
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
gRoussac 33e9c2c132 [-] FO : Remove bad links on home tabs 2013-12-06 12:12:54 +01:00
Kevin Granger d4f73213cb // checkout - shopping cart W3C valid 2013-12-06 12:12:21 +01:00
Kevin Granger 0067eff263 // working on W3C validation 2013-12-05 18:50:50 +01:00
sLorenzini df2e2280ea Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-05 17:59:25 +01:00
sLorenzini 1f1b3974cf // update itemprop on product page + w3c bug on address.tpl 2013-12-05 17:59:13 +01:00
Kevin Granger 9dd82367f3 // Product compare almost W3C valid -> #availability_value must be change with a class 2013-12-05 16:27:10 +01:00
Kevin Granger 02b6e24ca4 // category page almost W3C valid 2013-12-05 15:27:40 +01:00
Kevin Granger c0e8794947 // make product.tpl human readable ;) 2013-12-05 14:42:22 +01:00
Kevin Granger 5e9db96f61 // home is valid W3C! 2013-12-05 10:38:59 +01:00
Kevin Granger 04d2ff59ee // fix product list + facebook block HTML5 version WIP 2013-12-04 19:31:02 +01:00
sLorenzini d1959f87d4 // fixed bug url "add to cart" in product-list 2013-12-04 17:35:16 +01:00
sLorenzini 4285882949 // update indent code 2013-12-04 17:29:35 +01:00
sLorenzini e702aca520 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 16:59:14 +01:00
sLorenzini ad1c7b3962 // update product-list itemproperty 2013-12-04 16:59:00 +01:00
Kevin Granger 33b5327b4d // data-id-product instead of using rel tag 2013-12-04 16:58:34 +01:00
Kevin Granger b450a9fa80 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 
Conflicts:
	themes/default-bootstrap/products-comparison.tpl
 2013-12-04 15:48:16 +01:00
Kevin Granger ad6ed3dcf1 // data-id-product instead of using rel tag 2013-12-04 15:46:42 +01:00
Rémi Gaillard 79198487ac Merge pull request #1098 from djfm/1.6 
// typo in default theme blockcart.tpl
 2013-12-04 06:19:39 -08:00
sLorenzini 32237777e3 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 15:18:13 +01:00
sLorenzini c127f9765a // update code on footer and header 2013-12-04 15:17:35 +01:00
djfm cb9dd448e1 // another typo in default theme blockcart.tpl 2013-12-04 14:14:01 +00:00
djfm 73e3e447f6 // typo in default theme blockcart.tpl 2013-12-04 14:12:16 +00:00
rGaillard 90f5560cb3 // add new hook on product comparator 2013-12-04 14:43:09 +01:00
TMMeilleur 4ba424a72f adedd social's buttons on products compare page 2013-12-04 14:12:36 +02:00
TMMeilleur 689fcb005d small fixes 2013-12-04 10:08:35 +02:00
rGaillard 08ef0667ca Revert "// update some css&tpl bugs" 
This reverts commit 01d5087067.
 2013-12-02 19:25:21 +01:00
Damien Metzger e8088892b5 [-] FO : Added condition to display the phone number only if it is set up in the admin 2013-12-02 19:12:49 +01:00
Jerome Nadaud 6edf14ed71 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-12-02 18:20:03 +01:00
rGaillard 102b99eb1c // small fix 2013-12-02 18:15:37 +01:00
sLorenzini 01d5087067 // update some css&tpl bugs 2013-12-02 16:40:43 +01:00
TMMeilleur f99140113b updated jqzoom and products compare page is responsive now 2013-12-02 16:41:13 +02:00
rGaillard 89329dc865 // small fix 2013-12-02 15:15:17 +01:00
Kevin Granger c8f130670f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 17:19:04 +01:00
Kevin Granger 6a84f586af // add compass config.rb for theme default-bootstrap 2013-11-29 17:18:50 +01:00
rGaillard 8ba251c996 // small clean 2013-11-29 16:40:00 +01:00
TMMeilleur b122291080 fixes 29.11.2013 2013-11-29 17:13:27 +02:00