Ainar Garipov
10bffd89c9
Pull request 1801: upd-go
...
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n
2023-04-05 16:12:09 +03:00
Ainar Garipov
91ecbede7d
Pull request 1799: AG-21072-stats-conf-race
...
Merge in DNS/adguard-home from AG-21072-stats-conf-race to master
Squashed commit of the following:
commit 26843b70ab8bfe0fa110c4156f2fd3f53ec5ee74
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 4 20:30:22 2023 +0300
all: imp docs, locks
commit 942a5baa9606376dd06a3ef3284c17133014f768
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 4 19:15:18 2023 +0300
stats: fix conf races
2023-04-05 15:50:14 +03:00
Ainar Garipov
27dbb427a1
Pull request 1798: 4262-ipv6-pref
...
Updates #4262 .
Squashed commit of the following:
commit de64f9c40c00317dbb5dbdda900d9b4c574a0a32
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 19:23:15 2023 +0300
all: add ipv6 boostrap pref
2023-04-04 13:28:21 +03:00
Stanislav Chzhen
195300f56e
Pull request 1778: AG-20200-translation-script-update-auto
...
Merge in DNS/adguard-home from AG-20200-translation-script-update-auto to master
Squashed commit of the following:
commit 22c68f8443c59a5ba7ff7cd33c395f6dcf321e04
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 18:08:40 2023 +0300
scripts: imp err more
commit a6ea94b75c4bb09868f45f5c61d62622acf36d0c
Merge: 69749b17 2a0d0629
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 17:38:05 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 69749b1767bd49d27c96ac17ef049f6ff6827f86
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 17:37:27 2023 +0300
scripts: imp err
commit 6d3eb3270e6fcbe94e9c8f73d654b65a15abcb37
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 13:10:08 2023 +0300
scripts: imp err msg
commit a95e3383f1c27b73eaa570dbe8e008c2bdf22be5
Merge: 16caba76 3575aa05
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 12:06:28 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 16caba76f0a16d70542f6fa0d6d83b134c630da4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 12:05:49 2023 +0300
scripts: fix err
commit 3566193a7db677420722938c98089a40809c8739
Merge: 55efdeb8 da9008ab
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 30 13:13:54 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 55efdeb80b44183767b188109f1e21aac2fa9839
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 30 13:13:05 2023 +0300
scripts: simplify
commit 4a090a6f015e4adb9d5a3f6e3c3c5294daf67f1d
Merge: 571b2a29 c576d505
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 29 14:10:06 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 571b2a29777e694971cc02c895328d733b411803
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 29 14:09:17 2023 +0300
scripts: fix log msg
commit 6e92a76c4b9b1240501612878d5f42b3058cba32
Merge: 207c8bac 487675b9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 18:01:58 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 207c8bacd4818c496b409cee96a4b6f65fbf8c24
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 18:01:23 2023 +0300
scripts: add verbose flag
commit e82270f53ce5cf8b1fdb39bff6367fd800483abb
Merge: 11761bdc 132ec556
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 15:09:21 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 11761bdc3d9fd10221d0c21d993db0983d9e222f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 15:08:39 2023 +0300
scripts: upd readme
commit cdac6cf37022e67d4a45be587210765294e96270
Merge: 5f824358 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:28:37 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 5f82435847d74bf12a7b450b70d9326a57c99da6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:27:01 2023 +0300
scripts: add locale update auto
2023-04-03 18:22:15 +03:00
Ainar Garipov
2a0d062947
Pull request 1797: AG-21072-querylog-conf-race
...
Merge in DNS/adguard-home from AG-21072-querylog-conf-race to master
Squashed commit of the following:
commit fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races
2023-04-03 16:29:07 +03:00
Ainar Garipov
3575aa0570
Pull request 1796: 5661-opt-more-lock
...
Updates #5661 .
Squashed commit of the following:
commit 0a1425df0ea1278c73ac88cbee053897d3daaf1b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 18:31:19 2023 +0300
querylog: opt locks more
2023-03-31 18:44:51 +03:00
Eugene Burkov
f191cb07a5
Pull request 1794: 3290-kill-zombies
...
Merge in DNS/adguard-home from 3290-kill-zombies to master
Updates #3290 .
Squashed commit of the following:
commit 3e0626024243e48e253451a322961e1011976ce3
Merge: 5aa7aa4e 1731ce9c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 31 20:04:04 2023 +0500
Merge branch 'master' into 3290-kill-zombies
commit 5aa7aa4e17c76d1226ba1d44639c67e12454e4e7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 31 16:38:00 2023 +0500
docker: add doc
commit 52a0b671c3f229250988ecd32c0bf909b50fc59b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 31 14:41:41 2023 +0500
docker: add init emulator
2023-03-31 18:07:00 +03:00
Ainar Garipov
1731ce9c63
Pull request 1795: 5661-imp-querylog-logging
...
Updates #5661 .
Squashed commit of the following:
commit 3fac63fb4ac906e61f6bb2d2af5408771d93a206
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 17:24:00 2023 +0300
querylog: imp locks even more
commit bf14ab9a5ea1be83ac156dc5f3d7f3717d50767b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 17:09:25 2023 +0300
querylog: imp locks more
commit 40e885f39b4c38dcd387d4799529b0fa150ed520
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 16:26:15 2023 +0300
querylog: imp locks, logs
2023-03-31 17:39:04 +03:00
Ainar Garipov
2eb3bf6ea5
Pull request 1793: upd-all
...
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 19535409f54360618e1239bddd7ce495d19e0ca4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 30 16:06:49 2023 +0300
all: upd deps, i18n, filters, services, tools
2023-03-30 16:13:19 +03:00
Ainar Garipov
a0349b6c7e
Pull request 1792: 5633-invalid-date
...
Updates #5633 .
Squashed commit of the following:
commit 889bc7acb82472d72d7b3103554e70342513a567
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 30 14:31:42 2023 +0300
client: fix dashboard date
2023-03-30 14:37:05 +03:00
Eugene Burkov
da9008aba3
Pull request 1790: 5624-fix-filter-add
...
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624 .
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly
2023-03-29 19:09:54 +03:00
Stanislav Chzhen
c576d5059e
Pull request 1789: AG-20200-translation-script-fix-upload
...
Merge in DNS/adguard-home from AG-20200-translation-script-fix-upload to master
Squashed commit of the following:
commit 4d898926828dc438c29b0ae7cbad70d8dea0b8de
Merge: 41ad204b 487675b9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 13:30:36 2023 +0300
Merge branch 'master' into AG-20200-translation-script-fix-upload
commit 41ad204bc3ce52ecc61e95261b9519cfc0af9abe
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 13:29:26 2023 +0300
scripts: imp more
commit 5ea4821ee49638ad9011809faba0316a753a078b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 12:38:22 2023 +0300
scripts: imp code
commit 253a72fd0e195c7603883322885b7206ed434918
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 12:04:16 2023 +0300
scripts: add docs
commit bfd70e338c78fd5b0292480d7f54f396593e98ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 10:56:05 2023 +0300
scripts: imp more
commit 547b82785f210cc137903cb5b7e2ee41b2a20e59
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 10:08:16 2023 +0300
scripts: imp code
commit a788e5ef8a3aa2633cc9fb64c83534f1d4080ef7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 20:14:55 2023 +0300
scripts: add multipart
commit 39d352edf85288a51931dea5b758bc74dd08e19d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 18:35:08 2023 +0300
scripts: fix more
commit bcbf155135c53789cc5c6c2c7c8b57dd471e4ea2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 17:47:40 2023 +0300
scripts: fix upload
2023-03-28 18:02:32 +03:00
Ainar Garipov
487675b9ad
Pull request 1786: rm-context-fields
...
Merge in DNS/adguard-home from rm-context-fields to master
Squashed commit of the following:
commit 402bbba6a68f163cd6a3751a50ecd544eebc875f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:07:11 2023 +0300
aghnet: names
commit 209a2bb7878ee9110595f1fcf09df7f83777b80f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:03:33 2023 +0300
home: typo
commit 61684815c260d5d7a34be612e06714456399a833
Merge: 7adfcf15 132ec556
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:02:18 2023 +0300
Merge branch 'master' into rm-context-fields
commit 7adfcf1576b52f80137aa9044355bfbec6243e28
Merge: 0d5b85f5 0df32601
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 14:25:27 2023 +0300
Merge branch 'master' into rm-context-fields
commit 0d5b85f51b3eb72c3e905d5ad82c17cd932b246b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 13:21:26 2023 +0300
all: rm unnecessary home context fields
2023-03-28 13:27:46 +03:00
Eugene Burkov
132ec556dc
Pull request 1788: 5642-fix-healthcheck-ssl
...
Merge in DNS/adguard-home from 5642-fix-healthcheck-ssl to master
Updates #5642 .
Updates #3290 .
Squashed commit of the following:
commit c457ecbc08f58bb4f31bade314dd447832c5bfed
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 27 15:35:32 2023 +0500
docker: imp docs
commit fddabb95118a85921bf4f50e9b91f4602ba02b0f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 27 15:18:22 2023 +0500
docker: skip ssl check
2023-03-27 13:43:38 +03:00
Eugene Burkov
d58772f177
Pull request 1779: 3290-docker-healthcheck
...
Merge in DNS/adguard-home from 3290-docker-healthcheck to master
Updates #3290 .
Squashed commit of the following:
commit 3ac8f26c1c22855d973910fd13c096776aa8dfa6
Merge: bc17565f 0df32601
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 27 01:09:03 2023 +0500
Merge branch 'master' into 3290-docker-healthcheck
commit bc17565fcb5acba68129734450fb08b4fe341771
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 18:04:08 2023 +0500
all: fix script
commit e150fee8025dacdc5aa1d12916d1f42e89216156
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 17:18:12 2023 +0500
all: imp naming
commit 26b6448d10af39f8363eadd962af228a9d4ae51d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 03:13:47 2023 +0500
all: support https web
commit b5c09ce8b2ac52d6e47a00f76125bee229f616a0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sat Mar 25 20:03:45 2023 +0500
all: imp scripts fmt, naming
commit 8c3798c46974e48cc0c379c2ecc46a6d8d54164b
Merge: e33b0c5c fb7b8bba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sat Mar 25 00:25:38 2023 +0500
Merge branch 'master' into 3290-docker-healthcheck
commit e33b0c5cbfe5a28b29734c9ceee046b0f82a0efe
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:47:26 2023 +0500
all: fix docs
commit 57bfd898b9c468b2b72eba06294ed5e5e0226c20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:44:40 2023 +0500
dnsforward: add special-use domain handling
commit f04ae13f441a25d0b4dc1359b328552f7507fc23
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:05:10 2023 +0500
all: imp code
commit 32f150f88390320d2da85b54e27f6c751eccb851
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 04:19:10 2023 +0500
all: mv Dockerfile, log changes
commit a094a44ccfa26988f0e71f19288e08b26e255e2b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 04:04:27 2023 +0500
all: finish scripts, imp names
commit 4db0d0e7cb7ed69030994bc1b579534dd2c3395d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 23 18:33:47 2023 +0500
docker: add script and awk program
2023-03-26 23:12:24 +03:00
Ainar Garipov
0df32601bb
Pull request 1787: 5639-querylog-filter-fix
...
Fixes #5639 .
Squashed commit of the following:
commit 1aa02c8fa2b858f9c9a41c5dd6746d4d2e3de654
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 13:39:29 2023 +0300
querylog: fix filtered log filter
2023-03-26 14:19:19 +03:00
Eugene Burkov
fb7b8bba6a
Pull request 1784: 5631-lookup-panic
...
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631 .
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy
2023-03-24 18:47:53 +03:00
Ildar Kamalov
d859a33787
Pull request: add UI theme controls
...
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls
2023-03-24 17:28:31 +03:00
Stanislav Chzhen
67c9abe119
Pull request 1782: 5630-fix-interval
...
Merge in DNS/adguard-home from 5630-fix-interval to master
Updates #5630 .
Squashed commit of the following:
commit eb3839bb63cde40c477843cad1262c8eaa95406a
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 16:25:23 2023 +0300
fix lint
commit 1899810ba8e3d2496f35bb052aeda60da565ffa3
Merge: 52526687 2409282d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 16:01:50 2023 +0300
Merge branch 'master' into 5630-fix-interval
commit 52526687e651254a81da091106d88b50b656af2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 15:26:01 2023 +0300
convert milliseconds to days for stats interval
commit e719814e84bf0ddaec8f4d47a94cc2b5075a7dc5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 24 14:05:55 2023 +0300
openapi: fix description
2023-03-24 16:49:02 +03:00
Ainar Garipov
2409282d51
Pull request 1783: fix-openapi-chlog
...
Merge in DNS/adguard-home from fix-openapi-chlog to master
Squashed commit of the following:
commit cc8a7526a230edffd0eb86a5a69c565c221996f1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 15:19:57 2023 +0300
openapi: fix chlog
2023-03-24 15:25:16 +03:00
Dimitry Kolyshev
9c48e96939
Pull request: 1333-protection-pause vol.1
...
Merge in DNS/adguard-home from 1333-protection-pause-1 to master
Squashed commit of the following:
commit 5ff98385bc5ff66e214d80782eb4dc41e344aa38
Merge: 97f94a54 0bc3ef89
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 24 19:08:21 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
commit 97f94a5498ac221f88f2f7dfef4b255f4945329e
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Fri Mar 24 13:03:20 2023 +0200
Fix protection timer bugs
commit 1cc61af1996bd803f3fa638cb9e2388470072bf0
Merge: 5a144ea3 235ce458
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 22:27:47 2023 +0700
Merge remote-tracking branch 'origin/1333-protection-pause-1' into 1333-protection-pause-1
commit 5a144ea3a48c3d0d5e57dd14232ab7a8e77a8c1e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 22:25:08 2023 +0700
dnsforward: imp code
commit 235ce458a62b3152f36e32580ed0226a56580ec6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 23 17:35:06 2023 +0300
dnsforward: imp locks
commit 0ea3a0a176b810a2b3f0b307aa406fe1670c9219
Merge: 52f66810 df61741f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 19:30:41 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# openapi/CHANGELOG.md
commit 52f668109673286a50909c042e6352cd803e8eed
Merge: 9a7eb7b3 306c1983
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 11:23:50 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# internal/dnsforward/http.go
commit 9a7eb7b3ab2b5f6ad321aa3245d33839c3aa6fbd
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Wed Mar 22 06:56:55 2023 +0200
Review fix
commit 5612d51252ba91842bd6811baec1c91136bb3bf2
Merge: c0a918a5 c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Mar 21 22:00:39 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# client/src/__locales/en.json
commit c0a918a518ad9b37041aed159d215516258bc987
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Mar 21 12:13:18 2023 +0200
Review fix
commit 34faa61cc1e6210a612e7a2f4895a1504df37680
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Mar 21 10:43:37 2023 +0200
Fix props to new api
commit 158e582373863495f0e0ca177d7b365cc66ad671
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Mon Mar 20 18:44:34 2023 +0200
Review fix
commit 9e8b8c3778b8e1dfad0d39e44f70886dfd3aeb9a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:31:28 2023 +0700
all: docs
commit 761a203f53b535ca235cfe62f289bd0e02b90be2
Merge: d0b07231 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:26:13 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
commit d0b07231b6f29b534930f1fcfc82b4934c295ff8
Merge: ea448760 a2053526
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 13:00:52 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# client/src/components/App/index.css
# internal/dnsforward/config.go
commit ea4487608a9c81d25f155ff63fee7c9dcf21f448
Merge: dfd0f33f a556ce8f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Feb 21 11:54:27 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
commit dfd0f33fb474d497cbc9237ee466276728eea397
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Feb 21 11:51:40 2023 +0700
all: docs
commit d36df96fba8c6d923faef85c198b6bd0743b7ee8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Feb 20 12:41:49 2023 +0700
all: safesearch
commit 60f2ceec563221337f34bb60baa96aa2b2429c40
Merge: 7c514427 6f6ced33
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Feb 20 12:30:42 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
commit 7c514427e77c5b09d8e148c78220a71046e68cd1
Merge: 0fa4ff99 4d295a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Feb 16 11:55:21 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
... and 26 more commits
2023-03-24 15:11:47 +03:00
Ainar Garipov
0bc3ef89ea
Pull request 1781: 5627-fix-migration
...
Updates #5627 .
Squashed commit of the following:
commit 018ead11959efeaace5312b5990ad82b6fa1f72d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 12:48:25 2023 +0300
home: fix more
commit 4bc57a07412bfb7fb7e6c88c14037c567c94d373
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 12:32:57 2023 +0300
home: fix statistics migration
2023-03-24 13:17:57 +03:00
Ainar Garipov
8de994d077
Pull request 1774: 5615-rm-raw
...
Updates #5615 .
* commit '59a8265e31f802009f4ac6893ccec839cc5a2fb0':
all: fmt go.mod
Remove direct dep on mdlayher/raw package
2023-03-23 17:44:41 +03:00
Ainar Garipov
59a8265e31
Merge branch 'master' into 5615-rm-raw
2023-03-23 17:39:03 +03:00
Stanislav Chzhen
bea39934bd
Pull request 1771: AG-20352-dhcpd-lease-netip-addr
...
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd
Merge: 0020006e
306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af
Merge: c82b18f1
48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f140
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e5181200
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a
Merge: c68e85c4
9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c409
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr
2023-03-23 16:52:01 +03:00
Dimitry Kolyshev
df61741f60
Pull request: 1163 safesearch http api vol.3
...
Merge in DNS/adguard-home from 1163-safesearch-1-3 to master
Squashed commit of the following:
commit f26c5fb4f7a27dc61b10c28d6672d5307796784c
Merge: e7a1b885
143616ca
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 18:45:25 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
# Conflicts:
# CHANGELOG.md
commit e7a1b885d6
Merge: 01b73d76
eb5d8a49
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:55:23 2023 +0200
Merge branch '1163-safesearch-1-3' of ssh://bit.adguard.com:7999/dns/adguard-home into 1163-safesearch-1-3
commit 01b73d763c
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:52:02 2023 +0200
client: add safe search extended settings to clients
commit eb5d8a499a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 18:50:23 2023 +0700
all: docs
commit 2043a8fba7f664ef365ccc5abac14a85035eb4b7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:50 2023 +0700
all: docs
commit bb1d2f6c0252891ccac3d3727eb23288a24d4bda
Merge: 95f9fd3d c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:00 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 95f9fd3dd1e8abcdf1a156e81aff8e52f320f4c3
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 15:25:39 2023 +0200
client: move to new safe search api
commit ac823a911f0d6ab6f1813d11a0ca082d54cc9131
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:40:29 2023 +0700
all: docs
commit aaa287b125c7c7a775b821e0dd272199229a7538
Merge: 16fa7031 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:14 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 16fa7031ab2aec31139ace54ffa0155cde8e9135
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:03 2023 +0700
all: docs
commit 498f7d3cbb842eda218b0fd06fc3bb3601b81f80
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:59:47 2023 +0700
filtering: imp code
commit aab7b70e2355ba86577e5156c1d5569b21b4b358
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:40:18 2023 +0700
filtering: imp code
commit d2870a18ffdb1d293993487073912168d6b75a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 21:57:58 2023 +0700
filtering: imp code
commit 868f5d1ed29c3af702114079e7ffe46e136eb901
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:06:36 2023 +0700
all: imp docs
commit f6d70b06ed873684501ce17f647ccf07a85dd50b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:05:40 2023 +0700
filtering: imp code
commit 7cd9a37dde6262a8cf4f0f13f9946e011cc0e2cf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 14:56:51 2023 +0700
home: imp code
commit 84d8817512e47a517ed2880ffa9dde5ffda1d288
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 09:39:41 2023 +0700
all: safesearch http api
2023-03-23 15:25:58 +03:00
Stanislav Chzhen
143616ca6e
Pull request 1736: 4299-querylog-stats-api
...
Merge in DNS/adguard-home from 4299-querylog-stats-api to master
Updates #1717 .
Updates #4299 .
Squashed commit of the following:
commit 5b706b7997
Merge: 48b62b0f
306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 13:53:09 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 48b62b0f18
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 12:25:04 2023 +0200
client: fix styles, add titles and descrs
commit 97e31cff70
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 18:38:12 2023 +0200
client: add ignored domains for querylog
commit 24d75c4376
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 18:21:13 2023 +0200
client: add ignore domains for stats
commit eefc3891d0
Merge: 978675ea
1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 10:53:35 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 978675ea2c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 10:53:11 2023 +0300
openapi: fix chlog
commit 2ed33007aa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:49:07 2023 +0300
home: fix tests
commit 6af11520c1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:40:16 2023 +0300
home: fix typo
commit 56acdfde5b
Merge: 319da34d
48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:32:58 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 319da34de4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 17:34:38 2023 +0300
querylog: fix docs
commit d5a8f24d5b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 11:42:00 2023 +0300
stats: fix docs
commit e0cbfc1c40
Merge: 4743c810
012e5beb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 18:45:17 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 4743c81038
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 18:14:16 2023 +0300
all: imp code; fix time conversion
commit 34310cffd7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:34:11 2023 +0300
chlog: restore order
commit cadd864a66
Merge: 2f3e25be
bb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:26:06 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 2f3e25bee5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:25:14 2023 +0300
all: fix fmt
commit d54022baa6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 28 16:16:40 2023 +0300
all: imp code; fix chlog
commit df22de91f5
Merge: e1ea4797
a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:24:09 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit e1ea4797af
Merge: d7db0a5a
bb80a7c2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:23:20 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit d7db0a5af1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:12:20 2023 +0300
all: imp docs
... and 15 more commits
2023-03-23 13:46:57 +03:00
Stanislav Chzhen
306c1983a2
Pull request 1758: 1472-edns-custom-ip-api
...
Merge in DNS/adguard-home from 1472-edns-custom-ip-api to master
Updates #1472
Squashed commit of the following:
commit 7605ec5bd5467ddd28a650385193eb2332653bb6
Merge: 8b2ac227 194ead34
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 13:39:25 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 8b2ac22793a51d2555d32c1f5b5c118118807d1f
Merge: d5ca8b6e c3edab43
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 18:26:55 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit d5ca8b6e1d87480d4ee4afd346e6bf04907fca95
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 18:26:24 2023 +0300
dnsforward: imp tests
commit 1302586d22812c22755ea1c7e7fcd32330d707c5
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 16:47:56 2023 +0200
client: change validation for custom edns ip
commit 44e4dc6d1e47de6597ed9ee328db9639e38b4868
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 16:31:42 2023 +0200
client: implement edns custom ip
commit 8a3e7ad8ebf16262818821340da23baa5f004bff
Merge: 04ac1112 f736d85e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 15:04:40 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 04ac1112dda2e778243555b2f54819e5ba586e05
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 15:03:39 2023 +0300
dnsforward: imp tests
commit b44f6d0ccb3ba7b7a5be07c9cf293dad9c83c794
Merge: 19c6851e 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:55:49 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 19c6851e30f30b0572334822e8639e03760de986
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 10 10:40:15 2023 +0300
all: fix chlog
commit 6dcdcbd666ebf3a56a38251e8ead09c605068ce3
Merge: a7f1bf71 a2053526
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 10 10:23:37 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit a7f1bf715e3557c710b700b9bd923868eb07715b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:24:18 2023 +0300
home: fix default value
commit 0311a9bb6571975963d747ef4ef427b59dca03bc
Merge: 7e0bb3df 1011b8f9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:04:18 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 7e0bb3df78f10f4b4ae0fd49681d1aa0040521c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:03:24 2023 +0300
all: fix chlog
commit 202d7ccf4721ccf39726da01d237e07317bfaa58
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 11:35:41 2023 +0300
dnsforward: fix typo
commit fe95e003a0c3b316a44b5ec0b848a60ddd4c85cf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 11:28:21 2023 +0300
all: fix docs
commit 66835a9aa22b3015f9238c1d6f5aa9bd6067db8a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 10:48:08 2023 +0300
dnsforward: add todo
commit b58255e1e6660a8229bb9c40f2acddebb3dbdc66
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 6 15:40:02 2023 +0300
all: upd chlog
commit 9b2be7facba30c815144e08a7835353cad14c405
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 11:22:19 2023 +0300
dnsforward: edns custom ip api
2023-03-22 13:42:20 +03:00
Vladislav Abdulmyanov
194ead3479
Pull request 1777: client: include safesearch to count percent
...
Updates #5568 .
Squashed commit of the following:
commit 3d3a8c187b27307b69b160283f3cd6f9c40cc68e
Merge: 7f4b6357 c3edab43
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 11:53:06 2023 +0200
Merge branch 'master' into 5568-save-search-percent
commit 7f4b6357c6f7941eb37175a83972a9821dd08974
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 13:36:14 2023 +0200
client: include safesearch to count percent
2023-03-22 12:55:53 +03:00
Stanislav Chzhen
c3edab4387
Pull request 1763: AG-20200-translation-script
...
Merge in DNS/adguard-home from AG-20200-translation-script to master
Squashed commit of the following:
commit 3113b77c0312219f8134324caa232a53c42a3988
Merge: bbd784ab f736d85e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 17:41:08 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit bbd784ab817955f3342d140644a3199d558c22b8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 13:23:48 2023 +0300
scripts: imp code
commit 7d379ab1fc2ae9858f8e7e3754de9be3d23153b6
Merge: 4f6278ad 1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 12:01:16 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit 4f6278adb28287205a4fc89239e7ba776a15ff7a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 14:27:32 2023 +0300
scripts: imp error handling
commit 64e307a591cfeac1986d477a55bcc714636663bc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 15:41:39 2023 +0300
scripts: imp code
commit fe06df88f2bb3fc0de83f83deea26652485a22d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 15:23:20 2023 +0300
scripts: add docs
commit 15d65a075373586fc31a595d7c831b80752d7cf2
Merge: ddd3cacd 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 13:04:16 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit ddd3cacd507ca861c4d9d5f7600bdcc2c3068315
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 13:03:11 2023 +0300
scripts: imp code
commit 4e8ebdc199f0c0ff4e7c7b8ae71483cca6c4d428
Merge: 73fedefa c6706445
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:25:36 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit 73fedefa4ceaf2273648afe5816f1903d96ba213
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:25:04 2023 +0300
scripts: fix chlog
commit 780b0a257b6b2e684cfe8a49e4c4d22bcd4056ec
Merge: ef70d192 595484e0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 14 14:58:24 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit ef70d192555a9ef2acd6dd1caeb4f05a10a1de63
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 14 14:57:36 2023 +0300
scripts: upd readme
commit e28655826c8c5ce6ddf3cc904201681286a6be87
Merge: cae3b769 a2053526
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 13 14:28:47 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit cae3b769dfa6906653b32104169ae4a08a2c3723
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 13 14:27:29 2023 +0300
scripts: rm translations js
commit 77e2e3480b52a70b8ef9be8f1edf581cca2a1a3a
Merge: 99e2382a c11a52d6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 16:04:06 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit 99e2382a161dee0bff30ae488d8b42565330d82e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 16:03:19 2023 +0300
scripts: add translations go
2023-03-21 17:43:48 +03:00
Vladislav Abdulmyanov
f736d85e6e
Pull request 1776: client: add transform dynamic lease to static
...
Updates #3459 .
Squashed commit of the following:
commit 7a660c689da898c125a268f88378e38a58b457da
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 10:40:25 2023 +0200
consider issues
commit 066bf77ac44fa8602c66aa0ea220b52fca6d1180
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 18:37:14 2023 +0200
client: fix icon
commit 356b4c3895436f165697510bb3b3abf95f18894f
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 18:32:03 2023 +0200
client: add transform dinamic lease to static
2023-03-21 14:42:54 +03:00
Vladislav Abdulmyanov
1daabb97e5
Pull request 1775: 5581-leases-table-mobile
...
Updates #5581 .
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile
2023-03-20 18:51:52 +03:00
Ainar Garipov
dd2095e05d
all: fmt go.mod
2023-03-20 17:58:01 +03:00
Brian Kemper
a0205a54ec
Remove direct dep on mdlayher/raw package
2023-03-19 17:29:04 -06:00
Eugene Burkov
48431f8b86
Pull request #1770 : 5567-extract-subnet-arpa
...
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567 .
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa
2023-03-17 17:10:33 +03:00
Ainar Garipov
9f7a582dbc
Pull request 1772: 5557-dnscrypt-update
...
Updates #5557 .
Squashed commit of the following:
commit ffe63ee9a14755a53e0e0950138a005ff1982ccd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 15 16:32:11 2023 +0300
all: upd dnscrypt
2023-03-15 16:36:48 +03:00
Dimitry Kolyshev
2b5e4850d0
Pull request: 1163 safesearch vol.2
...
Merge in DNS/adguard-home from 1163-safesearch-1-2-1 to master
Squashed commit of the following:
commit d3a5ebef35210019842145074e898129b42f1f2c
Merge: b85264ae c6706445
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 15 09:17:53 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1
# Conflicts:
# CHANGELOG.md
commit b85264aefc5f191ac6cb194b519f03ba15829a4e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Mar 14 00:16:07 2023 +0700
home: imp code
commit ac2ed7a5ce8db40628e7d4d1c8634641e5f38b0b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 23:02:06 2023 +0700
all: changelog
commit f0fccafcb01f50c7051df53bbe9b02cab75aa71e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 22:42:36 2023 +0700
all: changelog
commit 37df29bf6372939644fb28e3d70365496e0cb4f6
Merge: b227b277 595484e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 22:38:57 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1
commit b227b2775b4866d69241ad87acf99700715552cb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 16:56:01 2023 +0700
all: imp docs
commit 6fd39fc3565c3f4bc7a7113d17733c20dfe24d8d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 16:55:03 2023 +0700
home: imp code
commit 3bb3bb7c7dcf97b2a5602a7d2b6770c08b4d863d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 12:16:53 2023 +0700
home: imp docs
commit 5f573a56a9fd9942ad677fa0fae6b24228dab653
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 11:56:47 2023 +0700
home: imp code
commit 23eeb5552cf2510596b2311cc3eda53ac678ffcc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 10 10:57:33 2023 +0700
home: imp code
commit 643de2fca1b5917c61fe83e1e472222404f3cd21
Merge: dada6e63 a2053526
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 21:03:08 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1
commit dada6e63ca5324d30775e2da1727da891743f654
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 17:09:03 2023 +0700
all: imp docs
commit 81a180d99dd9a995440d5f4e2ebca34678e7d0c7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 15:12:43 2023 +0700
all: imp code
commit fa84877bc777004d246d71d0a9ae0bd9ee568a91
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 10:53:05 2023 +0700
all: imp code
commit 6d7e02e745d72921a693d4f09eec7ce21c2aefd4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 10:40:02 2023 +0700
all: imp docs
commit 0a4332997070fb8d2fb3a34d32b92f57a325ff06
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Mar 7 22:00:52 2023 +0700
safesearch: fix merge
commit 145c2222ba4cf7f8909b816d83829d2217c94243
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 2 11:41:48 2023 +0700
safesearch: fix merge
commit 14c6a8005fe15b5d5a39f91b17c96d8670975811
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 12:50:09 2023 +0700
all: docs
commit 2a85c8831866bf1c34c423a289461fc1e32667b5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 12:47:00 2023 +0700
all: use safesearch package
2023-03-15 14:31:07 +03:00
Eugene Burkov
c6706445c9
Pull request 1769: 5584-invalid-host-panic
...
Merge in DNS/adguard-home from 5584-invalid-host-panic to master
Updates #5584 .
Squashed commit of the following:
commit a09b59e279089c86b785b3c839dff10b3f327779
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 14 17:05:12 2023 +0300
all: upd golibs, add test
2023-03-14 17:23:01 +03:00
Ainar Garipov
595484e0b3
Pull request 1768: fix-chlog
...
Merge in DNS/adguard-home from fix-chlog to master
Squashed commit of the following:
commit a0d765ab0b6e6f621bc610d29a95c3331f48d83b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 13 18:06:43 2023 +0300
all: fix chlog
2023-03-13 18:11:14 +03:00
Ainar Garipov
a2053526c3
Pull request 1767: upd-chlog
...
Merge in DNS/adguard-home from upd-chlog to master
Squashed commit of the following:
commit 7834babfb513c47878087bd3710e3b6e61cd2a76
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 9 16:42:49 2023 +0300
all: upd chlog
2023-03-09 16:45:00 +03:00
Ildar Kamalov
e616429d44
Pull request: 5433 fix service icon size
...
Updates #5433
Squashed commit of the following:
commit 6c68cdc880719bf2c5d0e7cd7bf71c01157410d5
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 9 14:18:05 2023 +0300
add fill
commit 6395c0f5e047fa09f7b02f94bc1c9b2903729956
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 9 14:14:52 2023 +0300
client: fix service icon size
2023-03-09 14:25:36 +03:00
Ainar Garipov
622181b88f
Pull request 1765: upd-all
...
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 00363964e808533ef349040e86d89ba2f4a31eb1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 9 13:17:06 2023 +0300
all: upd go, i18n, svcs, trackers
2023-03-09 13:26:20 +03:00
Dimitry Kolyshev
1011b8f93d
Pull request 1163 safesearch package vol.1
...
Merge in DNS/adguard-home from 1163-safesearch-1-1 to master
Squashed commit of the following:
commit ccc8393304441b0edbcd15598d29764fb5d5fc34
Merge: 7d3901b5 6b265c64
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Mar 7 21:36:24 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1
commit 7d3901b5753f6456192f3533c257de7ae3bef6ac
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sat Mar 4 10:15:18 2023 +0700
all: safesearch imp code
commit 94a50dc61d955f659cda123825389225d0ebfc3e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 3 13:22:41 2023 +0700
safesearch: imp code
commit aa6e30fed8f67ffbc336f619f299fbd789c86ada
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 21:43:28 2023 +0700
safesearch: imp code
commit 30e75b6fa85edfdf66b7ace68cad4cbc61b28ea6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 21:38:14 2023 +0700
safesearch: imp code
commit 7d95ec73392b20519eab0e869ccba0c30404ae6f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 21:24:49 2023 +0700
safesearch: imp code
commit d6c0a0fbf9ad836606fbbfe31702e84773a2709d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 21:04:53 2023 +0700
safesearch: imp code
commit fa179b767bf75ed931cd62f282220d1f7025c641
Merge: 7a43ca00 012e5beb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 20:52:01 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-1
commit 7a43ca001ccab4d53b059c0e7843f2fc5b7dcefc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 11:59:35 2023 +0700
safesearch: embed rules
commit 2b1a83d6ffacc89a3e81a8327653018ed803f15b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 11:50:29 2023 +0700
safesearch: imp code
commit 400d463d32490cde7b4f55f3bb5a68e022e1c762
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 11:30:57 2023 +0700
safesearch: imp code
commit 60cce36bdef0cf0def28c760a3d767314a03f176
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 11:16:56 2023 +0700
all: imp code
commit 4eee3237b736fd16870835458757da550bcef295
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Feb 28 23:26:17 2023 +0700
all: safesearch package
2023-03-07 17:52:03 +03:00
Ildar Kamalov
6b265c6488
5546 fix query log search input clear
...
Updates #5546
Squashed commit of the following:
commit facb133d6b3226d01376a85acdb296ec4d59a703
Merge: ca1c5446 c11a52d6
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Mar 7 16:34:02 2023 +0300
Merge branch 'master' into AG-20152
commit ca1c54460e05ef6cfbc409dcd49267d09c2615c1
Merge: 824d20de f23a0d47
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 7 14:43:31 2023 +0300
Merge branch 'master' into AG-20152
commit 824d20de04444ddf7dd5fb723c90941e811f6346
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Mar 6 13:13:43 2023 +0300
client: fix search clear
2023-03-07 16:58:26 +03:00
Eugene Burkov
c11a52d60c
Pull request: 5281-dhcp-mtu-opt
...
Merge in DNS/adguard-home from 5281-dhcp-mtu-opt to master
Updates #5281 .
Squashed commit of the following:
commit fd97ab7ca4745c7ac2f82261dce42d377dede8b7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 7 15:40:33 2023 +0300
all: fix docs
commit eb4ecc12efab1acb3755e4ff2708a490adf6855d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 7 15:37:07 2023 +0300
all: imp docs, log changes
commit 887a28af8590da454763725b298baee2d022ce38
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 7 14:35:12 2023 +0300
dhcpd: rm default mtu
2023-03-07 15:49:47 +03:00
Ainar Garipov
f23a0d4753
Pull request 1761: home: fix panic
...
Fixes #5573 .
Squashed commit of the following:
commit daa1e65dadd779fe897c034aca4e88a6dba44c4a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 7 14:28:27 2023 +0300
home: fix panic
2023-03-07 14:37:14 +03:00
Ildar Kamalov
057804a459
5505 fix icons
...
Updates #5505
Squashed commit of the following:
commit 3d66b82808b9c3904bad8bb32f3927172bfdcda6
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Mar 6 12:45:42 2023 +0300
fix icons
commit 5030b45751e1717e5030eed0b46634f800d357d2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Mar 6 12:24:32 2023 +0300
client: fix chevron icon
2023-03-07 13:22:54 +03:00
Stanislav Chzhen
012e5beb51
Pull request 1744: 1472-edns-custom-ip
...
Merge in DNS/adguard-home from 1472-edns-custom-ip to master
Updates #1472 .
Squashed commit of the following:
commit 07460c3adf7747fd9ec1b4a3d04fb459dec44280
Merge: 65455430 ae653f16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 15:38:46 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 65455430993e4a62c49e1f45def909b0a135af3b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 15:37:17 2023 +0300
dnsforward: add todo
commit e1978ad4b6051f29185ef32973d20bc70f2a6634
Merge: 6cd98f42 bb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 11:32:23 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 6cd98f4235b1b52d443c1950f2516af3cc4fb258
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 11:31:16 2023 +0300
all: fix chlog; fix field alignment
commit defdec623919c23ab446324828d08839469669e1
Merge: 1130ebd5 a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 28 12:17:23 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 1130ebd509bf4f7ec25fbb53717576e273dbfff2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 28 12:13:30 2023 +0300
all: add use_custom field
commit ec0cdc7af0f96f761ed85516bbcae2567fd6f7d2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 13:59:13 2023 +0300
all: fix chlog; imp code
commit f8450cfcd6054f32d6ea0a5e26c551fe153a0b21
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 11:28:16 2023 +0300
dnsforward: fix fmt
commit 54a344e5bb17aae7ca213ed66b85f06ef6585316
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 11:11:52 2023 +0300
all: fix chlog; add test case
commit 47b5476f6621c6ea31aa496d4113445a8e8bceb4
Merge: 8724f374 304f2ba2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 22 16:33:07 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 8724f3745ccc29849a4001f79b055c7ebeb19106
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 22 16:31:40 2023 +0300
all: fix comments
commit d2b1528ba333e7669795a3fb80355ff7d90cf4f5
Merge: 7898c23a 76a513cd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 22 11:53:25 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 7898c23ab991bc516bcc2f41e47bed15582fd962
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 22 11:52:37 2023 +0300
all: upd chlog
commit 8763261dcb4187a93104955e7cb440965e2b6739
Merge: d28394b3 ff9b24ad
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 21 17:12:03 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit d28394b3c980b10f28c6c38ce35f368edb11d314
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 21 17:11:29 2023 +0300
home: fix default value
commit 1a5da3f267706baa83eebe1923ea1b0b4e79fd6c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 21 13:37:04 2023 +0300
all: add custom ip for edns
2023-03-01 16:16:16 +03:00
Ainar Garipov
ae653f166f
Pull request 1757: fix-updater
...
Merge in DNS/adguard-home from fix-updater to master
Squashed commit of the following:
commit 8103b0988b59a916fd84a5ca041b9a9fea606ebc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 1 14:28:54 2023 +0300
updater: fix max size
2023-03-01 14:35:27 +03:00
Ainar Garipov
51b72a4cd8
Pull request 1756: upd-all
...
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 25d2eabe5f912983b1d83c0e448be153a80da682
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 1 13:37:07 2023 +0300
all: upd blocked svcs, trackers, chlog
2023-03-01 13:40:25 +03:00