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

Jump to bottom

Integrate ShareMeNot functionality #196

Merged
merged 14 commits into from
Jun 10, 2014
Merged

Integrate ShareMeNot functionality #196

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cc3347f
Beginning integration of ShareMeNot: added resources, useless callback.
froeschele May 31, 2014
17e7c84
Basic button replacement working.
froeschele May 31, 2014
86775a6
Replacement and unblocking seem to work correctly in most cases.
froeschele Jun 2, 2014
18a3e74
Adding appropriate license text
froeschele Jun 2, 2014
7a87429
Changed replacement buttons to use PrivacyBadger icon, not ShareMeNot.
froeschele Jun 3, 2014
9df938e
Merge remote-tracking branch 'upstream/cookiehandlingexperiment' into…
froeschele Jun 3, 2014
770e79f
Merge remote-tracking branch 'upstream/master' into sharemenot
froeschele Jun 5, 2014
97693f2
Merge remote-tracking branch 'upstream/master' into sharemenot
froeschele Jun 7, 2014
b857e86
Fixed AddThis button re-enabling.
froeschele Jun 7, 2014
c370cbb
Merge remote-tracking branch 'upstream/master' into sharemenot
froeschele Jun 9, 2014
c3f3c80
Cleanup of unneeded stuff.
froeschele Jun 9, 2014
00b40fa
cleanup spacing issue
froeschele Jun 9, 2014
ba48237
Support for newer version of Facebook button, and fixed race condition.
froeschele Jun 10, 2014
b2fe9cd
Previous fix to race condition broke things when userunblock, fix in …
froeschele Jun 10, 2014
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into sharemenot 
Conflicts:
	src/webrequest.js
  • Loading branch information
@froeschele
froeschele committed Jun 7, 2014
commit 97693f228554fd28ec0dbe17cf62cd0ff3e68eb4
111 changes: 111 additions & 0 deletions skin/socialwidgets/AddThis.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.