Ainar Garipov
d23da1b757
all: sync with master
2022-08-19 15:45:54 +03:00
Ainar Garipov
beb8e36eee
cherry-pick: 4557-asuswrt-readme
...
Updates #4557 .
* commit 'e3624ec5880361b8afccd0ddac9dc31fd7ce4a07':
all: fix abbreviation
Update README.md
2022-08-19 15:21:21 +03:00
Ainar Garipov
fe70161c01
cherry-pick: upd-dnsproxy
...
Merge in DNS/adguard-home from upd-dnsproxy to master
Squashed commit of the following:
commit 3c5b683e96191b9cf0abf35229c3c665370d782e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 18:04:13 2022 +0300
all: upd dnsproxy
2022-08-19 15:20:59 +03:00
Ainar Garipov
39fa4b1f8e
cherry-pick: 4846-migration-fix
...
Updates #4846 .
Squashed commit of the following:
commit 22e2e89e5390c7b1486fb69064c55da40fc5c7e7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 18 16:25:07 2022 +0300
home: fix yaml object type
2022-08-19 15:19:11 +03:00
Ainar Garipov
c7a8883201
cherry-pick: 4795-bilibili
...
Updates #4795 .
* commit 'e6ebb8efef4430c48b06469ba566349bba3d9856':
filtering: fmt
filtering: add Bilibili and Weibo domains
filtering: add Bilibili service
2022-08-19 15:18:14 +03:00
Ainar Garipov
3fd467413c
cherry-pick: 4446-readme-fix
...
Updates #4446 .
* commit 'ea5d165a703dd37ef40254f3f775e049b6cebf93':
all: imp readme
Enable code block syntax hightlight in README.md
2022-08-19 15:17:57 +03:00
Ainar Garipov
9728dd856f
cherry-pick: 4387-fix-openapi-schema
...
Updates #4387 .
* commit 'f54a2dc1da5dfd578f156cf1e0f53f32516eb844':
home: imp filtering handling
correct openapi schema
2022-08-19 15:17:43 +03:00
Ainar Garipov
ecadf78d60
all: upd chlog
2022-08-19 15:02:37 +03:00
Ainar Garipov
eba4612d72
all: fix chlog
2022-08-17 18:55:20 +03:00
Ainar Garipov
9200163f85
all: sync with master
2022-08-17 18:23:30 +03:00
Ainar Garipov
3c17853344
cherry-pick: 4844-snap-core22
...
Closes #4843 .
Updates #4844 .
* commit '385a873b0f006f26832e73744845fdbc2864aad0':
all: chlog
Update Snap to Ubuntu Core 22 #4843
2022-08-17 18:16:57 +03:00
Eugene Burkov
993a3fc42c
cherry-pick: 4358 stats races
...
Merge in DNS/adguard-home from 4358-stats-races to master
Updates #4358
Squashed commit of the following:
commit 162d17b04d95adad21fb9b3c5a6fb64df2e037ec
Merge: 17732cfa d4c3a43b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 17 14:04:20 2022 +0300
Merge branch 'master' into 4358-stats-races
commit 17732cfa0f3b2589bf2c252697eee1d6b358a66c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 17 13:53:42 2022 +0300
stats: imp docs, locking
commit 4ee090869af0fa2b777c12027c3b77d5acd6e4de
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 16 20:26:19 2022 +0300
stats: revert const
commit a7681a1b882cef04511fcd5d569f5abe2f955239
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 16 20:23:00 2022 +0300
stats: imp concurrency
commit a6c6c1a0572e4201cd24644fd3f86f51fc27f633
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 16 19:51:30 2022 +0300
stats: imp code, tests, docs
commit 954196b49f5ad91d91f445ff656e63c318e4124c
Merge: 281e00da 6e63757f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 16 13:07:32 2022 +0300
Merge branch 'master' into 4358-stats-races
commit 281e00daf781d045269584ce0158eed1d77918df
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Aug 12 16:22:18 2022 +0300
stats: imp closing
commit ed036d9aa7e25498869edfb866b6e923538970eb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Aug 12 16:11:12 2022 +0300
stats: imp tests more
commit f848a12487ecd2afc8416e800510090cc1be7330
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Aug 12 13:54:19 2022 +0300
stats: imp tests, code
commit 60e11f042d51ec68850143129e61c701c5e4f3a4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 11 16:36:07 2022 +0300
stats: fix test
commit 6d97f1db093b5ce0d37984ff96a9ef6f4e02dba1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 11 14:53:21 2022 +0300
stats: imp code, docs
commit 20c70c2847b0de6c7f9271a8d9a831175ed0c499
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 10 20:53:36 2022 +0300
stats: imp shared memory safety
commit 8b3945670a190bab070171e6b4976edab1e3e2a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 10 17:22:55 2022 +0300
stats: imp code
2022-08-17 18:15:41 +03:00
Ainar Garipov
7bb9b2416b
cherry-pick: upd-specs
...
Merge in DNS/adguard-home from upd-specs to master
Squashed commit of the following:
commit d7ac1dc1ef305098ff741d557c13db8a60ffe1f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 19:16:51 2022 +0300
bamboo-specs: allow larger keys
2022-08-17 18:15:16 +03:00
Eugene Burkov
2de321ce24
cherry-pick: Fix frontend CI build
...
Merge in DNS/adguard-home from fix-bamboo-specs to master
Squashed commit of the following:
commit e59b75ab9528bbe8fbf5e15054d848abffbae312
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 15 18:52:10 2022 +0300
all: fix ci frontend build
2022-08-17 18:14:59 +03:00
Eugene Burkov
30b2b85ff1
cherry-pick: Separate front- and back- end builds
...
Merge in DNS/adguard-home from imp-bamboo-specs to master
Squashed commit of the following:
commit 3415b650e48aefef3ad16030be3d797de4015403
Merge: e37c0a2b f58265ec
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 15 18:42:42 2022 +0300
Merge branch 'master' into imp-bamboo-specs
commit e37c0a2bb52fab98e133332e8f54d500d0f96b06
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 18:30:33 2022 +0300
scripts: replace find with loop
commit 826a02f6a11000cce4b3205229d6bbb050c8dd73
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 15 18:00:41 2022 +0300
all: ...again
commit 54aebf5d4aeba35e3dc320436236759f4d1ccdad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 15 17:59:24 2022 +0300
all: fix spec yaml
commit 87b92b30504f2427c40303265354afba4855e0bb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 15 17:48:19 2022 +0300
all: separate front- and back-end builds
2022-08-17 18:14:44 +03:00
Ainar Garipov
6ea4788f56
cherry-pick: 4836-revert-dhcp-upd
...
Updates #4836 .
Squashed commit of the following:
commit 6fe1721d44be1c23e524d477e28b5f7cc5dd2dc6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 17:48:41 2022 +0300
dhcpd: reverd mod upd
2022-08-17 18:13:27 +03:00
Ainar Garipov
3c52a021b9
cherry-pick: add-ar-i18n
...
Merge in DNS/adguard-home from add-ar-i18n to master
Squashed commit of the following:
commit 6ef7c70bceb6f6ebabd81011154022a75fc91bd3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 10 20:55:39 2022 +0300
client: add ar locale
2022-08-17 18:12:15 +03:00
Ainar Garipov
0ceea9af5f
cherry-pick: upd-yaml
...
Merge in DNS/adguard-home from upd-yaml to master
Squashed commit of the following:
commit f0c3a1896e7eba73b1c8a02533637cdabc89909b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 8 15:28:02 2022 +0300
home: restore indent lvl
commit b52c124d2e786e8575c58e75efa7d2cd2b70b67f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 8 15:06:41 2022 +0300
all: upd tools, yaml mod
2022-08-17 18:10:49 +03:00
Eugene Burkov
39b404be19
cherry-pick: 4358 fix stats
...
Merge in DNS/adguard-home from 4358-fix-stats to master
Updates #4358 .
Updates #4342 .
Squashed commit of the following:
commit 5683cb304688ea639e5ba7f219a7bf12370211a4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 18:20:54 2022 +0300
stats: rm races test
commit 63dd67650ed64eaf9685b955a4fdf3c0067a7f8c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 17:13:36 2022 +0300
stats: try to imp test
commit 59a0f249fc00566872db62e362c87bc0c201b333
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 16:38:57 2022 +0300
stats: fix nil ptr deref
commit 7fc3ff18a34a1d0e0fec3ca83a33f499ac752572
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Apr 7 16:02:51 2022 +0300
stats: fix races finally, imp tests
commit c63f5f4e7929819fe79b3a1e392f6b91cd630846
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 00:56:49 2022 +0300
aghhttp: add register func
commit 61adc7f0e95279c1b7f4a0c0af5ab387ee461411
Merge: edbdb2d4 9b3adac1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 00:36:01 2022 +0300
Merge branch 'master' into 4358-fix-stats
commit edbdb2d4c6a06dcbf8107a28c4c3a61ba394e907
Merge: a91e4d7a a481ff4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 21:00:42 2022 +0300
Merge branch 'master' into 4358-fix-stats
commit a91e4d7af13591eeef45cb7980d1ebc1650a5cb7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 18:46:19 2022 +0300
stats: imp code, docs
commit c5f3814c5c1a734ca8ff6726cc9ffc1177a055cf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 18:16:13 2022 +0300
all: log changes
commit 5e6caafc771dddc4c6be07c34658de359106fbe5
Merge: 091ba756 eb8e8166
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 18:09:10 2022 +0300
Merge branch 'master' into 4358-fix-stats
commit 091ba75618d3689b9c04f05431283417c8cc52f9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 18:07:39 2022 +0300
stats: imp docs, code
commit f2b2de77ce5f0448d6df9232a614a3710f1e2e8a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 2 17:09:30 2022 +0300
all: refactor stats & add mutexes
commit b3f11c455ceaa3738ec20eefc46f866ff36ed046
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Apr 27 15:30:09 2022 +0300
WIP
2022-08-17 18:10:16 +03:00
Ainar Garipov
56dc3eab02
cherry-pick: 4801-hassio-link
...
Updates #4801 .
* commit '73f935f3f370ad7e1dfb2495fe71d1dc5e415672':
Update Hass.io AdGuard Home integration link
2022-08-17 18:07:06 +03:00
Ainar Garipov
554a38eeb1
cherry-pick: 4800-upd-link
...
Updates #4800 .
* commit 'bbccd616148f63240afee6ccf643179ff322c6f4':
Update RFC 9250 link
2022-08-17 18:06:29 +03:00
Ainar Garipov
c8d3afe869
cherry-pick: 4670-invalid-arg-cap-check
...
Updates #4670 .
Squashed commit of the following:
commit 9c32739eb92ef57c78a4dc3ec3c0f280aebf7182
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 3 20:04:54 2022 +0300
aghnet: imp port check for older linuxes
2022-08-17 18:05:28 +03:00
Ainar Garipov
44222c604c
all: upd chlog
2022-08-17 18:05:16 +03:00
Ainar Garipov
cbf221585e
all: upd chlog
2022-08-03 16:22:44 +03:00
Ainar Garipov
48322f6d0d
all: upd chlog
2022-08-03 16:21:12 +03:00
Ainar Garipov
d5a213c639
cherry-pick: upd-i18n
...
Merge in DNS/adguard-home from upd-i18n to master
Squashed commit of the following:
commit 366600a32ecbb163ab43b43145898bbadcfbc2e9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 3 15:09:16 2022 +0300
client: fix si-lk
commit 2a55ee3846251e53529f4ef6562e5f4939381eae
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 3 15:03:45 2022 +0300
client: upd i18n
2022-08-03 16:01:22 +03:00
Ainar Garipov
8166c4bc33
cherry-pick: upd-go
...
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 8edfb5cc3466c1e4ee2eacae5157bd93c135a284
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 3 14:25:45 2022 +0300
all: imp docs; fmt
commit 080b8a85c02afbdaa079c0da47cb7b6311d50fbe
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:51:20 2022 +0300
all: upd go, imp generic code
2022-08-03 16:01:02 +03:00
Ildar Kamalov
133cd9ef6b
cherry-pick: 4776 add word break for query log domains
...
Updates #4776
Squashed commit of the following:
commit 6f1778fbd11da529ae934ee33c8f1ad227cdfa66
Merge: 753bd44c 053bb72a
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Aug 2 11:52:07 2022 +0300
Merge branch 'master' into 4776-domains
commit 753bd44cbb592903ed996713a79e4dbf073d780b
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 1 16:58:07 2022 +0300
client: add word break for query log domains
2022-08-03 15:59:23 +03:00
Ildar Kamalov
11146f73ed
cherry-pick: 4775 fix query log issue on tablet devices
...
Updates #4775
Squashed commit of the following:
commit 9ad85d2306b68227e11c7b1dd792e3fe6389939d
Merge: 95aa29d6 41f081d8
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Aug 2 11:44:04 2022 +0300
Merge branch 'master' into 4775-popup
commit 95aa29d68bdf5e9c4e7aa59f42d04328b1872115
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 1 16:21:23 2022 +0300
client: fix query log issue on tablet devices
2022-08-03 15:57:05 +03:00
Eugene Burkov
1beb18db47
cherry-pick: 4517 warning wording
...
Merge in DNS/adguard-home from 4517-warning-label to master
Updates #4517 .
Squashed commit of the following:
commit 4987f63937253da2954cf20c7b99a3b8a0adf112
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 1 13:59:28 2022 +0300
client: imp wording
2022-08-03 15:56:45 +03:00
Eugene Burkov
f7bc2273a7
cherry-pick: 4517 domain specific test
...
Merge in DNS/adguard-home from 4517-domain-specific-test to master
Updates #4517 .
Squashed commit of the following:
commit 03a803f831749a060923ec966592696f99591786
Merge: 8ea24170 f5959a0d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 19:17:28 2022 +0300
Merge branch 'master' into 4517-domain-specific-test
commit 8ea2417036547996bb2d39b75b0ff31de4fe9b21
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:44:26 2022 +0300
all: log changes, imp docs
commit aa74c8be64f2796a2dfa7166f0155fff5bb395b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 18:07:12 2022 +0300
dnsforward: imp logging
commit 02dccca4e7d766bbfbe0826933e8be70fcd93f58
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 17:24:08 2022 +0300
all: imp code, docs
commit 3b21067d07b208baf574a34fb06ec808b37c4ee3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 29 13:34:55 2022 +0300
client: add warning toast
commit ea2272dc77f87e34dc6aff0af99c7a51a04e3770
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 20:11:55 2022 +0300
dnsforward: imp err msg, docs
commit fd9ee82afef9d93961c30ebafcc7a11d984247b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 19:24:58 2022 +0300
dnsforward: test doain specific upstreams
commit 9a83ebfa7a73bf4e03eaf1ff4a33f79771159fc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 28 18:22:49 2022 +0300
dnsforward: merge some logic
2022-08-03 15:56:25 +03:00
Ainar Garipov
d1e735a003
cherry-pick: upd-links-etc
...
Merge in DNS/adguard-home from upd-links-etc to master
Squashed commit of the following:
commit 49856df394f1a2123a27afdb35047d3b1a49860f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:43:10 2022 +0300
all: revert cdn link revert
commit 59bbe4bbd300f48674c1a6224a91f9a567d6c79c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:40:50 2022 +0300
all: revert static link revert
commit fe2acc4a0d6d5ee31cb8dbb0d0e0984c3cd723db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 18:24:02 2022 +0300
all: revert links up in README; imp tools
2022-08-03 15:54:47 +03:00
Ainar Garipov
af4ff5c748
cherry-pick: upd-domains-and-links
...
Merge in DNS/adguard-home from upd-domains-and-links to master
Squashed commit of the following:
commit 5e5ff2fec358104995877da689da24749ac470ce
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 28 19:53:19 2022 +0300
all: upd urls
Update domains and URLs to make them more resistant to state blocking.
2022-08-03 15:54:23 +03:00
Ainar Garipov
fc951c1226
cherry-pick: 4755-youtube-domain
...
Updates #4755 .
Squashed commit of the following:
commit cb0ab8b26f6f277ef76ee3492c99870cbfc24666
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 28 17:21:02 2022 +0300
filtering: add another youtube domain
2022-08-03 15:52:00 +03:00
Ainar Garipov
f81fd42472
cherry-pick: imp-issue-tmpl
...
Merge in DNS/adguard-home from imp-issue-tmpl to master
Squashed commit of the following:
commit 3941dd135911d850f3ec9b01f55bc45269a7b91c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 28 15:24:26 2022 +0300
all: fix links in issue tmpls
commit 438375a4666f951fc24ab47e4b0de5a61714973b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 28 15:23:00 2022 +0300
all: imp issue tmpls
2022-08-03 15:51:37 +03:00
Ainar Garipov
1029ea5966
cherry-pick: issue-templates
...
Merge in DNS/adguard-home from issue-templates to master
Squashed commit of the following:
commit 989253530047a463804e81c8fda82ac268f39adc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 27 16:56:35 2022 +0300
all: fix issue tmpl schema
commit e69df09ab4b4f713d124dc6eeb1ed34e0f4aaa70
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 27 16:41:14 2022 +0300
all: rename tmpl files
commit 542306da1ea1bdc09ca328856367c64139a8ec60
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 27 16:37:02 2022 +0300
all: imp github issue templates
2022-08-03 15:51:23 +03:00
Ainar Garipov
c0abdb4bc7
cherry-pick: 4782-server-name-label
...
Updates #4782 .
Squashed commit of the following:
commit d350b3853bf722c0f2a8d1fc4a1c28dc384c5ca0
Author: Natalia Sokolova <n.sokolova@adguard.com>
Date: Tue Jul 26 18:39:38 2022 +0300
client: imp wording
commit d0785311bfe38fb10477bf8971a46d6c61aecfda
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jul 26 17:16:41 2022 +0300
client: imp tls server name label
2022-08-03 15:50:48 +03:00
Ainar Garipov
6681178ad3
all: upd chlog
2022-08-03 15:43:45 +03:00
Ainar Garipov
e73605c4c5
all: add ms link
2022-07-13 15:24:17 +03:00
Ainar Garipov
c7017d49aa
all: upd chlog
2022-07-13 15:22:20 +03:00
Ainar Garipov
191d3bde49
cherry-pick: home: fix exe path finding
...
Closes #4735 .
Squashed commit of the following:
commit 8228e5f82c9d8056d5567a7f1b13b1365346c4d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:41:19 2022 +0300
home: fix exe path finding
2022-07-13 15:15:10 +03:00
Ainar Garipov
18876a8e5c
cherry-pick: aghalg: impl json.Marshaler for NullBool
...
Updates #4735 .
Squashed commit of the following:
commit 93a0b1dc6b668f7d9fd89d06b8f0f24dcd345356
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 11 17:02:36 2022 +0300
aghalg: impl json.Marshaler for NullBool
2022-07-13 15:14:54 +03:00
Eugene Burkov
aa4a0d9880
cherry-pick: 4698 Gateway IP in DHCP Lease
...
Closes #4698 .
Squashed commit of the following:
commit 6be0caee58926f8cea1e10650fbde0c8d97d0dac
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jul 8 13:41:50 2022 +0300
update translation
commit e0370656d05e8463d73ea73568cae81187c6b2e3
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jul 8 13:40:54 2022 +0300
client: validate static lease ip
commit 7f4d00f9f3a54dc93ce5d5c45e9c21745f6e39d1
Merge: 2ee79626 77e5e27d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 8 13:20:15 2022 +0300
Merge branch 'master' into 4698-lease-with-gateway
commit 2ee79626a1b0c7b113dbd22ba4ef6e85ea9913ec
Merge: 471b96b8 3505ce87
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 7 19:34:33 2022 +0300
Merge branch 'master' into 4698-lease-with-gateway
commit 471b96b81da8920c1e71b7110050154f912677d2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 7 16:07:23 2022 +0300
dhcpd: imp docs
commit 67dd6c76f7d2df4712a57281e0f40f2ee1a1efa2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jul 7 15:48:47 2022 +0300
dhcpd: restrict gateway ip for lease
2022-07-13 15:14:32 +03:00
Dimitry Kolyshev
d03d731d65
cherry-pick: all: updater exe name
...
Merge in DNS/adguard-home from 4219-updater to master
Squashed commit of the following:
commit f569a5f232330b83c234838a5bff8ae5277f152f
Merge: a90b4fa7 3505ce87
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jul 7 22:14:50 2022 +0530
Merge remote-tracking branch 'origin/master' into 4219-updater
# Conflicts:
# CHANGELOG.md
commit a90b4fa7782c5ec4531d8e305c0d448e84898239
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jul 7 21:56:17 2022 +0530
home: imp code
commit da0f96b976e430fffc531072ef3e2384bc8b1f09
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jul 7 21:48:40 2022 +0530
updater: exe name
commit 246dc9ca3b133cbc93ea59edd272674b87ff8de3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jul 7 19:18:02 2022 +0530
all: imp docs
commit 042382d170c4d68ff67fe5544a75371337529623
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jul 7 18:02:25 2022 +0530
all: updater exe name
commit a180c4673ead66788969865784348634af1a739e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jul 7 17:47:46 2022 +0530
docs: updater exe name
commit 1a98a6eadbd96add0a488fb8f89fb7d8b0ffb3d0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jul 7 17:40:44 2022 +0530
all: updater exe name
commit 1b13f5d85550dc71b08fd8e5b4258f8414a38759
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jul 7 17:14:57 2022 +0530
all: updater exe name
2022-07-13 15:14:06 +03:00
Ainar Garipov
33b58a42fe
cherry-pick: all: use canonical names for hosts file runtime clients
...
Updates #4683 .
Squashed commit of the following:
commit daa8fdaee574d4ac2171f6b13c5ce3f3fedd9801
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 7 19:13:29 2022 +0300
all: use canonical names for hosts file runtime clients
2022-07-13 15:13:06 +03:00
Eugene Burkov
2e9e708647
cherry-pick: 4699 dhcp ptr
...
Merge in DNS/adguard-home from 4699-dhcp-ptr to master
Closes #4699 .
Squashed commit of the following:
commit 0a8e2b3e22b7fad28a53db65031cc39d8755ecf4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jun 28 18:40:53 2022 +0300
dnsforward: imp naming again
commit 0b0884a8305f18f7f69560b86be8837933e220e9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jun 28 18:26:58 2022 +0300
dnsforward: imp naming
commit e193f53d9a1dd76d41396c06e2ec5a1e7d176557
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jun 28 17:26:00 2022 +0300
all: imp chlog
commit 8ac9f84f086d9cb0b0f9da72bfc51f9b70a3dab7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jun 28 17:18:48 2022 +0300
all: log changes
commit 7cdc175d02b6eacfcb6ba62a5424d11e2561a879
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jun 28 17:03:52 2022 +0300
dnsforward: add tld to dhcp leased hostnames
2022-07-13 15:11:37 +03:00
Eugene Burkov
8ad22841ab
cherry-pick: 4677 openwrt service
...
Merge in DNS/adguard-home from 4677-openwrt-service to master
Updates #4677 .
Squashed commit of the following:
commit 6aed4036d3338a601a7ec5ef1ca74a407ae4c0e2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jun 20 14:49:33 2022 +0300
home: imp docs
commit 54e32fa47ed11e50c6405ced90a400e4e69f021d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jun 20 14:30:08 2022 +0300
home: fix wrt svc
2022-07-13 15:06:04 +03:00
Ainar Garipov
32cf02264c
cherry-pick: 4326 improve dockerfile
...
Updates #4326 .
* commit 'f987c2559825923b22e910d01c2d42fb06231acc':
scripts: imp docs; upd alpine
Simplify Dockerfile Alpine Linux apk usage
2022-07-13 15:04:26 +03:00
Ildar Kamalov
0e8445b38f
cherry-pick: 4659 fix url value in filter table actions
...
Updates #4659
Squashed commit of the following:
commit e1bcda9566bd9f1cca965f4308c337a9adf2ce04
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 14 17:40:09 2022 +0300
client: fix url value in filter table actions
2022-07-13 15:03:54 +03:00
Eugene Burkov
cb27ecd6c0
cherry-pick: more sysv
...
Merge in DNS/adguard-home from 4480-sysv-again to master
Updates #4480 .
Squashed commit of the following:
commit 263fa05ab19de95b18fb07f6c89e4b9a1b24657b
Merge: 360a6468 d3f39b0a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jun 14 13:36:15 2022 +0300
Merge branch 'master' into 4480-sysv-again
commit 360a646833ca9e0e01cb6d085e70b898a30dc2d0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jun 9 18:15:41 2022 +0300
home: rename linux file
commit c3032533b7e00136c25d15a4ad771bb8a9c13e31
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jun 9 18:06:25 2022 +0300
home: imp code
commit 2381c4a6ab4f6dca88123ff7b0a92f2cf9a420a8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jun 9 17:48:22 2022 +0300
home: wrap sysv service
2022-07-13 15:03:38 +03:00