Commit Graph

299 Commits

Author SHA1 Message Date
Ainar Garipov
eeb99db973 Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 96ab70982c2f605a4f793a720451725a6c0e6c86
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 14 15:49:06 2021 +0300

    client: fix de i18n typography

commit d7ef3efa09814b8c8b3a9fdce891c137fea6583b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 14 15:16:15 2021 +0300

    client: upd i18n
2021-09-14 16:01:52 +03:00
Dmitry Seregin
8fdd789474 Pull request: 3419 client allowlist collision
Updates #3419.

Squashed commit of the following:

commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 17:31:16 2021 +0300

    added link to github issue

commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 17:29:52 2021 +0300

    Merge branch 'master' into 3419-client-allowlist-collision

commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 16:28:11 2021 +0300

    fix en

commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 15:49:12 2021 +0300

    added missing space

commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 15:43:55 2021 +0300

    fixes after review

commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Sep 9 14:17:19 2021 +0300

    fixes

commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Wed Sep 8 15:04:30 2021 +0300

    return empty line to locale file

commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Wed Sep 8 13:57:51 2021 +0300

    all: fix collisions in access lists && expand block/unblock client
2021-09-10 17:57:09 +03:00
Ainar Garipov
bb4cd312c2 Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 59dadec4fe47ffb752ba13d597ad0dba35a17d93
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 31 13:22:53 2021 +0300

    client: fix ru locale

commit 38268c97dbf728c367ac280224ee6dcfef90c19a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 31 13:16:36 2021 +0300

    client: upd i18n
2021-08-31 13:28:27 +03:00
Ildar Kamalov
e5c73877c8 Pull request: 3403 use checkbox to disable statistics
Closes #3403

Squashed commit of the following:

commit 25eaa0a70cb5ac7de51c456d2f611522f334846c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Aug 27 15:42:29 2021 +0300

    fix enabling stats

commit 1e2897651a84cf32ae01a79b8a61aeb5aa9f6405
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 18:46:21 2021 +0300

    client: use checkbox to disable statistics
2021-08-27 16:08:29 +03:00
Dmitry Seregin
8454e65cd9 Pull request #1269: tls: hide saved private key
Merge in DNS/adguard-home from 1898-hide-private-key to master

Squashed commit of the following:

commit 542569bbc098541f8e191cc5c1e5509a65fe2c5f
Merge: a07d715f 756c7064
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Aug 27 13:29:15 2021 +0300

    Merge branch 'master' into 1898-hide-private-key

commit a07d715f0f0932fdad4ec3f1e1a265b43809e21b
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Aug 26 19:45:39 2021 +0300

    fix bug

commit 9f2b70719a24aab827c2dc300fc94bf2202527a7
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Aug 26 19:07:17 2021 +0300

    fixes

commit e79f0e620844531a737fff5a88f5c2cffc403f51
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Aug 26 18:35:32 2021 +0300

    more documentation to god of documentation

commit 47790964ed05f50c075f6b6497b1517b0d974bea
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Aug 26 18:23:08 2021 +0300

    changed var named && fixed description

commit d35de5a34eafb3ffbd1148982dd31735a2000377
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Aug 26 18:11:13 2021 +0300

    revert locales

commit 514ab1a5d90039bf9aad1389dd0ed966fd1a7e65
Merge: 5d9b992a 16092e8b
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Aug 26 14:41:27 2021 +0300

    Merge branch 'master' into 1898-hide-private-key

commit 5d9b992a236dec276a46a035509da6938a7da7bf
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Aug 26 14:41:13 2021 +0300

    here we go again

commit 2e7b30df5f19953f4e055394083be62b23028ad6
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Aug 20 17:11:49 2021 +0300

    update deps

commit 5e58c3e22a77c42f321deb9707f34f031b345d75
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Aug 20 17:10:19 2021 +0300

    small fix

commit c2096377de0a8ecf4f36567322ad9171c5fb5ab2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Aug 20 17:07:45 2021 +0300

    fixes && updated translations

