1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-01 08:39:37 +02:00
Commit Graph

687 Commits

Author SHA1 Message Date
gorhill
969e533ba8 this fixes #455 (regression) 2015-07-08 09:56:06 -04:00
gorhill
a9089b3120 this fixes #452 2015-07-07 12:11:11 -04:00
gorhill
32d2ae0e11 this probably fixes #453 2015-07-07 11:03:26 -04:00
gorhill
7a00310934 this may fix #450 2015-07-07 09:10:53 -04:00
gorhill
a27b46b817 this fixes stalling dom inspector 2015-07-06 09:07:51 -04:00
gorhill
46cbe42227 code review 2015-07-05 09:26:33 -04:00
gorhill
fa6fa00656 interim version for dev build 2015-07-04 08:58:33 -04:00
gorhill
35ef80f3aa code review re. sandbox shutdown 2015-07-03 13:32:00 -04:00
gorhill
352ef808f1 code review: this taks care of ea4faff383 (commitcomment-11964137) 2015-07-03 07:00:29 -04:00
gorhill
75645e2f83 this fixes #429 2015-07-02 08:20:56 -04:00
gorhill
ea4faff383 this fixes FF logger not being resizable 2015-07-01 18:08:51 -04:00
gorhill
ad827576ce have the logger open in a separate window 2015-07-01 12:18:03 -04:00
gorhill
bd9a63a73c Merge branch 'master' of github.com:gorhill/uBlock into inspector 2015-06-30 18:08:49 -04:00
gorhill
ecd003ff4a this addresses #414 2015-06-30 01:59:22 -04:00
gorhill
aeba71790f some refactoring: move to-aux-process-messaging timeout into vAPI 2015-06-29 10:46:20 -04:00
gorhill
39b0d719c0 some more work re inspector 2015-06-28 17:42:08 -04:00
gorhill
7d2855180c some refactoring of new DOM inspector code 2015-06-26 15:45:54 -04:00
gorhill
631443768f dom inspector: ébauche 2015-06-26 00:08:41 -04:00
gorhill
0afbb98f42 this fixes #399 2015-06-25 09:05:24 -04:00
gorhill
1ba7894a29 ability to prevent local ip address leak thru webrtc 2015-06-24 20:01:27 -04:00
gorhill
c596e6c0e1 this fixes #394 2015-06-23 14:50:45 -04:00
gorhill
749f9992e8 interim version for dev build 2015-06-22 18:52:34 -04:00
gorhill
fb25df9f05 this fixes https://github.com/chrisaljoudi/uBlock/issues/1449 2015-06-18 17:09:24 -04:00
gorhill
647b53beaf this fixes #264 2015-06-18 12:02:57 -04:00
gorhill
04dad27165 this fixes warnings about "Services" being undefined after re-enabling uBlock 2015-06-17 17:56:04 -04:00
gorhill
91f5584e9f minor code review 2015-06-17 14:11:30 -04:00
gorhill
c8a48910d3 just renaming using natural resolution 2015-06-17 14:06:59 -04:00
gorhill
34485a0465 code review 2015-06-17 14:06:59 -04:00
AlexVallat
9406e40fdc Imported 620a7d78d1 2015-06-17 14:06:59 -04:00
AlexVallat
909244cdbd Imported d9b23d4f10 2015-06-17 14:06:59 -04:00
AlexVallat
c4b0856723 Imported 5ac4ec21e9 2015-06-17 14:06:59 -04:00
gorhill
d458fcf842 interim version for dev build 2015-06-17 09:20:48 -04:00
gorhill
f29f0a0f09 code review 2015-06-15 15:57:12 -04:00
AlexVallat
62849f164d Cherry pick css class differentiation for toolbar button state #1233 2015-06-15 11:39:00 -04:00
gorhill
ed130afc6f Opera version number 2015-06-15 08:00:00 -04:00
gorhill
6ed2d6ffb9 interim version for dev build 2015-06-14 20:27:43 -04:00
gorhill
1aa311ff15 version number for Opera 2015-06-13 14:51:47 -04:00
gorhill
933d3960e1 new version 2015-06-12 06:54:16 -04:00
gorhill
5a263bf39d fixed comment 2015-06-11 15:18:32 -04:00
gorhill
98af936d3c Commented to document test case where this happens 2015-06-11 15:10:17 -04:00
gorhill
6d023e2a52 Chrome API limitations: better block late than never (re. font switch) 2015-06-11 15:08:17 -04:00
gorhill
19d34d2a40 this addresses #334 2015-06-11 09:33:39 -04:00
gorhill
c52b4bb780 for latest opera build 2015-06-08 08:08:04 -04:00
gorhill
2d27cc28ce interim version number for dev build 2015-06-06 18:32:39 -04:00
gorhill
a364a869f5 this takes care of https://github.com/gorhill/uBlock/issues/292#issuecomment-109621979 2015-06-06 14:09:59 -04:00
gorhill
c481372281 new revision 2015-06-05 13:39:00 -04:00
gorhill
81bb75cd5e this will still work if ever we use longer branches 2015-06-05 09:36:24 -04:00
gorhill
48264e1fd7 code review for #292 2015-06-04 16:50:46 -04:00
gorhill
987a8d2b64 this fixes #292 2015-06-04 16:26:57 -04:00
gorhill
03db447374 bumping to 0.9.8.5 because of privacy settings 2015-06-04 11:55:20 -04:00
gorhill
13d229eaa1 code review + report more accurately request types in logger 2015-06-04 09:37:53 -04:00
gorhill
013b077656 this fixes #287 2015-06-03 09:01:58 -04:00
gorhill
8a73a093d9 this fix #282 2015-06-02 18:12:28 -04:00
gorhill
228104a2b0 firefox: take care of beacon also 2015-06-02 09:45:31 -04:00
gorhill
cf134b62bd interim version for dev build 2015-06-02 09:01:01 -04:00
gorhill
2cb1f42335 Firefox support for browser settings 2015-06-02 08:59:25 -04:00
gorhill
ee8dd54481 added ability to disable hyperlink auditing 2015-06-02 08:26:35 -04:00
gorhill
2ca1ed3b9c this fixes dealing with browser objects with no valid URI 2015-06-01 18:12:33 -04:00
gorhill
14371b5d92 this fixes #274 2015-06-01 15:03:22 -04:00
gorhill
f458fa4adf code review 2015-06-01 09:00:10 -04:00
gorhill
d724fb23bd this fixes #269 2015-06-01 08:49:41 -04:00
gorhill
10740a28ff this fixes console warning when view-source: 2015-06-01 08:11:25 -04:00
gorhill
6470216530 this should fix #266 + fixes #212 2015-05-31 17:43:19 -04:00
gorhill
b084d796b5 to address #266 -- drafty, just curious to see if this helps 2015-05-31 00:35:53 -04:00
gorhill
3f9b704846 SQlite: use double-quotes everywhere, vacuum only once, when idle 2015-05-30 11:36:37 -04:00
gorhill
e65c293975 this fixes https://github.com/gorhill/uMatrix/issues/234 2015-05-30 06:49:38 -04:00
gorhill
1e57760fe1 this fixes #262 2015-05-29 19:23:26 -04:00
gorhill
579c4a1d5e this fixes #260 2015-05-29 16:40:59 -04:00
gorhill
885c68495b this fixes overlooked remnants of other ubock 2015-05-29 11:19:10 -04:00
gorhill
4abd2d7dc7 interim version for dev build 2015-05-28 14:51:30 -04:00
gorhill
c73704ba48 code review 2015-05-28 14:49:36 -04:00
gorhill
c285ace7d8 hardening sqlite code 2015-05-28 14:49:01 -04:00
gorhill
584ef3a02e new revision 2015-05-27 20:49:50 -04:00
gorhill
d332298f40 o_O... oops 2015-05-27 17:21:16 -04:00
gorhill
53fc1063f9 reviewer's feedback: SQLite: now using static strings + bound parameters 2015-05-27 15:31:36 -04:00
gorhill
b309295323 new version 2015-05-26 17:20:42 -04:00
gorhill
72c930ddff logger: UI work on URL-based dynamic filtering 2015-05-24 18:50:09 -04:00
gorhill
d8a47f1c0b getMessageManager() can throw 2015-05-22 12:19:17 -04:00
gorhill
43f9657d0f this fixes #227 2015-05-22 08:05:55 -04:00
gorhill
284b4f62d1 dynamic url filtering 2015-05-21 14:15:17 -04:00
gorhill
92be1c2a12 new revision 2015-05-17 18:39:52 -04:00
gorhill
d9bb34102f style 2015-05-17 18:27:53 -04:00
gorhill
facef0dc05 this fixes many addon validation warnings 2015-05-17 13:02:56 -04:00
gorhill
7eac4072de verified working fine on Nightly 2015-05-17 11:39:40 -04:00
gorhill
d41408ebbc this fixes #211 2015-05-17 10:32:40 -04:00
gorhill
087cd4e645 maybe this will fix #197 (timing issue?) 2015-05-16 16:33:47 -04:00
gorhill
334855dcf7 injected script can throw 2015-05-16 16:31:44 -04:00
gorhill
0d32b56f5a interim version for dev build 2015-05-16 12:30:05 -04:00
gorhill
5c94ad42db new version 2015-05-10 09:30:01 -04:00
gorhill
dc1180c1e7 code review 2015-05-09 07:27:51 -04:00
gorhill
ba8dd756c9 this fixes #185 2015-05-09 01:16:27 -04:00
gorhill
f9652b5f57 importing uMatrix unified logger 2015-05-08 18:28:01 -04:00
gorhill
982fbc02a6 interim version for dev build 2015-05-04 17:20:17 -04:00
gorhill
5f4d975966 code review 2015-05-02 00:13:19 -04:00
gorhill
a51ba31df8 removed useless web_accessible_resources directive 2015-04-30 07:50:42 -04:00
gorhill
7e26be6430 new version 2015-04-29 12:39:33 -04:00
gorhill
6c80790975 one more step to insure tab context is properly set 2015-04-29 10:29:23 -04:00
gorhill
e60ac31d73 this fixes #140 2015-04-27 11:15:36 -04:00
gorhill
5197bf1a57 interim rev number for dev build 2015-04-25 08:29:19 -04:00
gorhill
69ab00044a new version 2015-04-24 11:18:03 -04:00
gorhill
8004754c29 this fixes #83 2015-04-24 10:55:11 -04:00
gorhill
c8d0fd3814 this fixes #101 2015-04-20 08:30:25 -04:00
gorhill
e16dac9c39 this fixes #84 2015-04-19 11:33:04 -04:00
gorhill
3bc19ce2d2 this addresses #94 2015-04-19 10:48:57 -04:00
gorhill
045fe4cc06 various minor changes need for Opera version 2015-04-18 13:09:49 -04:00
gorhill
dbb93ae716 attempt at fixing badge misalignment reported in #55 2015-04-16 23:59:03 -04:00
gorhill
b43da1690f manually patching svg file to fix FF icon issues 2015-04-16 10:22:12 -04:00
gorhill
e16871b87d "meatier" icon to improve rendering at low-res 2015-04-16 09:07:00 -04:00
gorhill
0025ab9721 this fixes #60 2015-04-15 23:25:30 -04:00
gorhill
4a02246bfe more accurate 2015-04-15 12:00:13 -04:00
gorhill
b123894cb0 new revision 2015-04-15 10:49:16 -04:00
gorhill
daa374fce6 fine tuning logo 2015-04-15 10:43:52 -04:00
gorhill
f1363ad385 new revision 2015-04-15 09:48:53 -04:00
gorhill
f4ee989a1d un-bloat output files 2015-04-15 09:48:05 -04:00
gorhill
79b581749b this fixes #55 2015-04-15 09:40:41 -04:00
gorhill
f64263f1b8 yet another redesign, based on @Ricardo1991's idea 2015-04-15 08:32:17 -04:00
gorhill
14ec061bac might as well depart completely from old stuff 2015-04-14 18:52:51 -04:00
gorhill
09aae182b9 update ff icons 2015-04-14 17:16:48 -04:00
gorhill
2e03ef140d maybe it's the logo...? 2015-04-14 16:55:05 -04:00
gorhill
e0e50c445f new revision 2015-04-12 19:57:59 -04:00
gorhill
bc49c402df this fixes #42 2015-04-12 19:55:10 -04:00
gorhill
65f6b36131 code review 2015-04-12 19:15:58 -04:00
gorhill
0a17ba0597 code review 2015-04-12 18:56:26 -04:00
gorhill
9752c49d17 this fixes #43 2015-04-12 18:55:16 -04:00
gorhill
2cc5fb3b19 fixed Chromium API complaining of invalid tabId 2015-04-12 18:32:35 -04:00
gorhill
bebde23c6c new version 2015-04-10 17:18:36 -04:00
gorhill
25036eb5cf as per comment in e762a29d30 2015-04-10 09:05:25 -04:00
gorhill
2b8cd21bea this fixes https://github.com/chrisaljoudi/uBlock/issues/1225 2015-04-09 22:05:08 -04:00
gorhill
63d9143d6b #10: manually imported fixes from e762a29d30 2015-04-09 21:50:23 -04:00
gorhill
b9e07a16e3 this fixes https://github.com/chrisaljoudi/uBlock/issues/1219 for Firefox 2015-04-09 07:15:14 -04:00
gorhill
6441161329 refactored tabs/context code 2015-04-08 18:46:08 -04:00
gorhill
125513164f forgot to add shutdown to other platforms (re. https://github.com/gorhill/uMatrix/issues/144) 2015-04-08 06:15:10 -04:00
gorhill
31bea1d08b code review 2015-04-07 19:34:22 -04:00
gorhill
4aa61fcf89 this fixes https://github.com/gorhill/uMatrix/issues/144 2015-04-07 19:10:03 -04:00
gorhill
ad2bc8df74 removed spurious lines of code 2015-04-07 16:27:19 -04:00
gorhill
7961c41986 name change 2015-04-07 10:33:54 -04:00
gorhill
ecafda2850 revised icons 2015-04-07 10:12:18 -04:00
YFdyh000
6e77ec33ff Correct issue links 2015-04-07 09:46:26 +08:00
gorhill
2dde6f15de new switch: toggle cosmetic filtering on/off for a site 2015-04-05 12:03:14 -04:00
gorhill
6eb6d2b01d interim version for dev build 2015-04-05 10:40:58 -04:00
gorhill
c66130298d new version 2015-04-03 17:44:45 -04:00
gorhill
bbe4f4743b translation work from https://crowdin.com/project/ublock 2015-04-02 08:54:06 -04:00
Chris
6850fa0a26 Safari: minor code fix 2015-03-31 17:06:12 -06:00
AlexVallat
6c8b2a1b61 Changes following review 2015-03-31 12:03:35 +01:00
AlexVallat
ae310df6dd Merge branch 'webProgressListener'
Conflicts:
	platform/firefox/vapi-background.js
2015-03-31 08:00:50 +01:00
AlexVallat
50dfc40f26 No need for special treatment for about:blank and about:newtab 2015-03-31 07:48:45 +01:00
AlexVallat
49442e237e Fix for #1122 2015-03-31 07:48:45 +01:00
gorhill
5b34efc55e this fixes #1128 2015-03-30 17:42:12 -04:00
AlexVallat
726325ea0d Remove onNavigation from onTabSelect, as mentioned in #1125 2015-03-30 18:35:18 +01:00
gorhill
8d61a04b3e translation work from https://crowdin.com/project/ublock 2015-03-28 15:17:40 -04:00
gorhill
f2ff0edfaf this fixes #1013, #1062 (draft) 2015-03-27 13:00:55 -04:00
AlexVallat
7ec717d3fe More restrictive monitoring.
Probably doesn't make a difference, but at least theoretically more efficient.
2015-03-26 21:11:54 +00:00
AlexVallat
6123335c51 Use a nsIWebProgressListener instead of a tabsProgressListener for location change monitoring 2015-03-26 21:00:56 +00:00
gorhill
d7aea27f19 merged #1096 fixes 2015-03-26 15:17:53 -04:00
Chris
4cf276ca9d Safari: enable site warning document to work 2015-03-26 12:31:25 -05:00
Deathamns
bb1bb84682 Merge pull request #1084 from AlexVallat/master
Fix for #1072: Listen to DOMTitleChanged
2015-03-26 16:56:36 +01:00
AlexVallat
019ce25822 Cleanup for DOMTitleChanged listener 2015-03-26 15:44:57 +00:00
gorhill
2504f8ad35 #1013: Firefox support 2015-03-26 09:50:07 -04:00
gorhill
a4b4bc98ff this fixes #1013 2015-03-25 19:28:22 -04:00
AlexVallat
766537962c Fix for #1072: Listen to DOMTitleChanged as additional navigation event for Fennec 2015-03-24 07:56:18 +00:00
Chris
1699040649 Safari: better popup blocking 2015-03-23 13:01:50 -05:00
Chris
1910dfdf02 SVGs 2015-03-23 00:51:17 -05:00
Chris
46b786dd32 Safari: pixel-fit icon for non-retina screens; fixes #1075 2015-03-22 21:20:09 -05:00
gorhill
8edd2d44dc interim dev version 2015-03-22 16:17:29 -04:00
gorhill
63366e9e94 opera build 2015-03-22 16:16:27 -04:00
gorhill
e6e456ed7b to catch slow popups 2015-03-22 13:29:04 -04:00
gorhill
d6f0e49356 code review 2015-03-22 11:12:39 -04:00
gorhill
e750e99ffa interim version for dev build 2015-03-22 09:08:17 -04:00
gorhill
58ebcd21c3 code review: floating net requests recategorized as behind-the-scene 2015-03-21 20:30:00 -04:00
gorhill
78a4b59c65 get rid of Chrome store warning about missing short name 2015-03-21 17:41:00 -04:00
Chris
93d26f6159 Safari: popup resizing fix for #1066 2015-03-21 15:11:42 -05:00
gorhill
4006b99e69 #1057: cleanup code 2015-03-21 08:22:34 -04:00
gorhill
04a5786c41 #1051: test only root frames 2015-03-20 23:37:43 -04:00
gorhill
849206ebe7 new version 2015-03-20 20:31:58 -04:00
gorhill
7e8d2e431b this fixes #1057 2015-03-20 19:17:07 -04:00
gorhill
12d2ab526f this fixes #510 2015-03-20 15:14:56 -04:00
Deathamns
0e22af516f Firefox: handle nsIContentPolicy.TYPE_IMAGESET
https://bugzil.la/1055750
2015-03-20 13:52:01 +01:00
Deathamns
51532fc74e Firefox: register unload event sooner 2015-03-18 12:47:07 +01:00
Deathamns
6c0bde394d Firefox: check for non-existent button 2015-03-18 07:17:10 +01:00
Deathamns
c9f6a31701 Merge pull request #1042 from AlexVallat/master
Robustness changes from watching logs in Fennec
2015-03-18 07:01:36 +01:00
Chris
072bfb9567 Update header comments (copyright year, etc.) 2015-03-17 19:08:48 -06:00
Chris
774e30aec6 Helps #996 and simplifies platform code 2015-03-17 18:55:19 -06:00
AlexVallat
8474f8b5d0 Robustness changes from watching logs in Fennec 2015-03-17 18:09:40 +00:00
Deathamns
58e8b5bf5f Firefox: determine tabIds via <browser> 2015-03-17 07:05:02 +01:00
Chris
aaf8a9835c Safari: use self instead of window, just in case 2015-03-16 22:52:12 -06:00
Chris
339ffe9698 Safari: enable storage-used number formatting consistent with other browsers 2015-03-16 22:50:39 -06:00
Chris
cf3816b494 Safari: code review for readability 2015-03-16 18:09:06 -06:00
Chris
3c9f5c0da1 Safari: don't need to inject a stylesheet into popup 2015-03-16 18:08:12 -06:00
Chris
924bcfab62 Safari: remove hardcoded values from popup resizing 2015-03-16 17:40:17 -06:00
Chris
30f795caf5 Safari: remove dead code 2015-03-16 17:13:02 -06:00
Chris
5e363d1e37 Safari: fix popup resizing hiccup 2015-03-16 17:08:28 -06:00
Chris
9395e78957 Safari: make popup sizing work w/ recent modifications 2015-03-16 12:02:54 -06:00
gorhill
6b8118bb68 update opera 2015-03-16 13:33:56 -04:00
gorhill
bb1e131ae7 Merge branch 'master' of github.com:gorhill/uBlock 2015-03-16 07:05:42 -04:00
gorhill
2ba1538e1e this fixes #1031 2015-03-16 07:05:32 -04:00
Deathamns
ebf840c35d abp:subscribe fixes
Test a[href^="abp:"], since the protocol probably not used for anything
else, also "a", because ABP checks only anchors, and these links are made
only for ABP.

Also, the event target is not always the link, so at least some parents
should be tested as well.
2015-03-16 10:47:29 +01:00
Deathamns
5ae7687e56 Firefox: different kind of vAPI.localStorage 2015-03-16 08:09:34 +01:00
gorhill
ae544e3d04 interim version for dev build 2015-03-15 14:28:11 -04:00
Raymond Hill
38d308f1f0 Merge pull request #1021 from AlexVallat/master
Fix for #1017 (and #1001)
2015-03-15 13:28:32 -04:00
Deathamns
90295e7bef Firefox: update buttons when addon is enabled 2015-03-15 17:49:36 +01:00
AlexVallat
50804eb1bb Fixing #1017, only apply switch to about:blank or about:newtab if not loading 2015-03-15 16:07:46 +00:00
AlexVallat
05540108b7 Testing alternative tab ID for Fennec (issue #1001) 2015-03-15 16:07:37 +00:00
Deathamns
ac09dfadab No hasAttribute on tab objects in Fennec 2015-03-15 15:06:48 +01:00
gorhill
b83e0b46d5 move platform-specific images to their respective platform 2015-03-15 08:17:38 -04:00
Chris
2d30b04973 Safari: seamless transfer of settings to proper storage 2015-03-14 18:13:00 -06:00
Chris
441c1dd822 Use prefix for Safari-specific icons 2015-03-14 17:55:11 -06:00
gorhill
1baaf8a76a fixed ff icons 2015-03-14 19:25:26 -04:00
gorhill
f3480b09ef interim version for dev build 2015-03-14 17:43:52 -04:00
Deathamns
f6ccacf550 Firefox,Safari: vAPI.localStorage 2015-03-14 19:53:30 +01:00
gorhill
ed88939a63 this fixes #792 2015-03-14 14:12:05 -04:00
gorhill
65890f1e33 new version 2015-03-13 18:00:17 -04:00
gorhill
e59673b789 added newly available languages 2015-03-13 17:34:59 -04:00
gorhill
87b8d1f9cb had a doubt, had to check it worked as intended 2015-03-12 17:30:14 -04:00
Deathamns
d660604b8d Firefox: badge color fix 2015-03-12 20:38:21 +01:00
Deathamns
16218a1609 Code organizing 2015-03-12 18:48:43 +01:00
Deathamns
4ad9858357 Firefox: load content-scripts on extension start 2015-03-12 18:20:48 +01:00
Deathamns
48503f7009 Firefox: bypass cache when reloading a tab 2015-03-12 15:46:33 +01:00
Deathamns
aaafdebefd Chrome: fix tab/window focusing issues
- Opening a tab from incognito window didn't focus the target window
- Previously active tab was visible for a brief moment when an already
  opened tab was selected from another window
2015-03-12 15:07:55 +01:00
gorhill
648ced0183 code review re #118 2015-03-12 09:28:02 -04:00
Deathamns
86ac9763b0 Chrome: don't open an Options tab for each window 2015-03-12 14:16:11 +01:00
Deathamns
2e076f7e4e Remove unnecessary fallback code for downloading 2015-03-12 12:09:45 +01:00
Deathamns
650d86d5a9 Chrome: select Options tab if it's already opened 2015-03-12 12:07:35 +01:00
gorhill
41bf9486e4 Firefox: oops 2015-03-11 20:01:56 -04:00
Chris
4e31b0b6d9 Safari: code review; oops 2015-03-11 17:58:47 -06:00
Chris
03797626cf Fix vAPI.download across all platforms 2015-03-11 17:54:32 -06:00
gorhill
60e36c0ffe this helps #993 2015-03-11 19:48:00 -04:00
Chris
717c7a0a60 Completes fix of #988 2015-03-11 16:29:08 -06:00
Chris
654c82619a Sort-of fixes #988 2015-03-11 15:53:23 -06:00
Deathamns
415846e326 Merge pull request #956 from AlexVallat/master
UI for Fennec (Firefox for Android)
2015-03-11 15:32:42 +01:00
Chris
10f656f8fe Safari: new storage now works; closes #985 2015-03-11 00:11:18 -06:00
Chris
4720ecdf58 Safari: new storage 2015-03-11 00:04:31 -06:00
gorhill
214487c159 interim version for dev build 2015-03-10 23:51:46 -04:00
AlexVallat
825adfa80e Trying to fix merge 2015-03-10 18:44:31 +00:00
AlexVallat
62c8ffbcc4 Merge branch 'master' of https://github.com/gorhill/uBlock
Conflicts:
	platform/firefox/vapi-background.js
	src/_locales/en/messages.json
2015-03-10 18:34:16 +00:00
AlexVallat
b1f19376e8 Changes following review at https://github.com/gorhill/uBlock/pull/956#issuecomment-78047032 2015-03-10 18:01:37 +00:00
Deathamns
c4b06eecd2 Firefox: abp:subscribe 2015-03-10 13:06:59 +01:00
Chris
30eafed70a More µ to u 2015-03-09 22:00:48 -06:00
Chris
438f895ff4 Consistency with change made in 23083e9d 2015-03-09 19:28:48 -06:00
Chris
476fd17555 Safari: enable click to subscribe 2015-03-09 13:56:05 -06:00
gorhill
2478bd4f61 this fixes #224 for Chromium 2015-03-09 12:57:52 -04:00
Chris
3413289646 Safari vapi-client.js minor formatting 2015-03-08 15:53:39 -06:00
gorhill
8341fb2193 this fixes #967 2015-03-08 11:06:36 -04:00
Deathamns
252eb1b4dc Safari: make it work on version 5 2015-03-08 12:20:07 +01:00
Deathamns
0306f52c0e Safari: update locale list 2015-03-08 12:18:57 +01:00
Deathamns
ba37764d46 Firefox: update application versions 2015-03-08 10:48:39 +01:00
Deathamns
25d5166eb6 Firefox: change badge color in onWidgetUnderflow 2015-03-08 07:39:58 +01:00
Deathamns
b46469c6ca Trailing whitespace 2015-03-07 19:30:55 +01:00
AlexVallat
4481e951cc Merge branch 'master' of https://github.com/gorhill/uBlock 2015-03-07 14:11:35 +00:00
gorhill
9ec4dfc1f1 new version 2015-03-07 09:03:55 -05:00
gorhill
4c2480a4a1 interim version for dev build 2015-03-04 19:32:12 -05:00