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

146 Commits

Author SHA1 Message Date
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
Gregory Roussac 0b653fd20a Merge pull request #1055 from Dh42/patch-17 
[-] FO : Prevents crawlers from creating carts
 2013-11-28 08:55:52 -08:00
Dh42 5591f5c399 Prevents crawlers from creating carts 
Is valid method of using multiple values, http://www.w3.org/TR/html401/struct/links.html#adef-rel
 2013-11-28 10:46:33 -06:00
Dh42 b6023cc9f7 Needs to be a non followed url 
Is an ajax type link, needs to be no followed for duplicate content reasons.
 2013-11-28 10:39:29 -06:00
Jérôme Nadaud 8f5bac0e90 Merge pull request #1042 from Dh42/patch-14 
Adds currency to rich snippets
 2013-11-28 03:30:03 -08:00
gRoussac 2b210e0732 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 2013-11-27 16:20:20 +01:00
gRoussac dd99d13dc4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/766 2013-11-27 15:42:11 +01:00
TMMeilleur 44549d650f fixes 27.11.2013 2013-11-27 14:02:26 +02:00
gRoussac ef6dd3bfed [-] MO : display_column_left not assigned to smarty in modules initContent() + ssl on loyalty front controller 2013-11-27 12:32:01 +01:00
gRoussac 9ccd4504f4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/820 + https://github.com/PrestaShop/PrestaShop/commit/5e407db21e3e30a1a5fa94b9558314ffa21af407 2013-11-26 22:49:10 +01:00
gRoussac 13b5762367 [-] FO : trailing \t in minified html 2013-11-26 18:41:02 +01:00
gRoussac 7f304fc768 [-] FO : Merge of https://github.com/ldecoker/PrestaShop/commit/d3bf4d233005511e08554a7c283e0b992815e01a 2013-11-26 16:26:35 +01:00
Gregory Roussac 5153b49eae Merge pull request #1013 from indesign47/patch-12 
[-] FO : Contact-form add translation for fields
 2013-11-26 02:35:07 -08:00
gRoussac 53b91fc0b7 attribute_anchor_separator 2013-11-26 11:27:25 +01:00
Dh42 3c1f2f045c Adds currency to rich snippets 
The offer will not be displayed without the iso currency. There will be collisions in currencies such as AUD CAD and USD, without the sign.
 2013-11-26 01:37:55 -06:00
gRoussac 695aaa73fb [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/696 2013-11-25 19:03:15 +01:00
Felipe Uribe b2e685e126 [-] FO, Bug fix double/ 
files containing a double /, example:
{$css_dir}/b... = cssdir//bootstrap_lib/bootstrap.css
to
{$css_dir}b... = = cssdir/bootstrap_lib/bootstrap.css
 2013-11-25 07:19:37 -05:00
Jerome Nadaud d1c9ec8e09 // Changing Typo preserving backward compatibility 2013-11-25 11:02:40 +01:00
Jérôme Nadaud 652c370a1d Merge pull request #1025 from wfpaisa/patch-3 
double ../../
 2013-11-25 00:04:09 -08:00
Felipe Uribe f7b1fa88fa double ../ 
header.tpl=
{$css_dir}/jquery/uniform.default.css |
..homedir//jquery/uniform.default.css

ok=
{$css_dir}jquery/uniform.default.css |=
homedir/jquery/uniform.default.css
 2013-11-24 19:42:14 -05:00
Felipe Uribe 064b9f5ce5 double ../../ 
correct ../
 2013-11-24 17:29:15 -05:00
Jérôme Nadaud d4dc67bc61 Merge pull request #1021 from indesign47/patch-17 
[-] MO : cheque add translation for fields
 2013-11-22 09:09:52 -08:00
indesign47 283fd2a9f3 [-] MO : cheque add translation for fields 2013-11-22 18:05:40 +01:00
indesign47 e068f7202a [-] MO : bankwire add translation for fields 2013-11-22 17:34:03 +01:00
TMMeilleur 2376dd404f fixes for cross-browser compability 2013-11-22 14:55:48 +02:00
indesign47 6164a0d42c [-] FO : header add translation for fields 2013-11-22 11:37:30 +01:00
indesign47 799b31d1ac [-] FO : Contact-form add translation for fields 2013-11-22 10:55:56 +01:00
Damien Metzger c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00