commit ada2d4784e6288b1740b8564b6ffc1ef8f0dcf68
Merge: dc5ce072 550b1798
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Aug 20 13:17:34 2021 +0300

    Merge branch 'master' into 1898-hide-private-key

commit dc5ce0721b5c095ed79f2a302ad90d9616785f93
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Aug 13 20:12:18 2021 +0300

    tls: hide saved private key

    If private key saved as a string, then hide it from the answer to UI
2021-08-27 13:42:31 +03:00
Ainar Garipov
756c70644d Pull request: client: imp en locale
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 04192f2eb3dda1059da442dd29c7d3b46cc4c538
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Aug 26 15:39:16 2021 +0300

    client: imp en locale
2021-08-26 16:02:23 +03:00
Ainar Garipov
f8fe4b310f Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit e85d6eef7fca0eb61dd83d83069a637a71c66547
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 17 15:15:45 2021 +0300

    client: upd i18n
2021-08-17 15:20:48 +03:00
Ainar Garipov
00f2927663 Pull request: client: imp en i18n
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit ad7de346cddd14502e7144c9b689f610357158fd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Aug 11 13:34:47 2021 +0300

    client: imp en i18n
2021-08-11 14:20:02 +03:00
Ainar Garipov
133a1c57b1 Pull request: client: fix en i18n
Merge in DNS/adguard-home from fix-i18n to master

Squashed commit of the following:

commit 6cc5b9548cd1b429cfcba13c37b3cbfed9ae6514
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 9 14:21:06 2021 +0300

    client: fix en i18n
2021-08-09 14:38:31 +03:00
Ainar Garipov
89b3af128a Pull request: client: imp en i18n
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 5340d2ccfecbf756694594d125e10c1890a7155a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Aug 6 15:28:37 2021 +0300

    client: imp en i18n
2021-08-06 15:40:30 +03:00
Ainar Garipov
c14bde280e Pull request: client: upd i18n
Merge in DNS/adguard-home from 2643-upd-i18n to master

Squashed commit of the following:

commit 12f4de7608c7a2335a137859301ff3a51e239596
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 3 13:32:37 2021 +0300

    client: fix punct in fr

commit 01369e0985ffd0f8780e514f9af614909d3ecdb4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 3 13:27:02 2021 +0300

    client: fix punct in de, fr

commit d06ea8fe2d2ca4f50e8721d9edb0a895062ac0a0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 3 13:07:57 2021 +0300

    client: upd i18n
2021-08-03 13:40:21 +03:00
Ainar Garipov
12db98230c Pull request: client: imp setup guide i18n
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit a109d8fd8a32ab20106d1df61ab945bb139c12e4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jul 30 16:01:09 2021 +0300

    client: imp setup guide i18n
2021-07-30 16:09:12 +03:00
Ainar Garipov
0217c6ad11 Pull request: client: upd i18n
Merge in DNS/adguard-home from 2643-upd-i18n to master

Squashed commit of the following:

commit 328847d67d1be5632777dd146b4110d5ab1d57d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jul 20 13:18:58 2021 +0300

    client: upd i18n more

commit b9856dbd013056aa690f7a5ca116a194d218554d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jul 20 12:52:33 2021 +0300

    client: upd i18n
2021-07-20 13:22:48 +03:00
Ainar Garipov
b9e85695db Pull request: 2145 optimistic cache
Updates #2145.

Squashed commit of the following:

commit 0c15347f4573252849817f27f290c0d45381454c
Merge: 98bd3b89 ebade2b6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jul 14 20:44:58 2021 +0300

    Merge branch 'master' into 2145-optimistic-cache

commit 98bd3b895e0d881d5234f674b54f9fa7847dc8f0
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 14 13:12:56 2021 +0300

    client: handle optimistic cache

commit 0b469b72ffd43d736dbf139e7d47b23b9fa877c5
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 19:01:01 2021 +0300

    openapi: fix log of changes

