Commit graph

1686 commits

Author SHA1 Message Date
gorhill
d5fdd84da4 removed stray git-conflict line 2015-01-24 08:21:14 -05:00
gorhill
8088fa08ff Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-24 08:17:31 -05:00
Raymond Hill
4ea282b597 Update README.md 2015-01-24 07:33:02 -05:00
gorhill
2d287b5315 this fixes #589 + regression re. elemhide option 2015-01-23 21:47:56 -05:00
gorhill
2039307383 Merge branch 'master' of github.com:gorhill/uBlock 2015-01-23 18:37:12 -05:00
gorhill
eed55dd8fb update of third-party assets 2015-01-23 18:36:59 -05:00
Raymond Hill
947234ec22 Merge pull request #588 from chrisaljoudi/master
Safari Extension Gallery
2015-01-23 18:18:05 -05:00
Chris Aljoudi
799d711489 Cleanup Safari installation paragraph 2015-01-23 15:28:19 -07:00
Chris
76cff2bb6f Safari Extension Gallery + Version Support Notes 2015-01-23 15:21:00 -07:00
gorhill
c3765cbc5b new version 2015-01-23 16:22:29 -05:00
gorhill
f0100e556d reverting 2015-01-23 15:49:48 -05:00
gorhill
1d1a3983e3 syncing with master 2015-01-23 15:36:32 -05:00
gorhill
f718e8e1f2 better/safer fix for #587 2015-01-23 15:02:47 -05:00
gorhill
448931248d translation work from Crowdin 2015-01-23 14:20:04 -05:00
gorhill
91142ce847 code review: removed unused member 2015-01-23 13:39:06 -05:00
gorhill
1a5a42238e do not rely on core to do the transposition 2015-01-23 13:09:26 -05:00
gorhill
44bc263a69 code review: oops 2015-01-23 11:56:43 -05:00
gorhill
eeb5e8de5b associate code change with issue #587 2015-01-23 11:47:31 -05:00
gorhill
673b8774be this fixes #582 2015-01-23 11:32:49 -05:00
gorhill
a2ff66e20f more subdomains as per alexa 2015-01-22 15:36:32 -05:00
gorhill
53b3532746 this fixes #580 2015-01-22 15:07:58 -05:00
gorhill
fedb7c5b7c see https://github.com/gorhill/uBlock/issues/510#issuecomment-71078475 2015-01-22 14:40:55 -05:00
gorhill
b51b0e5350 code review 2015-01-22 13:00:59 -05:00
gorhill
9d1332be7d Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-22 12:36:24 -05:00
gorhill
62ba33d7c6 to prevent popup on promptfile.com 2015-01-22 12:34:25 -05:00
gorhill
16ecdc42c8 to fix top.mail.ru 2015-01-22 00:31:38 -05:00
gorhill
4c7f4771e2 #475: whitelist behind-the-scene by default 2015-01-21 21:46:11 -05:00
gorhill
4b2dced6f4 Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-21 12:25:12 -05:00
Deathamns
631da229f5 Firefox: initialize when hiddenDOMWindow is ready
Probably not the best way to detect its readiness, but it works for now.
This fix should solve the incompatibility with the StartupMaster add-on.
2015-01-21 18:15:55 +01:00
gorhill
7b8392ca48 more fixes for #105 2015-01-21 11:13:32 -05:00
gorhill
fcb65e6002 Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-21 09:50:20 -05:00
gorhill
c18acdf90d this addresses #570 2015-01-21 09:48:46 -05:00
gorhill
4f2bd14ce6 code review 2015-01-21 09:25:12 -05:00
gorhill
4edfae4b94 code review: jshint'ed 2015-01-21 08:59:23 -05:00
gorhill
a64bca0fa6 code review 2015-01-21 00:32:32 -05:00
gorhill
5ba92ef484 Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-20 19:40:01 -05:00
gorhill
255c68baa4 this fixes #536 2015-01-20 19:39:13 -05:00
Raymond Hill
3a795fd390 Update README.md 2015-01-20 19:35:25 -05:00
gorhill
b8131943c9 Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-20 16:53:42 -05:00
Raymond Hill
a29b092019 Merge pull request #555 from polycopter/patch-1
Update MANIFESTO.md
2015-01-20 11:01:20 -05:00
polycopter
86aeaac9c0 Update MANIFESTO.md
add an 's' because "means" in this usage doesn't have a singular version without the 's'.
2015-01-20 11:00:04 -05:00
Raymond Hill
965f3cfc29 Merge pull request #548 from chrisaljoudi/master
More fixes and performance improvements to Safari event handling and dispatching
2015-01-20 09:40:37 -05:00
Chris
4901b11fae Doh 2015-01-20 00:44:04 -07:00
Chris
03668551c2 More fixes and performance improvements to Safari event handling and dispatching 2015-01-20 00:35:02 -07:00
gorhill
fdaec4b421 new version 2015-01-19 20:30:27 -05:00
gorhill
85414167c4 Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-19 18:50:18 -05:00
gorhill
32be555b85 auto-build only for master 2015-01-19 18:50:01 -05:00
gorhill
7f78ce2260 bring up to date with master 2015-01-19 18:45:00 -05:00
gorhill
759a156e24 started work on #105, #475, and possibly #510 2015-01-19 18:42:58 -05:00
gorhill
72f0f8a67d Merge branch 'master' of github.com:gorhill/uBlock 2015-01-19 15:00:43 -05:00