Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #1

Merged
merged 37 commits into from
Jun 3, 2015
Merged

merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0de388b
Correct default opt name for pop-up URIs
BlakePetersen Jul 28, 2014
1da9715
Merge pull request #212 from BlakePetersen/patch-1
Julienh Jul 29, 2014
0d181b4
added twitter hastags option in poput function
brandomeniconi Sep 4, 2014
73bd4fd
Changes for support of google analytics.js
gregmercer Sep 5, 2014
8687f9e
Updated the simulateClick function have the option of using a className
gregmercer Sep 8, 2014
095dec9
WP-4320 Changed to correct the ga send that occurs when opening the p…
gregmercer Sep 19, 2014
3f9bf32
WP-4320 Passing the classname into simulateClick, as we were doing be…
gregmercer Sep 19, 2014
08c1c6f
Wrap the title in a span
deadarm Sep 24, 2014
a70229d
add tumblr to sharrre options
inghamemerson Sep 25, 2014
eec6080
Changing count urls to be defined without protocols
gregmercer Oct 6, 2014
766bbb2
Remove php and index.html.
redndahead Oct 6, 2014
773a062
Update sharrre.php
trapvincenzo Nov 13, 2014
aad0c47
WP-4610 Changes related to getting the count values for the social bu…
gregmercer Nov 20, 2014
4c8fb64
WP-4610: Adjust how we get the counters. Fix line endings.
redndahead Nov 21, 2014
b8c3c79
WP-4610: refactor buildSocialURL. Fix missing name parameter.
redndahead Nov 25, 2014
28f81bb
Only check http connections and only against the current url.
redndahead Dec 4, 2014
016575d
Remove console.log
redndahead Dec 4, 2014
3ba99d0
Support for facebook share flag
aletorrado Dec 9, 2014
9a5cdf7
support for setting facebook appId
aletorrado Dec 9, 2014
e893573
Fix gapi.plusone undefined
mcguffin Dec 28, 2014
f2fe94a
Update README.md
Jan 5, 2015
5ded02e
Merge https://github.com/famfam/Sharrre
brandomeniconi Apr 20, 2015
dc9a4b2
Merge https://github.com/gsbitse/Sharrre
brandomeniconi Apr 20, 2015
1c2bb1c
Revert "Remove php and index.html."
brandomeniconi Apr 20, 2015
6d48c35
Merge pull request #1 from qualitybits/patch-1
brandomeniconi Apr 20, 2015
53cd40a
Merge branch 'master' of https://github.com/mcguffin/Sharrre
brandomeniconi Apr 20, 2015
d8534e1
Merge branch 'master' of github.com:fuoricentrostudio/Sharrre
brandomeniconi Apr 20, 2015
331d72b
Merge branch 'master' of https://github.com/aletorrado/Sharrre
brandomeniconi Apr 20, 2015
d796379
Merge pull request #3 from trapvincenzo/proxy_support
brandomeniconi Apr 20, 2015
29f785c
Merge branch 'master' of github.com:fuoricentrostudio/Sharrre
brandomeniconi Apr 20, 2015
5421a15
modified proxy config
brandomeniconi Apr 20, 2015
e1414b6
fixed example
brandomeniconi Apr 20, 2015
035e88f
sharrre.php rewritten to use streams instead of cURL
brandomeniconi Apr 20, 2015
dc7e090
fixed previous pull request preventing "url" parameter to work
brandomeniconi Apr 20, 2015
8622696
sharrre.php verify_peer det to false and count casted to int
brandomeniconi Apr 20, 2015
e9fe534
Merge branch 'master' of https://github.com/newbreedmarketing/Sharrre
brandomeniconi Apr 20, 2015
8e2b897
fixed error in merge
brandomeniconi Apr 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Usage
twitter: true
},
url: 'http://sharrre.com'
});
});

Example
===
Expand Down
16 changes: 10 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="UTF-8">
<title>Sharrre.com</title>
<meta charset="UTF-8">
<title>Sharrre.com</title>
<meta name="description" content="Sharrre" />
<script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script src="jquery.sharrre-1.3.1.js"></script>
<script src="jquery.sharrre.js"></script>
<script>
$(function(){
$('#demo1').sharrre({
share: {
googlePlus: true,
facebook: true,
twitter: true,
delicious: true
delicious: true,
stumbleupon: true
},
url: 'http://www.google.com',
enableHover: false,
buttons: {
googlePlus: {size: 'tall'},
facebook: {layout: 'box_count'},
twitter: {count: 'vertical'},
delicious: {size: 'tall'}
delicious: {size: 'tall'},
stumbleupon: {size: 'tall'}
},
hover: function(api, options){
$(api.element).find('.buttons').show();
Expand All @@ -35,7 +39,7 @@
facebook: true,
twitter: true
},
url: 'http://sharrre.com',
url: 'http://www.sharrre.com',
enableHover: false
});
});
Expand Down
Loading