commit f1594e7f7567e0278b08025a8e4da901ef330602
Merge: a034eb98 e113b276
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 18:53:01 2021 +0300

    Merge branch 'master' into 2145-optimistic-cache

commit a034eb98bafdca90befad7dfb6a9b0e4c939c879
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jun 29 18:45:28 2021 +0300

    dnsforward: fix tests

commit c72227f83c849714721c3512beeb9d1b800a7225
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jun 29 18:33:12 2021 +0300

    openapi: imp docs

commit 35fe0d2a8c98d007b8ac48653c18d10d52e72dce
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 14:19:46 2021 +0300

    dnsforward: add optimistic cache
2021-07-14 21:03:56 +03:00
Ildar Kamalov
ebade2b6ce Pull request: 3313 statistics settings UI
Closes #3313

Squashed commit of the following:

commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jul 14 15:53:18 2021 +0300

    Merge branch 'master' into 3313-statistics

commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 14 15:23:09 2021 +0300

    client: make client names clickable

commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 14 15:06:30 2021 +0300

    client: decreasing interval confirm, disabled stats message
2021-07-14 16:01:12 +03:00
Ainar Garipov
1a693f790b Pull request: client: upd i18n
Merge in DNS/adguard-home from 2643-upd-i18n to master

Squashed commit of the following:

commit e965f59e87ca4ac3da69bac6a1d0526d091ea02a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jul 7 13:30:43 2021 +0300

    client: upd i18n
2021-07-07 13:44:53 +03:00
Eugene Burkov
e113b276e7 Pull request: 2504 querylog interval
Merge in DNS/adguard-home from 2504-querylog-ivl to master

Updates #2504.

Squashed commit of the following:

commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 18:45:10 2021 +0300

    Merge branch 'master' into 2504-querylog-ivl

commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 18:35:50 2021 +0300

    client: fix fmt

commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 17:58:06 2021 +0300

    home: imp code

commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 17:23:18 2021 +0300

    home: imp duration

commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 16:55:31 2021 +0300

    home: imp code, docs

commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 16:11:40 2021 +0300

    all: imp code, docs

commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jul 1 13:49:42 2021 +0300

    all: change querylog interval setting format
2021-07-01 18:50:28 +03:00
Ainar Garipov
77c701930e Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 74b5028ba58b5e9e76c5d2c36e04e64699733095
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 29 16:16:29 2021 +0300

    client: upd i18n
2021-06-29 17:04:36 +03:00
Ainar Garipov
e08a64ebe4 Pull request: all: allow clientid in access settings
Updates #2624.
Updates #3162.

Squashed commit of the following:

commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 29 15:41:33 2021 +0300

    all: imp types, names

commit ebd4ec26636853d0d58c4e331e6a78feede20813
Merge: 239eb721 16e5e09c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 29 15:14:33 2021 +0300

    Merge branch 'master' into 2624-clientid-access

commit 239eb7215abc47e99a0300a0f4cf56002689b1a9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 29 15:13:10 2021 +0300

    all: fix client blocking check

commit e6bece3ea8367b3cbe3d90702a3368c870ad4f13
Merge: 9935f2a3 9d1656b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 29 13:12:28 2021 +0300

    Merge branch 'master' into 2624-clientid-access

commit 9935f2a30bcfae2b853f3ef610c0ab7a56a8f448
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jun 29 11:26:51 2021 +0300

    client: show block button for client id

commit ed786a6a74a081cd89e9d67df3537a4fadd54831
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jun 25 15:56:23 2021 +0300

    client: imp i18n

commit 4fed21c68473ad408960c08a7d87624cabce1911
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jun 25 15:34:09 2021 +0300

    all: imp i18n, docs

commit 55e65c0d6b939560c53dcb834a4557eb3853d194
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jun 25 13:34:01 2021 +0300

    all: fix cache, imp code, docs, tests

