external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-11 09:31:01 +01:00
Code Issues Projects Releases Packages Wiki Activity
2128 commits 2 branches 960 tags 231 MiB
Commit graph

2128 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Deathamns
a795d6e073 Fix event variable name in subscriber.js 2015-03-10 12:31:10 +01:00
Chris
2eb421dde8 Closes #948 2015-03-10 00:27:15 -06:00
Chris
30eafed70a More µ to u 2015-03-09 22:00:48 -06:00
gorhill
3739683e70 Merge branch 'master' of github.com:gorhill/uBlock 2015-03-09 23:01:33 -04:00
gorhill
bf50e87dff this fixes #976 2015-03-09 23:00:52 -04:00
Chris
001c9c6095 µ to u (consistency with 23083e9); a to an 2015-03-09 19:58:31 -06:00
Chris
438f895ff4 Consistency with change made in 23083e9d 2015-03-09 19:28:48 -06:00
gorhill
cad5a6cbf6 code review 2015-03-09 20:04:07 -04:00
gorhill
f362dff643 code review: do not pollute global namespace 2015-03-09 19:19:08 -04:00
gorhill
e7479dd4be this fixes #313 2015-03-09 19:10:04 -04:00
gorhill
86c52305c8 better English I suppose 2015-03-09 18:38:08 -04:00
Chris
476fd17555 Safari: enable click to subscribe 2015-03-09 13:56:05 -06:00
gorhill
400c51ccd9 handler for "abp:subscribe?" links 2015-03-09 13:07:08 -04:00
gorhill
f1e065f5fb fixed description 2015-03-09 13:06:25 -04:00
gorhill
2478bd4f61 this fixes #224 for Chromium 2015-03-09 12:57:52 -04:00
gorhill
cfadf76345 jshint 2015-03-09 10:19:00 -04:00
gorhill
1525a828c1 this fixes #810 2015-03-09 10:11:22 -04:00
gorhill
ba689f7929 re. #962 2015-03-09 01:09:27 -04:00
gorhill
5a2f6e0f67 this completes fix of #954 2015-03-09 00:21:08 -04:00
gorhill
e036ae038e jshint 2015-03-08 18:01:29 -04:00
gorhill
f55ce63f64 Merge branch 'master' of github.com:gorhill/uBlock 2015-03-08 17:54:28 -04:00
gorhill
3544989e69 this fixes #954 2015-03-08 17:54:08 -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
Raymond Hill
2d8ec83bff Merge pull request #959 from gorhill/readme-update 
Readme update
 2015-03-07 22:41:50 -05:00
Chris Aljoudi
82052b69ff add IPA 2015-03-07 18:04:21 -07:00
Chris Aljoudi
4b75a8629f Tweaks to spacing 2015-03-07 17:53:01 -07:00
Chris Aljoudi
4ac67952df Cleanup markup/HTML mess; make code readable (somewhat) 2015-03-07 17:51:36 -07:00
Chris Aljoudi
077bd5b8ba More header fixes (links, etc) 2015-03-07 17:35:47 -07:00
Chris Aljoudi
87308b35da Markdown is great for styling, right? 2015-03-07 17:32:17 -07:00
Chris Aljoudi
eb4da22a34 First attempt at cleaning up the header 2015-03-07 17:31:27 -07:00
Chris Aljoudi
9ac34a8ebd README: cleanup, move travis badge (made smaller) 2015-03-07 17:14:41 -07:00
Chris
e94a2a439c Add icon to doc/img so we don't have to reference src from docs 2015-03-07 17:08:59 -07:00
Chris
3fb50b3880 undo last commit 2015-03-07 16:59:18 -07:00
Chris
346f14e690 README: travis link too big; smaller, cleaner alt 2015-03-07 16:57:08 -07:00
Chris Aljoudi
9a76caee3b Add language icon to README; some formatting 2015-03-07 16:28:07 -07:00
Chris
2df008eb37 Better-sized language icon (languageicon.org) 2015-03-07 16:25:00 -07:00
Chris
28db5faf5e Add language icon (languageicon.org) 2015-03-07 16:09:26 -07:00
Raymond Hill
03f5b4c394 Update README.md 2015-03-07 16:21:59 -05:00
Raymond Hill
56d7d5502a Update README.md 2015-03-07 16:20:52 -05:00
Raymond Hill
23083e9d82 Update README.md 2015-03-07 16:19:10 -05:00
gorhill
892eaec686 update of third-party assets 2015-03-07 13:47:06 -05:00