Dimitry Kolyshev
0393e41096
Pull request: 1577: rewrite edit http api
...
Merge in DNS/adguard-home from 1577-rewrite-edit to master
Squashed commit of the following:
commit d03bee2a14337d169eea950b3df18a447c02b422
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 12 12:54:15 2023 +0300
filtering: imp tests
commit bd68320df6dc057d922d91551cd00c74ebfaad6c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 12 10:38:12 2023 +0300
filtering: rewrite http tests
commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 11 12:06:30 2023 +0300
filtering: rewrite http tests
commit 29080384dd8fa80d5286d2fac1a4429d712bbafa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 17:24:00 2023 +0300
filtering: imp code
commit 96c6b1c98debfae565c5e6254746959a4307744e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:56:32 2023 +0300
filtering: imp code
commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012
Merge: 5fa9e1c37 c77b2a0ce
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:37:19 2023 +0300
Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit
commit 5fa9e1c3714e107f893c03efa72227f3ed88691c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:35:19 2023 +0300
filtering: imp code
commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 13:06:43 2023 +0300
docs: rewrite http update
commit 0c67b040e80787b084c4669bb20db8d6d145fc1b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 13:04:31 2023 +0300
filtering: rewrite http update
2023-05-12 13:04:19 +03:00
Stanislav Chzhen
18acdf9b09
Pull request 1809: 4299-querylog-stats-clients-api
...
Merge in DNS/adguard-home from 4299-querylog-stats-clients-api to master
Squashed commit of the following:
commit 066100a7869d7572c4ae65b3c7b1487ac50baf15
Merge: 95bc00c0 5da77514
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 14 13:57:30 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients-api
commit 95bc00c0b3d05b262ee0b90be9757e61cac0778c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:48:39 2023 +0300
all: fix typo
commit 4b868da48f0c976d204346e40ba948803be6397f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:42:52 2023 +0300
all: fix text label
commit 7a3ba5c7f688bd53cf761b5e8e614fbe251bd006
Merge: 315256e3 6c8d89a4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:34:59 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients-api
commit 315256e3f3861b5116962f7c47384b7c72e41813
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 11 19:07:18 2023 +0300
all: ignore search, unit
commit 28c6ffec9558e7c38d7bd12055eabddb8f5675c2
Author: Artem Krisanov <a.krisanov@adguard.com>
Date: Tue Apr 11 15:08:35 2023 +0300
Added 'Protection' and 'Query Log and statistics' sections to client settings. Added checkboxes to ignore client in (query log/statistics)
commit 2657bd2b820d8b2b3d71d23e4545c867b9ae6cdf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 17:28:59 2023 +0300
all: add todo
commit e151fcbc0c36d8e6a5c091fbf374bf0e35804699
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 15:15:46 2023 +0300
openapi: imp docs
commit 31875cbbd1bd09a73baa3636d0cc242b5ac35059
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 13:02:31 2023 +0300
all: add querylog stats client ignore api
2023-04-14 15:25:04 +03:00
Stanislav Chzhen
89bf3721b5
Pull request 1800: AG-20352-dhcpd-lease-is-static
...
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-is-static to master
Squashed commit of the following:
commit e4f4278a7ffa0f084ed41472dd3e7de4466c9f50
Merge: b6e3b62e
15bba281
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 11:13:05 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-is-static
commit b6e3b62ed4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 6 15:20:42 2023 +0300
dhcpd: imp naming
commit e2d9ed0832
Merge: ecd244a6
10bffd89
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 16:53:55 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-is-static
commit ecd244a608
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 16:53:15 2023 +0300
dhcpd: add lease json form
commit 9ebc246ed4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 13:11:25 2023 +0300
dhcpd: imp code
commit fc3d0cdaeb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 13:00:59 2023 +0300
all: fix json
commit d722578543
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 12:23:34 2023 +0300
dhcpd: add lease is static
2023-04-10 11:17:05 +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
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
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
Ainar Garipov
54a141abde
Pull request 1717: remove-client2
...
Merge in DNS/adguard-home from remove-client2 to master
Squashed commit of the following:
commit 0a0923494b0d1003e4f02f3a5f93d5248f0f2ded
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jan 20 17:14:29 2023 +0300
all: rm old experimental beta (dir client2/)
This project was unfortunately abandoned. v0.108.0 will have a
different front-end and new APIs.
2023-01-23 12:47:59 +03:00
Dimitry Kolyshev
cd76a30790
Pull request: 613-dark-theme vol.1
...
Merge in DNS/adguard-home from 613-dark-theme to master
Squashed commit of the following:
commit 1a286e9677c0bc9203ca0249edf0dd6f64db1609
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jan 13 22:37:36 2023 +0700
home: imp docs
commit 45c4fac401788a1c5f0ab56869b13cce33690145
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jan 13 18:35:58 2023 +0700
home: imp docs
commit e23b375611deb9562dfccaf45632e5235d06f96c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jan 13 15:05:41 2023 +0700
home: imp docs
commit 85d2cd6250c4bb558c9a9bd5066044f07827c263
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jan 13 15:04:28 2023 +0700
home: imp code
commit bb00bfda90a809929639b241d7bbc31e7e6dfcb8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jan 13 09:37:41 2023 +0700
home: imp docs
commit 140fd0768ea2a0da7618a1f5ef6c53ff415753aa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jan 13 09:34:27 2023 +0700
home: imp code
commit 4e866b7c5b4d2ff777e4917cb91b34a4bbb5e995
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jan 12 19:11:33 2023 +0700
home: imp docs
commit 0f13248165ef920d1dadb2e057b65cc3189a4b31
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jan 12 18:53:57 2023 +0700
home: imp code
commit e04181f5fcd67cdd08fbf8a7c56933195999af31
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jan 12 18:48:44 2023 +0700
home: imp code
commit bb9989bb9ab54bfb734880dcb999804c6f2ccda8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jan 12 12:09:20 2023 +0700
all: control/profile API
2023-01-13 19:24:17 +03:00
Ainar Garipov
09f88cf21d
Pull request: 5190-clear-cache
...
Updates #4695 .
Updates #5190 .
Squashed commit of the following:
commit f4156f54ebd1b0c96318715441da1dc54cbbfb0f
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Dec 2 16:19:03 2022 +0300
client: button styles
commit 42cd8ac8ac1abb5c43a42065e2374d11f2d9a62b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 2 15:39:15 2022 +0300
all: upd dnsproxy
commit 87b04391afeaed28523448aa12a317300e718b72
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Dec 2 15:19:07 2022 +0300
client: add clear cache button
commit ee99548b3689ce47959d9bddc6a1e866e773dcc3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 1 18:54:54 2022 +0300
all: add cache clear
2022-12-02 18:06:50 +03:00
Ainar Garipov
9951d861d1
Pull request: 3972-hostlists-services
...
Updates #3972 .
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs
2022-10-27 15:46:25 +03:00
Ainar Garipov
4d404b887f
Pull request: 4970-error-415
...
Updates #4970 .
Squashed commit of the following:
commit 10365d9c8474e9d9735f581fb32b2892b2153cc4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 30 14:23:06 2022 +0300
all: imp docs, names
commit cff1103a0618a6430dc91e7e018febbf313c12ba
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 30 14:02:38 2022 +0300
home: imp content-type check
2022-09-30 14:41:25 +03:00
Ainar Garipov
756b14a61d
Pull request: HOFTIX-csrf
...
Merge in DNS/adguard-home from HOFTIX-csrf to master
Squashed commit of the following:
commit 75ab27bf6c52b80ab4e7347d7c254fa659eac244
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 29 18:45:54 2022 +0300
all: imp cookie security; rm plain-text apis
2022-09-29 19:04:26 +03:00
Ainar Garipov
57c0b1203e
Merge branch 'master' into 4535-list-services
2022-08-25 18:24:07 +03:00
Ainar Garipov
f54a2dc1da
home: imp filtering handling
2022-08-17 20:40:47 +03:00
RoboMagus
0f2a9f262e
Add '/blocked_services/services' API
2022-04-25 09:41:31 +02:00
bakito
c346216424
correct openapi schema
2022-03-12 12:56:54 +01:00
Eugene Burkov
9a764b9b82
Pull request: 3978 Query Log ECS
...
Merge in DNS/adguard-home from 3978-ecs-ip to master
Updates #3978 .
Squashed commit of the following:
commit 915b94afa4b6d90169f73d4fa171bc81bcc267a7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 17:46:40 2022 +0300
all: rm dot
commit 2dd2ed081b199de7e5d8269dae5d08d53b5eea6d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 17:42:45 2022 +0300
client: imp txt
commit 8d5a23df739f0b650f9f3870141fd83e8fa0c1e0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 14:36:04 2022 +0300
client: imp text
commit 69c856749a20144822ef3f1f67c5f3e3c24f5374
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 3 14:24:56 2022 +0300
client: imp description
commit cd0150128ad29d1874492735a5d621c0803ad0bd
Merge: 28181fbc e0b557ed
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 2 21:02:16 2022 +0300
Merge branch 'master' into 3978-ecs-ip
commit 28181fbc79eb22e7fd13cbd1d5a3c040af9fa2a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 2 20:45:50 2022 +0300
client: show ecs
commit cdc5e7f8c4155b798426d815eed0da547ef6efb7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 20:15:56 2022 +0300
openapi: fix milestone
commit 404d6d822fa1ba4ed4cd41d92d4c1b805342fe55
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 20:08:21 2022 +0300
all: fix deps, docs
commit 8fb80526f1e251d3b7b193c53a4a6dee0e22c145
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 17 19:39:34 2022 +0300
all: add querylog ecs backend
2022-03-03 17:52:11 +03:00
Eugene Burkov
0ef8344178
Pull request: 3503 password policy
...
Merge in DNS/adguard-home from 3503-password-policy to master
Closes #3503 .
Squashed commit of the following:
commit 1f03cd9ef6e76a691ae383d6ba4b7f851eabddb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 10 18:24:59 2022 +0300
client: imp msg
commit e164ae2544284cf9a1d3333c50b68e361f78ce2a
Merge: b7efd764 f53f48cc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 10 16:52:01 2022 +0300
Merge branch 'master' into 3503-password-policy
commit b7efd7640ec0fa3deac5290f8306ce5142428718
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Feb 10 16:17:59 2022 +0300
client: remove empty line
commit f19aba6cb579d2c4681675c881000c8f16257ab9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Feb 10 16:09:14 2022 +0300
client: validate password length
commit a6943c94483306ecfc0d1431d576d42053823b61
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 4 18:57:02 2022 +0300
all: fix docs again
commit 9346bb6c393af0799a79b228285acdd8f8799b83
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 4 18:54:15 2022 +0300
openapi: fix docs
commit a8016443237c130f69108970ddfc77ef71126be6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 4 18:25:55 2022 +0300
all: validate passwd runes count
2022-02-10 18:30:41 +03:00
Ainar Garipov
f53f48cc33
Pull request: all: use "ClientID" consistently
...
Closes #4242 .
Updates #4244 .
Squashed commit of the following:
commit 3a2296a7a70006cf6777e54ce1e2fc3559aec5be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 21:23:43 2022 +0300
client: imp more
commit 3aacc8696ac694ff459fd33ba7beeeabd2569a55
Merge: b28a120f 2a5b5f19
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 21:21:59 2022 +0300
Merge branch 'master' into 4244-imp-i18n
commit b28a120fe9aa68507b173717059b7b259097d6a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 14:49:49 2022 +0300
client: imp texts more
commit c1fa6ca336f2d5bdcc67836f348be4843a0a8f79
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 8 21:12:15 2022 +0300
all: use "ClientID" consistently
2022-02-10 15:42:59 +03:00
Ainar Garipov
813a06d09a
Pull request: home: show version in install api
...
Closes #4026 .
Squashed commit of the following:
commit bcd1315a10e819daee3aee323427d90a27860b4a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 18 14:57:49 2022 +0300
openapi: fix example
commit b56e27c5ac1fc7c3f595057d77607479d72ec50a
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 18 14:55:51 2022 +0300
client: show version on install page
commit 95dfbfaa1235deef7b55e51457d11c677f6ef6b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 18 14:29:08 2022 +0300
home: show version in install api
2022-01-18 15:05:34 +03:00
Eugene Burkov
0e4ffd339f
Pull request: 4074 fix upstream test
...
Merge in DNS/adguard-home from 4074-upstream-test to master
Updates #4074 .
Squashed commit of the following:
commit 0de155b1e175a892b259791ff6d6e6f351bcfcf2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 12 19:20:01 2022 +0500
dnsforward: fix upstream test
2022-01-13 15:05:44 +03:00
Ainar Garipov
f315601a9f
Pull request: all: simplify dnssec logic
...
Closes #3904 .
Squashed commit of the following:
commit 5948f0d3519299a1253e388f4bc83e2e55847f68
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 13 17:53:40 2021 +0300
querylog: imp
commit 852cc7dbdb495a17ff51b99ab12901b846f8be09
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 13 17:44:41 2021 +0300
querylog: fix entry write
commit 9d58046899f35162596bfc94fe88fa944309b2fd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 13 16:45:56 2021 +0300
all: simplify dnssec logic
2021-12-13 18:06:01 +03:00
Eugene Burkov
434032f8e3
Pull request: 3772 cache upstreams
...
Merge in DNS/adguard-home from 3772-cache-upstreams to master
Updates #3772 .
Squashed commit of the following:
commit 809e874fe8847fdbd7f8a7221f18393509f41339
Merge: 5774798c 2d328ea8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 7 17:15:59 2021 +0300
Merge branch 'master' into 3772-cache-upstreams
commit 5774798ce1897bf292be49410794ce06cd084f93
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:48:38 2021 +0300
client: fix formatting
commit 4b4bb668c762c9b4d47cf40a007f34fe47a6e260
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:47:18 2021 +0300
client: remove comment
commit a2a9f904a6ab52194bb811a2a83967660a25f2cc
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:45:31 2021 +0300
client: handle cached upstream
commit a56804c4910da838cb10c8ef0af2a525e9722b1c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:33:43 2021 +0300
querylog: rm todo
commit 16c0a62ad2dfc7fcb5a6adbc868b296b7840fd27
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:31:53 2021 +0300
all: revise log of changes
commit 9f4b793205f17b6e85d74e83126093ed09eb24e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:23:42 2021 +0300
WIP
commit 7fbc6d596295570d2c61c3e507160f65c9adccb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:03:42 2021 +0300
all: imp upstream info in querylog
2021-12-07 17:43:51 +03:00
Ainar Garipov
9a1d3ec694
Pull request: querylog: fix panic
...
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic
2021-09-13 20:16:06 +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
138718e6ec
Pull request: all: fix some typos
...
Merge in DNS/adguard-home from fix-docs to master
Squashed commit of the following:
commit 1a78c8fccabb90e97008cebe1f2cf5bd1dce9c24
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 31 17:02:52 2021 +0300
all: fix some typos
2021-08-31 17:32:59 +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
5292c7c387
Pull request: openapi: upd version
...
Closes #3364 .
Squashed commit of the following:
commit 840c20c87ccd64a83010718c68d65adcb390134d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jul 20 12:24:06 2021 +0300
openapi: upd version
2021-07-20 12:31:52 +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
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
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
dab7b439d1
Pull request: all: imp docs, names
...
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names
2021-06-18 18:13:36 +03:00
Ainar Garipov
dbe8b92dfc
Pull request: all: make stats disableable, imp code
...
Updates #2141 .
Squashed commit of the following:
commit d8f3bcd9927b00a1d4b8b60b43144bc4b4469311
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jun 17 19:10:53 2021 +0300
stats: imp docs, names
commit 97eae3c2da5585467ca024bdacdbf922bcc8b444
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jun 17 18:51:49 2021 +0300
all: make stats disableable, imp code
2021-06-17 19:44:46 +03:00
Ainar Garipov
84e71e912e
Pull request: dhcpd: add purge, imp code
...
Updates #1691 .
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code
2021-06-16 16:48:46 +03:00
Eugene Burkov
3f1fd56b17
Pull request: 3172 fix mobileconfig
...
Merge in DNS/adguard-home from 3172-mobileconfig to master
Updates #3172 .
Updates #2497 .
Squashed commit of the following:
commit 30549ef4eda9d88f0738089e901492d7369caa25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 21:00:17 2021 +0300
all: log changes
commit 9b9429447430a8e5656b992c04c4a74606dc5f9f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 1 17:56:59 2021 +0300
client: always show port input
commit 6d6a0bdfaa849220a5ddb4a17502ab05379d7a1c
Merge: 13a3bffd 77946a7f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 17:50:41 2021 +0300
Merge branch 'master' into 3172-mobileconfig
commit 13a3bffd4dd6ccabf3d261f17b2c758a5c61eb9c
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 1 17:20:17 2021 +0300
client: add port to mobile config form
commit f6abe0b6044572f3801c31b683e76f90c4a28487
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon May 31 19:43:37 2021 +0300
home: imp cyclo
commit c304a0bacdca6f8b5ffd21f3d00c8244ea9e4e36
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon May 31 18:19:46 2021 +0300
home: reduce allocs
commit 10a7678861079b710bb0ef14569c60a09612ec70
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon May 24 20:05:08 2021 +0300
all: make the host parameter required
2021-06-01 21:06:55 +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
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
460aa1a5ba
Pull request: home: imp client http api, docs
...
Updates #3075 .
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs
2021-05-06 16:41:33 +03:00
Eugene Burkov
f603c21b55
Pull request: 2826 auth block
...
Merge in DNS/adguard-home from 2826-auth-block to master
Updates #2826 .
Squashed commit of the following:
commit ae87360379270012869ad2bc4e528e07eb9af91e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 27 15:35:49 2021 +0300
home: fix mistake
commit dfa2ab05e9a8e70ac1bec36c4eb8ef3b02283b92
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 27 15:31:53 2021 +0300
home: imp code
commit ff4220d3c3d92ae604e92a0c5c274d9527350d99
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 27 15:14:20 2021 +0300
home: imp authratelimiter
commit c73a407d8652d64957e35046dbae7168aa45202f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 27 14:20:17 2021 +0300
home: fix authratelimiter
commit 724db4380928b055f9995006cf421cbe9c5363e7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 23 12:15:48 2021 +0300
home: introduce auth blocker
2021-04-27 18:56:32 +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
908452f883
Pull request: all: fix names of runtime clients on query log page
...
Updates #2929 .
Squashed commit of the following:
commit f02111aac1e9d63732589b65b224613aa3240677
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 7 17:40:16 2021 +0300
all: fix names of runtime clients on query log page
2021-04-07 17:49:37 +03:00
Ainar Garipov
7c35d208b1
Pull request: querylog: search clients by name, enrich http resp
...
Updates #1273 .
Squashed commit of the following:
commit 55b78153b1b775c855e759011141bbbe6d4b962c
Author: Artem Baskal <a.baskal@adguard.com>
Date: Fri Apr 2 16:55:39 2021 +0300
Update client_info in case of null
commit 5c80c1438ed9d961af11617831b704d6ae15cc34
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 16:24:14 2021 +0300
querylog: always set client_info
commit b48efd64d757cc0bcf5b34de22fdd0b0464d98a6
Merge: 4ed7eab5 23c9f528
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 16:22:08 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit 4ed7eab52b6b5b0c0ddb5aa5a3225a62d1f9265b
Merge: dbf990eb 70d4c70e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 12:57:17 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit dbf990eb881116754554270e7b691b5db8e9ee34
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 12:56:13 2021 +0300
home: imp names
commit c2cfdef494ca26fff62b9fa008f1b389d9d4d46b
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 19:26:04 2021 +0300
Rename to whois
commit e3cc4a68ee576770b1922680155308e33bed31e8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 19:03:42 2021 +0300
home: imp whois more
commit 3b8ef8691c298aff35946b35923ef2e5b1f9bbbe
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 18:51:14 2021 +0300
home: imp whois resp
commit fb97e0d74976723a512d6ff4c69e830fe59c8df8
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 18:00:03 2021 +0300
Fix client_info ids prop types
commit 298005189e372651ceff453e88aca19ee925a138
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 17:58:14 2021 +0300
Adapt changes on client
commit aa1769f64197d865478a66271da483babfc5dfd0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 17:18:36 2021 +0300
all: add more fields to querylog client
commit 4b2a2dbd380ec410f3068d15ea16430912e03e33
Merge: cda92c3f 2e4e2f62
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 16:57:26 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit cda92c3f0331cbac252f3163d31457f716bc7f2c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 18:03:51 2021 +0300
querylog: fix windows tests
commit 5a56f0a32608869ed93a38f18f63ea3a20f7bde2
Merge: 627e4958 e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 17:45:53 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit 627e495828e82d44cc77aa393536479f23cc68b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 17:44:49 2021 +0300
querylog: add tests, imp code, docs
commit 6dec468a2f0c29357875ff99458e0e8f8e580e6d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 26 16:10:47 2021 +0300
querylog: search clients by name, enrich http resp
2021-04-02 17:30:39 +03:00
Ainar Garipov
d6a059e395
Pull request: openapi: add missing property
...
Merge in DNS/adguard-home from fix-openapi to master
Squashed commit of the following:
commit 24efa5732b327d179f07cbf67fbe8df6ee1b9477
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 26 15:42:56 2021 +0300
openapi: add missing property
2021-02-26 15:52:52 +03:00
Ainar Garipov
adb76aa9b8
Pull request: openapi: fix naming in filter object
...
Merge in DNS/adguard-home from fix-openapi-filter to master
Squashed commit of the following:
commit 12c431b656804a27d00c9e016d290a1e90bf48ef
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 1 15:43:33 2021 +0300
openapi: fix naming in filter object
2021-02-01 16:01:33 +03:00
Ainar Garipov
3af079a81b
Pull request: querylog: make answer actually a string
...
Merge in DNS/adguard-home from 2609-dns-answer-string to master
Updates #2609 .
Squashed commit of the following:
commit 1922f90c50f47735d8025d862fbf60bcf707140f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jan 28 15:19:11 2021 +0300
querylog: stricter typing
commit 6ef73a45d822f77cfda44d8c093f272704d5afb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jan 28 15:04:06 2021 +0300
querylog: make answer actually a string
2021-01-28 16:00:29 +03:00
Ainar Garipov
fc9ddcf941
Pull request: all: client id support
...
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383 .
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits
2021-01-27 18:32:13 +03:00
Eugene Burkov
d9482b7588
Pull request: 2509 type-safety vol.2
...
Merge in DNS/adguard-home from 2509-type-safety-vol2 to master
Updates #2509 .
Squashed commit of the following:
commit c944e4e0a9949fc894c90b4bc1f739148a67fd9d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jan 21 19:36:20 2021 +0300
all: imp docs
commit e8ac1815c492b0a9434596e35a48755cac2b9f3b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 20 12:38:48 2021 +0300
all: imp JSON encoding, decoding
2021-01-21 19:55:41 +03:00