commit c1e5a83e76deb44b1f92729bb9ddfcc6a96ac4a8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jun 24 19:27:12 2021 +0300

    all: allow clientid in access settings
2021-06-29 15:53:28 +03:00
Eugene Burkov
16e5e09c2e Pull request: 3013 querylog idna
Merge in DNS/adguard-home from 3013-idna to master

Closes #3013.

Squashed commit of the following:

commit 567d4c3beef3cf3ee995ad9d8c3aba6616c74c6c
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jun 29 13:11:10 2021 +0300

    client: mv punycode label

commit 6585dcaece9f590d7f02afb5aa25953ab0c2555b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jun 29 12:32:40 2021 +0300

    client: handle unicode name

commit c0f61bfbb9bdf919be7b07c112c4b7a52f3ad6a1
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 20:00:57 2021 +0300

    all: imp log of changes

commit 41388abc8770ce164bcba327fcf0013133b5e6f7
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 19:52:23 2021 +0300

    scripts: imp hooks

commit 9c4ba933fbd9340e1de061d4f451218238650c0f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 19:47:27 2021 +0300

    all: imp code, docs

commit 61bd6d6f926480cb8c2f9bd3cd2b61e1532f71cf
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 16:09:25 2021 +0300

    querylog: add ascii hostname, convert to unicode
2021-06-29 13:36:52 +03:00
Ainar Garipov
5104b79cf6 Pull request: client: add reset leases btn
Updates #1691.

Squashed commit of the following:

commit 2c48fb956aba28eae47071c9f7f4d579dde12955
Merge: 38f5191b 7547d3a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jun 17 14:28:23 2021 +0300

    Merge branch 'master' into 1691-dhcp-reset-form

commit 38f5191bcd62eb53e4663fccdfc2a60247881931
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Jun 17 13:14:59 2021 +0300

    client: handle dhcp leases reset

commit a97df17028ca640fd32b4d9762aa54fb381df7e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 16 17:12:10 2021 +0300

    client: add reset leases btn
2021-06-17 14:32:33 +03:00
Ainar Garipov
ce36c955df Pull request: client: upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit bf45adb09443576d3fb577e1f723985e073cc312
Merge: 015ce9cf 6e9a90b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 16 13:38:25 2021 +0300

    Merge branch 'master' into upd-i18n

commit 015ce9cff63ff4987af955c38732b1da3a8ccffb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 16 13:20:38 2021 +0300

    client: upd i18n more

commit 83badda5a1e72798c4791a3c9081258a841f4a91
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 15 21:24:58 2021 +0300

    client: upd i18n
2021-06-16 13:43:43 +03:00
Ainar Garipov
f6516cb8f9 Pull request: client: imp en i18n
Merge in DNS/adguard-home from imp-en-i18n to master

Squashed commit of the following:

commit 67f8e438141e7b4ff5b71b73fb8e224ac702b702
Merge: 443b7493 3f1fd56b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 2 14:26:39 2021 +0300

    Merge branch 'master' into imp-en-i18n

commit 443b7493eff62c3dbf29ec01fbd1824cdf9f5dfc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 2 13:56:43 2021 +0300

    client: fix accidental removal

commit d8bb7ba3e455eea70c6445e08131a9b3902c4638
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 1 19:21:24 2021 +0300

    client: imp en i18n
2021-06-02 14:31:19 +03:00
Ainar Garipov
3fb32881fb Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit e7c546c62f4e765a633ed345e57d9ff0a308f904
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 1 14:54:34 2021 +0300

    client: upd i18n
2021-06-01 15:14:17 +03:00
Eugene Burkov
1e55db408f Pull request: 3136 show default resolvers
Merge in DNS/adguard-home from 3136-show-default to master

Closes #3136.

Squashed commit of the following:

commit add09a772dddcccd404056e7649c2d3350a79fec
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jun 1 11:11:24 2021 +0300

    openapi: fix typo

