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

merged 14 commits into from
Jun 10, 2014

Commits on May 31, 2014

  1. Beginning integration of ShareMeNot: added resources, useless callback.

    @froeschele
    froeschele committed May 31, 2014
    Configuration menu
    Copy the full SHA
    cc3347f View commit details
    Browse the repository at this point in the history

  2. Basic button replacement working.

    @froeschele
    froeschele committed May 31, 2014
    Configuration menu
    Copy the full SHA
    17e7c84 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2014

  1. Replacement and unblocking seem to work correctly in most cases.

    @froeschele
    froeschele committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    86775a6 View commit details
    Browse the repository at this point in the history

  2. Adding appropriate license text

    @froeschele
    froeschele committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    18a3e74 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2014

  1. Changed replacement buttons to use PrivacyBadger icon, not ShareMeNot.

    @froeschele
    froeschele committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    7a87429 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/cookiehandlingexperiment' into… 

    … sharemenot
    @froeschele
    froeschele committed Jun 3, 2014
    Configuration menu
    Copy the full SHA
    9df938e View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2014

  1. Merge remote-tracking branch 'upstream/master' into sharemenot

    @froeschele
    froeschele committed Jun 5, 2014
    Configuration menu
    Copy the full SHA
    770e79f View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2014

  1. Merge remote-tracking branch 'upstream/master' into sharemenot 

    Conflicts:
	src/webrequest.js
    @froeschele
    froeschele committed Jun 7, 2014
    Configuration menu
    Copy the full SHA
    97693f2 View commit details
    Browse the repository at this point in the history

  2. Fixed AddThis button re-enabling.

    @froeschele
    froeschele committed Jun 7, 2014
    Configuration menu
    Copy the full SHA
    b857e86 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2014

  1. Merge remote-tracking branch 'upstream/master' into sharemenot

    @froeschele
    froeschele committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    c370cbb View commit details
    Browse the repository at this point in the history

  2. Cleanup of unneeded stuff.

    @froeschele
    froeschele committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    c3f3c80 View commit details
    Browse the repository at this point in the history

  3. cleanup spacing issue

    @froeschele
    froeschele committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    00b40fa View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. Support for newer version of Facebook button, and fixed race condition.

    @froeschele
    froeschele committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    ba48237 View commit details
    Browse the repository at this point in the history

  2. Previous fix to race condition broke things when userunblock, fix in … 

    …better way.
    @froeschele
    froeschele committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    b2fe9cd View commit details
    Browse the repository at this point in the history