summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* bug 4527: Attempt to track rule destination urls.bug4527-urltrackingMike Perry2011-11-20
* Merge remote branch 'origin/master'Mike Perry2011-11-20
|\
| * Merge branch 'global-enable-disable'Peter Eckersley2011-11-20
| |\
| | * Merge remote-tracking branch 'kevinjacobs/master' into global-enable-disablePeter Eckersley2011-11-20
| | |\
| | | * Issue 4060: Removing (and re-adding) XPCOM callbacks and nsIWebProgress liste...Kevin Jacobs2011-11-20
| | * | Bump version to 2.0development.5Peter Eckersley2011-11-16
| | * | Revert "Revert commits that were not supposed to be to master :("Peter Eckersley2011-11-16
| | * | Merge branch 'master' into global-enable-disablePeter Eckersley2011-11-16
| | |\ \ | | | |/ | | |/|
| | * | Issue 4060: Fix for a certain rulesets still applying for a few sites. Will c...Kevin Jacobs2011-11-15
| | * | Working patch for issue 4060 (global enable/disable from toolbar). Will test ...Kevin Jacobs2011-11-12
| | * | Merge git://git.torproject.org/https-everywhere into effNewestKevin Jacobs2011-11-10
| | |\ \
| | * | | Issue #4060:Kevin Jacobs2011-10-31
| | * | | Merge remote-tracking branch 'eff/master'Kevin Jacobs2011-10-31
| | |\ \ \
| | * | | | Added working code for toggling between http/https, but it's commente...Kevin Jacobs2011-09-26
| | * | | | Adjusted code to run for any "about:" page - not just cert error.Kevin Jacobs2011-09-26
| | * | | | Merge remote-tracking branch 'eff/master'Kevin Jacobs2011-09-26
| | |\ \ \ \
| * | | | | | wikitech.wikimedia.org is not supported, etherpad.wikimedia.org is.Osama Khalid2011-11-20
| * | | | | | I think you misspelled "exclusion".Alex Xu2011-11-20
| * | | | | | Merge remote-tracking branch 'osamak/master'Peter Eckersley2011-11-19
| |\ \ \ \ \ \
| | * | | | | | Add diasporafoundation.org to Diaspora.xmlOsama Khalid2011-11-18
| | * | | | | | Add more domains to RedHat.xmlOsama Khalid2011-11-18
| * | | | | | | Merge branch 'master' of git://git.torproject.org/https-everywherePeter Eckersley2011-11-19
| |\ \ \ \ \ \ \
| * | | | | | | | Horrible Verizon exclusion to work around https://mail1.eff.org/pipermail/htt...Peter Eckersley2011-11-19
* | | | | | | | | Semicolon.Mike Perry2011-11-20
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'https-e-nov19'Mike Perry2011-11-18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add a redirect counter to prevent https->http loops.https-e-nov19Mike Perry2011-11-17
* | | | | | | | Merge remote-tracking branch 'mikeperry/https-e-nov19'Peter Eckersley2011-11-17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add ability to store prefs.Mike Perry2011-11-16
| * | | | | | | Add a page action for enabling/disabling rules.Mike Perry2011-11-16
| * | | | | | | Before we go and wreck the place...Mike Perry2011-11-16
| * | | | | | | Listen to new header observer.Mike Perry2011-11-16
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Revert "Shorter `cd` command which avoids fork"Peter Eckersley2011-11-17
* | | | | | | Merge remote-tracking branch 'engmark/master'Peter Eckersley2011-11-17
|\ \ \ \ \ \ \
| * | | | | | | Fixed wrong `find` parameter usageVictor Engmark2011-10-07
| * | | | | | | Don't show `which` outputVictor Engmark2011-10-07
| * | | | | | | Simpler error handlingVictor Engmark2011-10-06
| * | | | | | | Aggressive error checkingVictor Engmark2011-10-06
| * | | | | | | Check exit code rather than returned stringVictor Engmark2011-10-06
| * | | | | | | 4 spaces for indentationVictor Engmark2011-10-06
| * | | | | | | Faster check for XML filesVictor Engmark2011-10-06
| * | | | | | | Shorter `cd` command which avoids forkVictor Engmark2011-10-06
| * | | | | | | Merge branch 'master' of git://git.torproject.org/https-everywhereVictor Engmark2011-10-03
| |\ \ \ \ \ \ \
| * | | | | | | | Stop at the first failing testVictor Engmark2011-09-27
| * | | | | | | | Shebang recommended by http://mywiki.wooledge.org/BashGuide/PracticesVictor Engmark2011-09-27
* | | | | | | | | More improvements to makexpi.shAlex Xu2011-11-16
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge remote-tracking branch 'mikecardwell/master'Peter Eckersley2011-11-16
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://git.torproject.org/https-everywhereMike Cardwell2011-11-16
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Removed securecookie config for barclaycard.co.uk as it breaks loginMike Cardwell2011-11-15
* | | | | | | | | | Merge remote-tracking branch 'osamak/master'Peter Eckersley2011-11-16
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Add api.flickr.comOsama Khalid2011-11-16