commit 69e402c49318d53a0d03b81207644d9fb04a139a
Merge: 76e8492c e17e1f20
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jun 1 11:09:51 2021 +0300

    Merge branch 'master' into 3136-show-default

commit 76e8492c8da679e204ceb7a77f1c6f73a2488040
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jun 1 10:55:09 2021 +0300

    client: check upstreams

commit 05fe6ea196a1ed9386eec25dbfbe22779fe7bcfd
Author: Vlad <v.abdulmyanov@adguard.com>
Date:   Mon May 31 19:23:35 2021 +0300

    add defaul resolvers line

commit 8d63c7df9947c9588478d1173834b42569fd8951
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon May 31 11:56:08 2021 +0300

    all: imp changelog

commit e3912e3b20eca9dcf90ddddaa5edb54d1e0cfe6e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri May 28 20:23:05 2021 +0300

    all: add local ptr resolvers addresses output
2021-06-01 14:28:34 +03:00
Ainar Garipov
7a48e92e4d Pull request: client: fix, upd i18n
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit d4357830bec6f1c4882d9b65d2926a9074d67d45
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 26 18:45:22 2021 +0300

    client: fix more

commit 04e57baf7fd692923f7ec04f708c4011aef009c0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed May 26 18:29:39 2021 +0300

    client: fix, upd i18n
2021-05-26 19:41:48 +03:00
Eugene Burkov
557bbcbf37 Pull request: 3184 disable private ptr
Merge in DNS/adguard-home from 3184-disable-ptr to master

Updates #3184.

Squashed commit of the following:

commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed May 26 17:20:34 2021 +0300

    all: rename dns config field

commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed May 26 15:55:44 2021 +0300

    client: handle local ips rdns

commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed May 26 14:43:13 2021 +0300

    all: imp naming

commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed May 26 14:24:38 2021 +0300

    all: imp docs, code

commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed May 26 13:23:56 2021 +0300

    all: imp docs & log changes

commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed May 26 12:49:44 2021 +0300

    all: add the field into structs

commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue May 25 15:10:31 2021 +0300

    dnsforward: entitle lock, imp code
2021-05-26 17:55:19 +03:00
Ainar Garipov
42ec9cae76 Pull request: client: imp en locale
Merge in DNS/adguard-home from imp-i18n-en to master

Squashed commit of the following:

commit 7d0f46dc0a9b28e709ac9ad1748b17ae9ad4a520
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 13 16:04:22 2021 +0300

    client: imp en locale
2021-05-21 16:04:38 +03:00
Ainar Garipov
120ba96727 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 2a3ae4ce7748954ad957fb22b30eacc2b5cc7b6c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon May 17 13:26:38 2021 +0300

    client: upd i18n
2021-05-17 13:45:42 +03:00
Ainar Garipov
ba63a3300d Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit aae8dd9bd79bdd52d754a2dfd3e725088d34cf33
Merge: 7708a7cb 460aa1a5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 6 16:41:43 2021 +0300

    Merge branch 'master' into 2643-upd-i18n

commit 7708a7cb26a1e70dc920c2e5513e6652e67f77d0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 6 15:46:22 2021 +0300

    client: upd i18n
2021-05-06 17:00:57 +03:00
Ainar Garipov
b01d6a4c86 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 3ffa1870d67de835aa8b473490cbdd482d538ac0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 30 13:31:27 2021 +0300

    client: upd i18n
2021-04-30 13:47:09 +03:00
Ainar Garipov
59f48d7929 Pull request: client: imp private dns resolver docs
Updates #3028.

Squashed commit of the following:

commit a44f1b76a2d659a96b485906c933b239f6d109d9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 29 17:36:20 2021 +0300

    client: imp private dns resolver docs
2021-04-29 18:15:43 +03:00
Ainar Garipov
bc33868676 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 7b221535d6a403e5194aaa270790fa6b4a1404c8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 28 15:50:03 2021 +0300

    client: upd i18n
