1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-19 17:02:34 +01:00
Commit Graph

4502 Commits

Author SHA1 Message Date
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
gorhill
ade97fdaea Merge branch 'master' of github.com:gorhill/uBlock 2015-03-11 19:55:36 -04:00
gorhill
e3959c3610 changes re #993 for firefox platform 2015-03-11 19:55:27 -04: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
gorhill
2a47057209 Merge branch 'master' of github.com:gorhill/uBlock 2015-03-11 18:26:12 -04:00
gorhill
32687c94f3 this helps #988 2015-03-11 18:26:00 -04:00
Chris
654c82619a Sort-of fixes #988 2015-03-11 15:53:23 -06:00
gorhill
d0113278aa code review 2015-03-11 14:52:20 -04:00
gorhill
ca0057e724 using new string for blocked stats 2015-03-11 11:21:29 -04:00
gorhill
5b6a7b3aa4 translation work from https://crowdin.com/project/ublock 2015-03-11 11:20:59 -04:00
gorhill
145e5da7ce this fixes #990 + code review for #978 2015-03-11 11:05:13 -04: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
7b21d7270d code review 2015-03-11 00:31:11 -04:00
gorhill
214487c159 interim version for dev build 2015-03-10 23:51:46 -04:00
gorhill
92d12a3515 Merge branch 'master' of github.com:gorhill/uBlock 2015-03-10 23:50:34 -04:00
gorhill
eef5ccb2fa translation work from https://crowdin.com/project/ublock 2015-03-10 23:50:21 -04:00
gorhill
39ad1585e9 this fixes #982, #978, #965 2015-03-10 23:46:18 -04:00
Chris
4bf81841f2 Add contributing.md for issue guidelines and a template 2015-03-10 15:16:34 -06:00
gorhill
afa08caa6a github #313, crowdin issue 252799 2015-03-10 17:02:19 -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
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