-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #1325 Squashed commit of the following: commit d8f7de7 Merge: f9bbe86 36f3218 Author: Andrey Meshkov <[email protected]> Date: Mon Jul 6 19:34:53 2020 +0300 Merge branch 'master' into feature/1325 commit f9bbe86 Merge: 99710fe 4f8138b Author: Andrey Meshkov <[email protected]> Date: Mon Jul 6 19:33:53 2020 +0300 Merge branch 'master' into feature/1325 commit 99710fe Merge: 8329326 a5380ea Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 18:04:32 2020 +0300 Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325 commit 8329326 Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 18:03:56 2020 +0300 Update locales, add title for select modal commit a5380ea Author: Andrey Meshkov <[email protected]> Date: Mon Jul 6 17:26:37 2020 +0300 Update readme commit dfe6e25 Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 13:44:19 2020 +0300 Change info icon width commit 06120cf Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 13:38:58 2020 +0300 Review changes commit ae3c6ca Merge: dd56a3b 73c5d9e Author: ArtemBaskal <[email protected]> Date: Mon Jul 6 12:01:57 2020 +0300 Merge branch 'master' into feature/1325 commit dd56a3b Author: Andrey Meshkov <[email protected]> Date: Fri Jul 3 15:52:01 2020 +0300 Added blocklists commit f08f0eb Merge: 854d4f8 21dfb5f Author: Andrey Meshkov <[email protected]> Date: Fri Jul 3 14:06:19 2020 +0300 Merge branch 'master' into feature/1325 commit 854d4f8 Merge: 2394626 2c47053 Author: ArtemBaskal <[email protected]> Date: Mon Jun 22 14:09:31 2020 +0300 Merge branch 'master' into feature/1325 commit 2394626 Author: ArtemBaskal <[email protected]> Date: Tue May 26 19:00:26 2020 +0300 Math filters by url commit 661e048 Author: ArtemBaskal <[email protected]> Date: Mon May 25 21:07:21 2020 +0300 Change data format commit ac4ff48 Author: ArtemBaskal <[email protected]> Date: Thu May 14 19:52:45 2020 +0300 + client: Add choosing filter lists
- Loading branch information
Showing
29 changed files
with
617 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -530,4 +530,4 @@ | |
"safe_search": "Sichere Suche", | ||
"blocklist": "Sperrliste", | ||
"milliseconds_abbreviation": "ms" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -530,4 +530,4 @@ | |
"safe_search": "セーフサーチ", | ||
"blocklist": "ブロックリスト", | ||
"milliseconds_abbreviation": "ms" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -530,4 +530,4 @@ | |
"safe_search": "세이프 서치", | ||
"blocklist": "차단 목록", | ||
"milliseconds_abbreviation": "ms" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -492,4 +492,4 @@ | |
"blocked_threats": "Blokkerte trusler", | ||
"allowed": "Unntak", | ||
"blocklist": "Blokkeringsliste" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.