2021-04-28 16:14:04 +03:00
Ainar Garipov
c9a5a5b9c8 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 63048521bf6df01d1b247a3b1b8b1baf05320720
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 16:38:23 2021 +0300

    client: upd i18n
2021-04-21 16:48:03 +03:00
Ainar Garipov
cd9eb3b3e4 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit b5cb0e164845fafe21964c91d14b804ec0b48606
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 19 16:21:14 2021 +0300

    client: upd i18n

commit 13ee98d64a4bd1953ea71cd51a15f5dc7cf4cf9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 19 16:11:58 2021 +0300

    client: upd i18n
2021-04-19 16:35:01 +03:00
Ainar Garipov
0bcea34767 Pull request: client: imp setup guide
Merge in DNS/adguard-home from imp-setup-guide to master

Squashed commit of the following:

commit 06c92e34293849bb3c0c2195b69ea7e0aa366f17
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 15 14:54:40 2021 +0300

    client: imp setup guide
2021-04-15 15:43:04 +03:00
Ainar Garipov
7be2fc37e6 Pull request: client: imp i18n
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 9befed3c5b1d113972df9fbcc3245b7be1a0eaf5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 18:53:29 2021 +0300

    client: imp en

commit c543428e6302620577ac699701d23967b9b1909d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 18:49:26 2021 +0300

    client: imp i18n
2021-04-14 19:00:29 +03:00
Ainar Garipov
b3f6592a5f Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit b264cd4e3de284cc1ed70f07797b4f4510f28018
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 14:51:38 2021 +0300

    client: imp ja

commit cdda71a28e75e5494a9d903001d8f48be109010f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 14:12:14 2021 +0300

    client: upd i18n
2021-04-14 14:56:38 +03:00
Ainar Garipov
39b9807f19 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit d923a934d9bca757f5abd26abc616197e5f1fec9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 19:10:08 2021 +0300

    client: upd ru

commit 114483ee80a0c850a0c25ce9c419e5d1f69d2fec
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 18:43:03 2021 +0300

    client: imp en

commit 1e57298d66d67ab4a2cbb1c3045094eefb05d667
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:46:07 2021 +0300

    client: fix ru

commit 5baca6561d844fe257ff6f3a70d64c9a7dc2273f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:39:51 2021 +0300

    client: upd i18n
2021-04-13 19:36:55 +03:00
Ainar Garipov
327e76cd65 Pull request: 2842 DHCP validation ui
Closes #2842.

Squashed commit of the following:

commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8
Merge: a5d7187b ab85ad5a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:29:06 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit a5d7187bba1ae3595bbc26a362ff27aae81a7048
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 15:08:28 2021 +0300

    fix: revert deleted translation

commit 50169266111032f6de3bc159ba562ee9580532fb
Merge: 46adf2c0 48d702f7
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 14:39:40 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit 46adf2c05b6bedd55e60475eac060347db6572b7
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 14:13:12 2021 +0300

    fix: no-bitwise

commit 1afc4030a5ea885545e51748976724959f87fb26
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 13:57:43 2021 +0300

    fix: IPv4 in CIDR validation

commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 11:58:03 2021 +0300

    fix: translations

commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 11:57:27 2021 +0300

    fix: MAC validation

commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c
Merge: 48b50ce9 65553a29
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 18:12:06 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Apr 5 19:04:35 2021 +0300

    Add leases ip validation

commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Apr 5 13:59:16 2021 +0300

    Add helper for subnet to bitmap mask conversion, write test

commit 80dc7a8d19b27cecc50e2c610619574374f363d3
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Fri Apr 2 17:46:27 2021 +0300

    2842 Update DHCP range validation in UI
2021-04-13 15:29:28 +03:00
Ainar Garipov
21e2c419b9 Pull request: client: imp letter case consistency
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 209c0aa8ebaea976558012707154c27813b40fa6
Merge: 758aa913 6410feeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:16:41 2021 +0300

    Merge branch 'master' into imp-i18n

