Skip to content

Commit

Permalink
Merge branch 'master' into feature/AG-37187
Browse files Browse the repository at this point in the history
  • Loading branch information
anyakushin authored Jan 13, 2025
2 parents 8beee28 + dc9f079 commit ad14426
Show file tree
Hide file tree
Showing 803 changed files with 8,837 additions and 5,358 deletions.
2 changes: 2 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ files:
- source: /i18n/en/**/*
translation: /i18n/%two_letters_code%/**/%original_file_name%
languages_mapping: *languages_mapping
update_option: 'update_as_unapproved'
- source: /docs/**/*
translation: /i18n/%two_letters_code%/docusaurus-plugin-content-docs/current/**/%original_file_name%
languages_mapping: *languages_mapping
update_option: 'update_as_unapproved'
ignore:
- "/**/_category_.json"
26 changes: 26 additions & 0 deletions docs/adguard-for-android/features/protection/private-browser.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
title: Private browser
sidebar_position: 7
---

:::info

This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock)

:::

In v4.7, AdGuard for Android introduced an in-app private browser. You can access it from the main screen by tapping the *Private browser* button or from the *Protection* tab, where you can find some customization options.

![Private browser](https://cdn.adtidy.org/content/release_notes/ad_blocker/android/v4.7/agpb_en.png)

Here's what you can set up:

- To set a default search engine, tap *Default search engine* and choose between the available options: DuckDuckGo (default), Google, Bing, Yahoo, Baidu, or Yandex
- To create a browser shortcut, tap *Create browser widget* and follow the on-screen instructions
- To get suggestions from your search engine instead of typing the entire query, toggle the *Search suggestions* option

:::note

The private browser is still in the early stages of development and has some limitations. For now, we recommend using it as a supplement to your browser’s Incognito mode, rather than as a replacement.

:::
29 changes: 29 additions & 0 deletions docs/adguard-for-android/solving-problems/auto-blocker.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
title: How to disable the Samsung Auto Blocker feature
sidebar_position: 19
---

:::info

This article is about AdGuard for Android, a multifunctional ad blocker that protects your device at the system level. To see how it works, [download the AdGuard app](https://agrd.io/download-kb-adblock)

:::

Starting with One UI 6.1.1 (Android 14), Samsung introduced a security enhancement called *Auto Blocker*, which is enabled by default on the latest Galaxy smartphones. This feature automatically blocks sideloaded apps from unverified sources unless the user manually overrides the setting.

Since AdGuard for Android [can’t be published on Google Play](https://adguard.com/en/blog/adguard-google-play-removal.html), you have to install it manually. However, with the new *Auto Blocker* feature enabled, some users may experience problems when installing AdGuard APK files. To address this issue, we’ve provided a step-by-step guide on how to disable *Auto Blocker* below.

## How to disable Auto Blocker

Follow the instructions to turn off *Auto Blocker*.

1. Open your device settings
1. Go to *Security and privacy*
1. Scroll down and select *Auto Blocker*
1. Toggle the setting off

![Disable Auto Blocker *border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/auto-blocker/auto_blocker_en.png)

Once *Auto Blocker* is disabled, you can proceed with installing AdGuard Ad Blocker.

![Tap Install *border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/auto-blocker/install_en.png)
2 changes: 1 addition & 1 deletion docs/adguard-for-safari/extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ User rules and allowlist rules are included into every extension.

## AdGuard for Safari

*AdGuard for Safari activates the AdGuard icon next to the search bar. It's useful if you want to quickly set up protection for a specific website or block ads manually. It also contains advanced rules that aren't converted to the format supported by Safari. These include [CSS rules](/general/ad-filtering/create-own-filters#cosmetic-css-rules), [Extended CSS selectors](/general/ad-filtering/create-own-filters#extended-css-selectors), and [scriptlets](/general/ad-filtering/create-own-filters#scriptlets), which allow AdGuard to block complex ads, such as those on YouTube.
*AdGuard for Safari* activates the AdGuard icon next to the search bar. It's useful if you want to quickly set up protection for a specific website or block ads manually. It also contains advanced rules that aren't converted to the format supported by Safari. These include [CSS rules](/general/ad-filtering/create-own-filters#cosmetic-css-rules), [extended CSS selectors](/general/ad-filtering/create-own-filters#extended-css-selectors), and [scriptlets](/general/ad-filtering/create-own-filters#scriptlets), which allow AdGuard to block complex ads, such as those on YouTube.

## How to manage Safari extensions

Expand Down
36 changes: 25 additions & 11 deletions docs/general/account/2fa.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,40 @@ We recommend setting up two-factor authentication for your AdGuard account. It w

## How to set it up

1. Log into your [AdGuard account](https://auth.adguard.com/login.html) and go to the Settings tab:
1. Log into your [AdGuard account](https://auth.adguard.com/login.html) and go to the *Settings* tab:

![AdGuard Account settings *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/account_settings.png)
![AdGuard Account settings *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_1.png)

1. Scroll down to *Password and 2FA* section and click **Enable**:
1. Scroll down to *Two-factor authentication* and enable it:

![The Change button *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_new.png)
![Two-factor authentication toggle *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_2.png)

1. Follow the on-screen instructions to install an authenticator app and scan the QR code:
1. A code will be sent to the email address associated with your AdGuard account. To enable 2FA, enter the code and click *Enable*.

![The verification code](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_enable.png)
![The verification code *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_3.png?)

***Important***
After you enable two-factor authentication, you have two options to choose from:

- Save the second-factor backup code somewhere, it will be necessary to recover your account in case your mobile phone gets lost or stolen;
- *One-time email code*: when you log in, we will ask you to enter the code we sent to your email

- *Code from authenticator app*: when you log in, we will ask for a code from your authenticator app

![2FA options *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_4.png)

:::note

If you use the authenticator app, make sure to save the **setup key** somewhere. It will be necessary to recover your account in case your mobile phone gets lost or stolen.

![The setup key in the authenticator app *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/setup_key.png)

:::

If everything is done right, you will see this when you log into your account the next time:

![The result *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_success.png)
![The result *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_5.png)

:::note

Use your mobile authenticator app to read the code and enter it. You should be logged in now!
If you get an authentication error, check the clock on your phone. Adjust it if needed, as an unsynchronized clock may be the cause of the error.

***NOTE***: If you get an authentication error, check the clock on your phone. Adjust it if needed, as an unsynchronized clock may be the cause of the error.
:::
20 changes: 10 additions & 10 deletions docs/general/account/features.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
---
title: What can be done in the AdGuard Account
title: What can be done in the AdGuard account
sidebar_position: 2
---

In your account, you can manage your licenses, devices bound to them, personal data, email and password, view purchases and contact support.

## Manage account settings

In the *Settings* section of your AdGuard account, you can update or reset your password, change your email address, enable [two-factor authentication](../2fa), view the data stored about you by AdGuard and choose the language of your personal account and notifications.
In the *Settings* section of your AdGuard account, you can update or reset your password, change your email address, enable one-time code login or [two-factor authentication](../2fa), view the data stored about you by AdGuard, and select the language of your account and notifications.

In this section, you can also manage your email preferences:

- receive transactional emails,
- receive AdGuard’s monthly newsletters,
- receive emails about AdGuard special offers and promotions,
- send read receipts to AdGuard when you open emails.
- Receive AdGuard newsletter
- Receive transactional emails
- Send read receipts to AdGuard
- Opt-out preferences

## Manage licenses

Expand All @@ -28,12 +28,12 @@ In the *Licenses* section, you can manage your licenses and the devices bound to
- canceled.
You can also update your payment details.

The devices bound to your AdGuard Ad Blocker licenses can be unbound or renamed. You can unbind unused devices by clicking the cross icon next to them.
The devices bound to your AdGuard Ad Blocker licenses can be unbound or renamed. To unbind unused devices, click the number of bound devices next to *Devices*, then select the right arrow → *Remove*.

## View purchases

The Purchase history section displays all the licenses that you have ever purchased using the email account you registered your AdGuard account with. You will also find there information about the date of purchase, order ID, payment method, and cost of the purchase.
The *Purchases* section displays all the licenses that you have ever purchased using the email account you registered your AdGuard account with. You will also find there information about the date of purchase, order ID, payment method, and cost of the purchase.

## Contact support
## Activity

The Support tab contains useful links to help you solve problems or find answers to your questions about AdGuard products. They are divided into six sections: FAQ, Send a bug repot/feature request, Report incorrect blocking, Contact support, Knowledge Base, and Discuss.
The *Activity* tab allows you to monitor login activity for your AdGuard account. It displays the email address used, location, and login date. You can also filter records by product: *All products*, *AdGuard Ad Blocker*, *AdGuard VPN*, *AdGuard DNS*.
8 changes: 7 additions & 1 deletion docs/general/account/register.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sidebar_position: 1

## How to create an account

To create an account, go to [AdGuard's official website](https://adguard.com/welcome.html) and press the *My Account* button on the top right corner of the screen. Enter your email address and create a password — your account will be registered.
To create an account, go to [AdGuard's official website](https://adguard.com/welcome.html) and click the *Log in* button on the top right corner of the screen. Enter your email address and create a password — your account will be registered.

:::tip

Expand All @@ -21,6 +21,12 @@ An account can also be created directly in an AdGuard app. Press the *Log in* or

After the account is created, activate it by following the link in the activation email.

:::tip

After you've registered your account, you can use the *One-time code* option to log in to the application. Enter your email address and choose to enter either your password or the the code sent to your email address.

:::

## How to create an account via a social network

To create an account via a social network, simply follow the [link](https://auth.adguard.com/login.html) and log in to your account. Once you’ve signed up, check your inbox — there’ll be a confirmation email. Set a password and that’s it! Now you can use all the [features of the AdGuard account](https://adguard.com/kb/general/account/features/).
2 changes: 1 addition & 1 deletion docs/general/ad-filtering/create-own-filters.md
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ despite the pattern `||*page` may match specific domains.

:::caution Limitations

In [AdGuard for Chrome MV3][ext-mv3] `regexp` and `any_tld domains` are not supported.
In [AdGuard for Chrome MV3][ext-mv3], `regexp` and `any_tld_domain` entries are not supported.

:::

Expand Down
40 changes: 39 additions & 1 deletion docs/general/ad-filtering/how-ad-blocking-works.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ And even when a rule finally gets added to a filter, it doesn't mean that it sta

AdGuard users [have access to a special web reporting tool](https://reports.adguard.com/new_issue.html). Thanks to user complaints, filter developers can focus on correcting their filter lists and not on scouring the Internet for new and old unblocked ads.

Filters can do more than just block ads. There are filters that block tracking, social media widgets, and annoyances such as cookie notices. Different users may choose different combinations of filters to match their personal preferences. There are websites like [filterlists.com](https://filterlists.com/) that are dedicated to filter lists and have huge databases.
Filters can do more than just block ads. There are filters that block tracking, social media widgets, and annoyances, such as cookie notices. Different users may choose different combinations of filters to match their personal preferences. There are websites like [filterlists.com](https://filterlists.com/) that are dedicated to filter lists and have huge databases.

We develop and maintain [our own set of filter lists](../adguard-filters) that can be used with AdGuard or other ad blockers.

Expand Down Expand Up @@ -62,3 +62,41 @@ These rules are quite complicated and require the ad blocker to be granted certa
There are other types of filtering rules, but they require more advanced technical knowledge to understand how they work. If you are interested, [check out our comprehensive guide on filtering rules in the linked article](../create-own-filters).

:::

## Types of request handling in AdGuard

AdGuard handles requests according to filters, user rules and settings enabled by the user. As a result, a request can be blocked, modified, allowed or, when nothing is done to it, just processed.

Detailed information on how each request of yours has been handled by AdGuard can be found in the *Filtering log* (AdGuard for Windows, AdGuard for Mac, AdGuard Browser Extension) or *Recent activity* (AdGuard for iOS, AdGuard for Android).

Regarding AdGuard filters, you can also check [our filter policy](../filter-policy), which describes in detail what and why each of our filters blocks.

### Examples of blocked requests

AdGuard DNS filter blocks requests to ad domains, such as `ad.doubleclick.net`.

AdGuard Tracking Protection filter blocks tracking requests, such as `youtube.com/youtubei/log_event?`.

### Examples of allowed requests

AdGuard Base filter allows non-ad requests, such as `www.google.com/complete/search?q=`.

Filter unblocking search ads and self-promotion allows requests to search ad-related domains, such as `www.google.com/aclk?`.

Requests to websites that are added by the user to *Allowlist* are allowed.

### Examples of modified requests

Tracking protection feature with protection level set to *High* enables AdGuard URL Tracking filter which modifies requests by removing tracking parameters from them:

`https://www.rentio.jp/products/ax-n1b?click_from=top_newitems``https://www.rentio.jp/products/ax-n1b`

`https://www.baseballchannel.jp/npb/183688/?ref=ise``https://www.baseballchannel.jp/npb/183688/`

`https://www.gog.com/game/spec_ops_the_line?pp=2863d7ae605104eeef364e3f164d3404e20f680c&gad_source=1`
`https://www.gog.com/game/spec_ops_the_line`

Please note that *modified* events you see in the Filtering log or Recent activity refer not only to the cases when a request is modified, but also when:

- something on the page is changed (usually by cosmetic rules)
- the response is modified
Loading

0 comments on commit ad14426

Please sign in to comment.