Code

Gorhil master#356

Code

Merged

gorhill merged 19 commits intogorhill:legacyffgorhill/uBlock:legacyfffrom AlexVallat:gorhil-masterCopy head branch name to clipboardJun 15, 2015

+471-166

Commits

Commits on May 30, 2015

• Cherry pick Web Inspector element picker #1211

  

  chrisaljoudi

  authored and

  AlexVallat

  committed
  d54d3de

  Copy full SHA for d54d3de

• Cherry pick css class differentiation for toolbar button state #1233

  AlexVallat

  committed
  82985f1

  Copy full SHA for 82985f1

• Cherry pick Legacy Toolbar Button support #1321 (part 1)

  AlexVallat

  committed
  464309b

  Copy full SHA for 464309b

• Cherry pick Legacy Toolbar Button support #1321 (part 2)

  AlexVallat

  committed
  3558149

  Copy full SHA for 3558149

• Cherry pick Legacy Toolbar Button support #1321 (part 3)

  AlexVallat

  committed
  e9633d4

  Copy full SHA for e9633d4

• Cherry pick Legacy Toolbar Button support #1321 (part 4) - fixing up

  AlexVallat

  committed
  620a7d7

  Copy full SHA for 620a7d7

• Cherry pick Network inspector element picker #1324

  AlexVallat

  committed
  7141239

  Copy full SHA for 7141239

• Cherry pick other part of fix for #1140 (#1150)

  AlexVallat

  committed
  beccbe6

  Copy full SHA for beccbe6

• this fixes gorhill/uMatrix#234

  

  gorhill

  authored and

  AlexVallat

  committed
  839e677

  Copy full SHA for 839e677

• Allow creation of non-visual picker rules from element picker

  AlexVallat

  committed
  b8cbd95

  Copy full SHA for b8cbd95

• Fix logged (but harmless) errors

  AlexVallat

  committed
  b7c34af

  Copy full SHA for b7c34af

Commits on May 31, 2015

• Merge remote-tracking branch 'gorhil/master' into gorhil-master

  Show description for afd27f0
  AlexVallat

  committed
  afd27f0

  Copy full SHA for afd27f0

Commits on Jun 1, 2015

• Merge remote-tracking branch 'gorhil/master' into gorhil-master

  Show description for 1d7d1f8
  AlexVallat

  committed
  1d7d1f8

  Copy full SHA for 1d7d1f8

• Additional merge changes

  AlexVallat

  committed
  b99d6de

  Copy full SHA for b99d6de

Commits on Jun 2, 2015

• Merge remote-tracking branch 'gorhil/master' into gorhil-master

  AlexVallat

  committed
  055e76c

  Copy full SHA for 055e76c

Commits on Jun 3, 2015

• Merge remote-tracking branch 'gorhil/master' into gorhil-master

  AlexVallat

  committed
  8570afd

  Copy full SHA for 8570afd

Commits on Jun 5, 2015

• Merge remote-tracking branch 'gorhil/master' into gorhil-master

  Show description for eb2629d
  AlexVallat

  committed
  eb2629d

  Copy full SHA for eb2629d

Commits on Jun 6, 2015

• Merge remote-tracking branch 'gorhil/master' into gorhil-master

  Show description for 646b4f1
  AlexVallat

  committed
  646b4f1

  Copy full SHA for 646b4f1

Commits on Jun 7, 2015

• Merge remote-tracking branch 'gorhil/master' into gorhil-master

  AlexVallat

  committed
  00c9bd7

  Copy full SHA for 00c9bd7