commit 758aa913f5c1916c40c58ad5e511e0e3b8d57951
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 20:38:25 2021 +0300

    client: imp letter case consistency
2021-04-13 13:39:45 +03:00
Ainar Garipov
fb72d543a3 Pull request: client: imp en locale
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 637cff971fe0823f46ea070f3868d0823bed66a3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 13:43:17 2021 +0300

    client: imp en locale
2021-04-12 14:03:28 +03:00
Eugene Burkov
80ed8be145 Pull request: 2704 local addresses vol.3
Merge in DNS/adguard-home from 2704-local-addresses-vol.3 to master

Updates #2704.
Updates #2829.
Updates #2928.

Squashed commit of the following:

commit 8c42355c0093a3ac6951f79a5211e7891800f93a
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 7 18:07:41 2021 +0300

    dnsforward: rm errors pkg

commit 7594a21a620239951039454dd5686a872e6f41a8
Merge: 830b0834 908452f8
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 7 18:00:03 2021 +0300

    Merge branch 'master' into 2704-local-addresses-vol.3

commit 830b0834090510096061fed20b600195ab3773b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 7 17:47:51 2021 +0300

    dnsforward: reduce local upstream timeout

commit 493e81d9e8bacdc690f88af29a38d211b9733c7e
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 19:11:00 2021 +0300

    client: private_upstream test

commit a0194ac28f15114578359b8c2460cd9af621e912
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 18:36:23 2021 +0300

    all: expand api, fix conflicts

commit 0f4e06836fed958391aa597c8b02453564980ca3
Merge: 89cf93ad 8746005d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 18:35:04 2021 +0300

    Merge branch 'master' into 2704-local-addresses-vol.3

commit 89cf93ad4f26c2bf4f1b18ecaa4d3a1e169f9b06
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 18:02:40 2021 +0300

    client: add local ptr upstreams to upstream test

commit e6dd869dddd4888474d625cbb005bad6390e4760
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 15:24:22 2021 +0300

    client: add private DNS form

commit b858057b9a957a416117f22b8bd0025f90e8c758
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 13:05:28 2021 +0300

    aghstrings: mk cloning correct

commit 8009ba60a6a7d6ceb7b6483a29f4e68d533af243
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 12:37:46 2021 +0300

    aghstrings: fix lil bug

commit 0dd19f2e7cc7c0de21517c37abd8336a907e1c0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 20:45:01 2021 +0300

    all: log changes

commit eb5558d96fffa6e7bca7e14d3740d26e47382e23
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 20:18:53 2021 +0300

    dnsforward: keep the style

commit d6d5fcbde40a633129c0e04887b81cf0b1ce6875
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 20:02:52 2021 +0300

    dnsforward: disable redundant filtering for local ptr

commit 4f864c32027d10db9bcb4a264d2338df8c20afac
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 17:53:17 2021 +0300

    dnsforward: imp tests

commit 7848e6f2341868f8ba0bb839956a0b7444cf02ca
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 14:52:12 2021 +0300

    all: imp code

commit 19ac30653800eebf8aaee499f65560ae2d458a5a
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Sun Apr 4 16:28:05 2021 +0300

    all: mv more logic to aghstrings

commit fac892ec5f0d2e30d6d64def0609267bbae4a202
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 2 20:23:23 2021 +0300

    dnsforward: use filepath

commit 05a3aeef1181b914788d14c7519287d467ab301f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 2 20:17:54 2021 +0300

    aghstrings: introduce the pkg

commit f24e1b63d6e1bf266a4ed063f46f86d7abf65663
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 2 20:01:23 2021 +0300

    all: imp code

commit 0217a0ebb341f99a90c9b68013bebf6ff73d08ae
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 2 18:04:13 2021 +0300

    openapi: log changes

... and 3 more commits
2021-04-07 20:16:06 +03:00
Ainar Garipov
2e4e2f6270 Pull request: client: imp router instructions
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 2585c9ad41e18a11e8f539e30e8ca35fcd8e1314
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 31 16:29:20 2021 +0300

    client: imp router instructions
2021-03-31 16:54:52 +03:00
Ainar Garipov
a72ce1cfae Pull request: client: imp en locale, grammar
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 49f565db4e7167ed404413b6eaa75b0ab38c79d4
Merge: f60989f0 1d07afb3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 31 13:04:18 2021 +0300

    Merge branch 'master' into imp-i18n

commit f60989f069fd7c52d00e41e4aaad2e824d2d2e2e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 31 13:04:03 2021 +0300

    client: imp wording

commit 6909bb89f7af74c8245ecd81dc255b2890202cca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Mar 30 18:33:42 2021 +0300

    client: imp en locale, grammar
2021-03-31 13:29:29 +03:00
Ainar Garipov
e710ce1100 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 4f6098ce31fb3e9e81d66ca613e02c9573763e13
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 14:01:33 2021 +0300

    client: upd i18n
2021-03-29 15:39:08 +03:00
Ainar Garipov
a818666294 Pull request: client: s/Youtube/YouTube/
Merge in DNS/adguard-home from fix-youtube to master

Squashed commit of the following:

commit ec97400059c1ca9a39eb3622c3665e4c1f619fc7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 15 17:19:07 2021 +0300

    client: s/Youtube/YouTube/
2021-03-15 17:38:30 +03:00
Ainar Garipov
ab81ff03f6 Pull request: all: upd translations
Merge in DNS/adguard-home from upd-locales to master

Updates #2643.

Squashed commit of the following:

commit d7f26aaa63bfc9307887301abfff4779be7eba41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 16:18:54 2021 +0300

    all: upd translations
2021-02-15 15:53:24 +03:00
Ainar Garipov
44168292d5 Pull request: 2662 dnscrypt logs
Merge in DNS/adguard-home from 2662-dnscrypt-logs to master

Closes #2662.

Squashed commit of the following:

commit 05f6742b5c73e1d150834965ae3a54ca06ef8e24
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 12:58:08 2021 +0300

    all: imp docs

commit ee0b8c574c1cb5302a5ffb62d2fec4126509b2e8
Merge: aaa8c6b8 e64df20e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 12:56:44 2021 +0300

    Merge branch 'master' into 2662-dnscrypt-logs

commit aaa8c6b8085679f4acd234527bd03cb0b2520b4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 12:38:49 2021 +0300

    all: document changes

commit 57b6a4d8e95e87d928274d095dc2004f1591d940
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 11 12:36:22 2021 +0300

    all: fix dnscrypt in logs
2021-02-11 13:46:59 +03:00
Ainar Garipov
771a32cc9d Pull request: client: revert 5a1e04c2
Merge in DNS/adguard-home from revert-locales to master

Updates #2643.

Squashed commit of the following:

commit 7fb729edbeee681bdcdd0a295e530bc6f776cbac
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 10 14:41:52 2021 +0300

    all: reupd locales

commit 28416bee63f5b318ad8c8fcfb86f531893b077d1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 10 14:33:41 2021 +0300

    scripts: imp translations downloading

commit d8c2bfe08d7f50597dedcb5b73059d16f329b71a
Merge: 00b19782 9df09357
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 10 14:33:10 2021 +0300

    Merge branch 'master' into revert-locales

commit 00b19782e2d3311ac4cc1c4b79a886fdf0d386b9
Merge: 5e3d2b74 64715045
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 9 16:52:56 2021 +0300

    Merge branch 'master' into revert-locales

commit 5e3d2b74ca57637d6625a21fde1ffbdb28cc8b18
Merge: f34e2fe9 63e4adc0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 9 13:17:30 2021 +0300

    Merge branch 'master' into revert-locales

commit f34e2fe9248feb9f1087be1b17ce187371896603
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 9 12:47:47 2021 +0300

    client: revert 5a1e04c2
2021-02-10 15:00:39 +03:00