Ainar Garipov
ee619b2dbd
Pull request 2195: upd-go-code
...
Squashed commit of the following:
commit a1bd3c249be043108c84a902d2e88bf80946d444
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 4 14:59:37 2024 +0300
all: upd more
commit 9e55bbb02c2af2064aa2a2ca7b49fd28b544a02c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 4 14:12:45 2024 +0300
all: upd go code
2024-04-04 15:52:39 +03:00
Ainar Garipov
5cc05e2c4b
Pull request 2187: upd-golibs
...
Squashed commit of the following:
commit 63c14cf0eb395f58149f5a82ff1389353f7f8127
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 2 20:10:10 2024 +0300
all: imp code, docs
commit 185ccdd1d9f5acc8376fabeac647f6fddcf108b5
Merge: b6ca80a9f d4fff41b3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 2 20:04:23 2024 +0300
Merge branch 'master' into upd-golibs
commit b6ca80a9f639394758cc9000345c132a713c183c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 2 20:01:10 2024 +0300
all: upd to tags
commit 474f62319befbe22cf1bccd2320cd0d3da1629b1
Author: Ainar Garipov <a.garipov@adguard.com>
Date: Tue Mar 26 16:33:45 2024 +0300
all: upd golibs
2024-04-03 13:44:51 +03:00
Dimitry Kolyshev
7d9f33b2f0
Pull request: 6717-fix-conf-symlink
...
Updates #6717 .
Squashed commit of the following:
commit d17a6de1485e68887a1732dfaa6844f433519b9f
Merge: 806ff9bad 9305c4581
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 1 09:22:33 2024 +0800
Merge remote-tracking branch 'origin/master' into 6717-fix-conf-symlink
# Conflicts:
# CHANGELOG.md
commit 806ff9bad09e8bf253a1bdc379fbed2b1a56c5a7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 28 09:00:00 2024 +0800
home: imp code
commit 06dbcfead7c43fac146e92e4a83145dcd5c07b40
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 27 13:55:30 2024 +0800
all: changelog
commit 5476625eacfda06efec768865e0885c502d37607
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 27 13:43:17 2024 +0800
home: fix conf symlink usage
2024-04-01 11:31:51 +03:00
Stanislav Chzhen
3b12ff2cc2
Pull request 2166: 5829-trusted-ip
...
Updates #5829 .
Squashed commit of the following:
commit 8a93b30d5bd1c40c30bd10cd3fc77c3a3a64cb71
Merge: 8e4429c48 54f77c010
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 20 19:15:07 2024 +0300
Merge branch 'master' into 5829-trusted-ip
commit 8e4429c483c0fd6fffdc93fa808adcca6678bc3e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 20 18:37:26 2024 +0300
all: upd chlog
commit b598a8d1ea239cc574bfdfdd6a2da47792582589
Merge: 1f58bf8fd 054233962
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 20 18:34:13 2024 +0300
Merge branch 'master' into 5829-trusted-ip
commit 1f58bf8fd1bc3b3790475651cb87494885cadf66
Merge: ffb4b9a65 c64a36c94
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 20 17:09:09 2024 +0300
Merge branch 'master' into 5829-trusted-ip
commit ffb4b9a65fea5555d0d401194d3fc3820b2e6766
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 14 17:40:07 2024 +0300
home: fix alignment
commit 7f11807ff13eff286be1d3bd4b796273454bdbda
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 14 17:35:13 2024 +0300
all: imp code
commit 2aee9a66c70af929e28653245eb73c0f29a46e97
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 11 18:17:58 2024 +0300
home: real ip in logs
2024-03-20 19:25:59 +03:00
Eugene Burkov
4e3b53f1b7
Pull request 2174: 6820 Warn local ptrs
...
Squashed commit of the following:
commit c2319658a49eb750c9c362632697c481ff560c71
Merge: c6162a211 bcd143068
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 14 18:10:20 2024 +0300
Merge branch 'master' into 6820-warn-local-ptrs
commit c6162a211b96e220271383bd8c84e87ad44ba7f8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 13 19:35:20 2024 +0300
dnsforward: fix doc
commit c6cce9644e629a085f3b66cac503e9de0bc9b753
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 13 19:19:49 2024 +0300
all: fix private conf fail on start
commit c11fc3e7abcd4f592d44a3c163b554017eb305a0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 13 18:43:31 2024 +0300
WIP
2024-03-14 18:19:27 +03:00
Eugene Burkov
3608a2def2
Pull request 2171: AG-28455 remove checkout
...
Squashed commit of the following:
commit 3b90850dae360878925a82a48eeb360ecf6c6969
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 13 15:34:11 2024 +0300
version: sort version strings
commit 7a9cb73a2f6c3579e104745b5c31abdd9edc8e33
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 13 13:02:36 2024 +0300
all: account candidate channel
commit 76d237412f17ddfdd09def97f13489a4fc98d641
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 12 20:02:55 2024 +0300
bamboo-specs: add todo
commit f99c726386a4a3ef322a32677a6c0a0e2dd6bbcc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 12 20:01:38 2024 +0300
bamboo-specs: revert release
commit 70a3b3e93647ed9474e0679e6e2d91b4b06691d4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 12 19:58:20 2024 +0300
bamboo-specs: rm explicit checkout
2024-03-13 15:51:22 +03:00
Stanislav Chzhen
31c3d7d302
Pull request 2155: AG-27492-client-persistent-index
...
Squashed commit of the following:
commit 1f99640f9f0a24ade7d2325737edf83ad0da3895
Merge: 5a9211e8c 9276afd79
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 27 13:13:03 2024 +0300
Merge branch 'master' into AG-27492-client-persistent-index
commit 5a9211e8c7832700ae4f58cea25ad38ccba98efa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 22 19:08:35 2024 +0300
all: add todo
commit a4fc94904b0b05ed5ca5ba270125a7d7fb1e6817
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 21 14:48:33 2024 +0300
all: client persistent index
2024-02-27 13:48:11 +03:00
Ainar Garipov
9276afd79d
Pull request 2156: 6717-conf-path-logs
...
Updates #6717 .
Squashed commit of the following:
commit 05a7e18923e987ea9bd6294fe675a22cf86f6dce
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 21 16:44:00 2024 +0300
home: imp docs, logs
2024-02-21 17:01:15 +03:00
Stanislav Chzhen
4605e7c90e
Pull request 2153: 6610-hostsfile-enabled
...
Updates #6610 .
Squashed commit of the following:
commit 13522f0768fe0a4f6abe3fc82ffb7ddf3f4df9bf
Merge: befa3bd1d 6fd0a624c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 21 12:53:08 2024 +0300
Merge branch 'master' into 6610-hostsfile-enabled
commit befa3bd1dedcd2853ef299c06d5c14c9ed7f2c84
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 19 15:56:20 2024 +0300
all: upd chlog
commit c1954306fe7c4d7af164f599b298374ab983216f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 15 20:52:52 2024 +0300
home: hostsfile enabled
2024-02-21 13:04:58 +03:00
Stanislav Chzhen
fede297942
Pull request 2138: AG-27492-client-persistent-storage
...
Squashed commit of the following:
commit 37e33ec761cfa30164125af2c5bb40789412355e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 14 15:25:25 2024 +0300
aghalg: imp code
commit 6b2f09a44298b474ec1bdf3d027fb4941d2f7bea
Merge: b8ea924aa 37736289e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 14 15:04:59 2024 +0300
Merge branch 'master' into AG-27492-client-persistent-storage
commit b8ea924aa7ed4c052760a6068f945d83d184e7e3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 13 19:07:52 2024 +0300
home: imp tests
commit aa6fec03b1a1ead96bc76919b7ad51ae19626633
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 13 14:54:28 2024 +0300
home: imp docs
commit 10637fdec47d0b035cf5c7949ddcd9ec564851a3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 8 20:16:11 2024 +0300
all: imp code
commit b45c7d868ddb1be73e119b3260e2a866d57baa91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 7 19:15:11 2024 +0300
aghalg: add tests
commit 7abe33dbaa7221ddbc8b7d802dbfa7f951d90cf8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 6 20:50:22 2024 +0300
all: imp code, tests
commit 4a44e993c9bd393d2cb9853108eae1ad91e64402
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 1 14:59:11 2024 +0300
all: persistent client index
commit 66b16e216e03e9f3d5e69496a89b18a9d732b564
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jan 31 15:06:05 2024 +0300
aghalg: ordered map
2024-02-15 14:08:05 +03:00
Eugene Burkov
2a546aa609
Pull request 2149: 6711 watch hosts
...
Updates #6711 .
Squashed commit of the following:
commit 3ddfe809f76325c2d4cda0715a7bcc15e76a2388
Merge: 185957cd0 d338451fa
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Feb 13 13:01:30 2024 +0300
Merge branch 'master' into 6711-watch-hosts
commit 185957cd01516e5955e388108615e6f131d6ad71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 9 18:11:41 2024 +0300
aghos: imp docs
commit 3afbbcbb7ab6cc60c7c40ef8acd5b3ddf52cb3d1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 9 15:40:02 2024 +0300
all: upd golibs, imp fswatcher
2024-02-13 13:19:22 +03:00
Stanislav Chzhen
d338451faf
Pull request 2145: 5992-stats-qlog-custom-dir
...
Updates #5992 .
Squashed commit of the following:
commit 39d3df705ef68672ec9406d81e00daf52a3b3c70
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 12 15:25:22 2024 +0300
all: fix typo
commit 21e03e4d5a7624a68add53734a127652053845a2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 12 15:22:35 2024 +0300
all: upd docs
commit 11180061619f4352774d4bc8c85b481ae28f0d0b
Merge: ac5fd8dc8 7f8370744
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 12 14:57:35 2024 +0300
Merge branch 'master' into 5992-stats-qlog-custom-dir
commit ac5fd8dc82c9c6e88a182cd6e6aed07bf3548639
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 7 14:55:51 2024 +0300
all: upd chlog
commit fe00652e158db65e0e735a19cf88aa999ece3e62
Merge: 21ad1ecf7 56b98080f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 7 14:53:24 2024 +0300
Merge branch 'master' into 5992-stats-qlog-custom-dir
commit 21ad1ecf7b30c3c8f45d54210d7297966126b0f7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 7 14:52:12 2024 +0300
home: imp docs
commit 739b158de77e673ef80efdaa523044939ea879d5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 5 20:15:50 2024 +0300
home: add stats qlog custom dir
2024-02-12 18:45:51 +03:00
Ainar Garipov
332621f268
Pull request 2147: all: upd deps, go, scripts
...
Squashed commit of the following:
commit 425f1bd28074d22890629d06f43257e0353ce3d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 8 20:15:58 2024 +0300
all: upd deps, go, scripts
2024-02-08 20:39:18 +03:00
Stanislav Chzhen
34aa81ca99
Pull request 2107: AG-28327-upstream-config-parser
...
Squashed commit of the following:
commit e496653b10de52676826ed8e0c461e91405603a8
Merge: db2cd04e9 60a978c9a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 1 18:23:50 2024 +0300
Merge branch 'master' into AG-28327-upstream-config-parser
commit db2cd04e981dd24998d87f4935ff6590ea7854cd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jan 31 16:21:53 2024 +0300
all: upd proxy
commit e8878179b6d094321d56fb2b75c16c1ba8cf637d
Merge: ccbbae6d6 aa872dfe9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jan 31 16:17:34 2024 +0300
Merge branch 'master' into AG-28327-upstream-config-parser
commit ccbbae6d615e110d7d2d4c2a6b35954311153bcf
Merge: d947d900e 8936c95ec
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jan 29 18:31:17 2024 +0300
Merge branch 'master' into AG-28327-upstream-config-parser
commit d947d900e1f759159bc9068589ffe852483cfdd0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jan 29 18:26:01 2024 +0300
dnsforward: imp docs
commit cf9678c098951e2a4bebae7a3a5808d7de4c14c6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jan 25 14:18:04 2024 +0300
dnsforward: imp code
commit 22792a9311cb93b2bb3b804293f87f091b9b81e2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jan 24 13:59:28 2024 +0300
dnsforward: imp code
commit 57ddaaaaaf1009c65f0d9d6b2b1671211f194c85
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jan 22 20:19:44 2024 +0300
all: add tests
commit d6732d13adae4ee46410252a33d092e67da3c34a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jan 22 18:44:57 2024 +0300
all: imp errors
commit e14456571ce2ef43fb217f45445729ce6299daf6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jan 18 19:05:31 2024 +0300
dnsforward: imp code
commit a5c106eae902fbc0a169ef9e4d7bf968f1e40bec
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jan 15 18:36:30 2024 +0300
dnsforward: imp logs
commit 333b8561aa21d778007f808fb8e931ef3e95d721
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Dec 21 15:06:42 2023 +0300
all: imp tests
commit 5b19d6b039
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Dec 15 14:21:58 2023 +0300
all: imp code
commit 15fbd229de
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Dec 13 14:49:40 2023 +0300
all: upstream config parser
2024-02-05 16:12:27 +03:00
Stanislav Chzhen
88b05287d7
Pull request 2129: 6644-fix-nil-deref
...
Updates #6644 .
Co-authored-by: Eugene Burkov <E.Burkov@AdGuard.COM>
Squashed commit of the following:
commit a79f4a35f811ab85302d266839f55143afc6fff8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jan 17 19:53:58 2024 +0300
all: upd chlog
commit 9106dfb65dcfbbe40a0c97964279e8c35d4c8c00
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jan 17 19:43:34 2024 +0300
home: fix nil deref
2024-01-18 16:14:11 +03:00
Dimitry Kolyshev
df40da7c64
Pull request: AG-28961-upd-golibs
...
Squashed commit of the following:
commit b153bbc7100dd9184ca689f1755f068b63e3046b
Merge: d16da0cf6 4508ae860
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jan 17 13:56:34 2024 +0200
Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs
commit d16da0cf61d050afd04f00ffc36bca550548edd9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jan 17 09:52:03 2024 +0200
all: imp code
commit 46aeca7221586ce0cdc91838764bbacdbdfa8620
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jan 17 09:50:10 2024 +0200
all: imp code
commit 32bc83c0a909467655a258e2e879731a90dc96e6
Merge: ee51c6046 6dbeb5b97
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jan 16 15:42:32 2024 +0200
Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs
# Conflicts:
# go.mod
# go.sum
commit ee51c6046632f89fbe5aa8f6d857c239f060aba5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jan 16 10:56:38 2024 +0200
all: upd libs
commit 02c1dbd9b568cb9f6ec52a0e9835d0d39e3cd377
Merge: 1daba8342 58b47adaf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jan 16 10:53:54 2024 +0200
Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs
commit 1daba8342b72163c8a26380e083c4e497d6bb772
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jan 15 11:15:05 2024 +0200
all: upd dnsproxy
commit b1670e8a81c04f400245e1316857578b549e58f1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jan 15 10:46:27 2024 +0200
dnsforward: imp code
commit 7b65a50fca37ad71b68a8bda504839a78b6f7319
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jan 12 14:14:34 2024 +0200
all: upd golibs
2024-01-17 15:06:16 +03:00
Stanislav Chzhen
4508ae860e
Pull request 2122: AG-27492-client-persistent-ids
...
Squashed commit of the following:
commit a0527b86f10596a86357630117607a3c507e4ac2
Merge: 512edaf2d 9694f19ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jan 17 13:15:18 2024 +0300
Merge branch 'master' into AG-27492-client-persistent-ids
commit 512edaf2dc29f19c4fb7860b0c350a5e4180cda4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jan 15 15:50:28 2024 +0300
home: imp docs
commit 4d4b3599918aab8ee6315c7f2f35f70db89e4d02
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jan 11 20:20:42 2024 +0300
home: imp code
commit 8031347b8613cc49a80968e162dd198851eafe7c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jan 11 18:46:20 2024 +0300
home: fix typo
commit 5932b181fe6a0c0bc605070fd9ddcc6617703ab7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jan 11 16:52:49 2024 +0300
home: imp code more
commit 9412f5846795acfb68b009491b1045d1e27d8ddc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jan 11 15:41:23 2024 +0300
home: imp code
commit 855d3201ab1b176ed5fdd32bce933a7795601a6d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jan 10 20:24:49 2024 +0300
home: add tests
commit 112f1bd13acf992b0ba9562c29365b22d5374ec2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Dec 29 18:29:11 2023 +0300
home: imp code
commit 8b295bfa8968c3767bcfaf05c7f109d75af8c961
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Dec 29 14:58:17 2023 +0300
home: persistent client ids
2024-01-17 13:24:21 +03:00
Stanislav Chzhen
1e0ff4d437
Pull request 2119: 6570-querylog-size-memory
...
Updates #6570 .
Squashed commit of the following:
commit 92b2723ac1b2a78138a55cb82a3222f66119bbda
Merge: 2da12283b 0143c3aac
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jan 9 17:07:23 2024 +0300
Merge branch 'master' into 6570-querylog-size-memory
commit 2da12283b5f504fa77f08fa6026fa9a57b806b38
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jan 9 17:04:54 2024 +0300
all: imp tests
commit 1cb404c65d4e9981b709d689fd281253eca01f82
Merge: 5f7d20516 94d437d40
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Dec 28 20:18:00 2023 +0300
Merge branch 'master' into 6570-querylog-size-memory
commit 5f7d20516934867e1a141c19a97edb49407884ee
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Dec 27 15:07:54 2023 +0300
all: imp docs
commit 0b17cfc4243a88606c62e4b1ae893a09149655b5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Dec 25 20:06:09 2023 +0300
all: querylog size memory
2024-01-11 18:38:30 +03:00
Stanislav Chzhen
94d437d404
Pull request 2110: AG-27492-client-persistent
...
Squashed commit of the following:
commit 6605cd17a2e5137cf69c853c2a956b2443e81ce9
Merge: 5b294a268 bec3cab56
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Dec 28 16:51:39 2023 +0300
Merge branch 'master' into AG-27492-client-persistent
commit 5b294a26848e173b26eb9496b3c380b847a9fa1b
Merge: afe4d5f16 d75712bb9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Dec 27 19:13:50 2023 +0300
Merge branch 'master' into AG-27492-client-persistent
commit afe4d5f1659c474173139ed4c841d72306ed27ac
Merge: 05dc0bfda ad147ac7b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Dec 26 14:59:10 2023 +0300
Merge branch 'master' into AG-27492-client-persistent
commit 05dc0bfda2001cececc37c040f0cee632921aae4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Dec 20 19:44:04 2023 +0300
home: imp err msg
commit c3b21c739ccb4436e9606579e3fb46cc32821a81
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Dec 18 15:05:29 2023 +0300
all: imp docs
commit a2118f5aed
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Dec 15 18:27:50 2023 +0300
all: add persistent client uid
2023-12-28 17:26:17 +03:00
Dimitry Kolyshev
1511fabeec
Pull request: AG-28771 conf upstream mode
...
Squashed commit of the following:
commit afb5a0d8a499bccf7761baea40910f39c92b8a20
Merge: 09ac43c85 abf20c6de
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Dec 25 12:55:45 2023 +0200
Merge remote-tracking branch 'origin/master' into conf-ups-mode
commit 09ac43c859ef8cbd3bb0488d1a945589cd59ca19
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 22 14:36:07 2023 +0200
openapi: imp docs
commit d0fbd4349e4bddde73c6e92f75854acfc481ac0d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 22 11:47:10 2023 +0200
all: changelog
commit 105f9c50738733b0736a768fb9ee09d2e7fbf42e
Merge: 62a2cf12d 4bc5c346a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 22 11:27:21 2023 +0200
Merge remote-tracking branch 'origin/master' into conf-ups-mode
# Conflicts:
# openapi/CHANGELOG.md
commit 62a2cf12df694611888e840a5041a9c517cdfddb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 22 10:52:59 2023 +0200
openapi: imp docs
commit 87956c49240da44b216489920feff69996e3502b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Dec 21 12:08:07 2023 +0200
dnsforward: imp code
commit bf74d67ad112735d557be3d8fac75964cd99e375
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Dec 20 15:46:38 2023 +0200
dnsforward: imp code
commit 3a98dee88809a25118a14a1f07eeecbfccb14cd9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Dec 20 15:41:06 2023 +0200
dnsforward: imp code
commit 1499da1fa0319ac3ad914171e807446f2c4d2fdb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Dec 20 13:36:28 2023 +0200
dnsforward: imp code
commit 228c61a5a0f73cc13655cef8bdaa1995b3f7fced
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Dec 20 13:06:11 2023 +0200
dnsforward: imp code
commit 069ee22c6d904db4e983135ce87a9fe8d12b7e9a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Dec 19 12:39:25 2023 +0200
dnsforward: imp code
commit 90919f99a975862dcb07ac82fb740e4404e48bae
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Dec 19 12:10:43 2023 +0200
confmigrate: fix
commit a8c329950423b59098d1f2b16d1da7100dd54f8d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Dec 19 12:08:05 2023 +0200
dnsforward: imp code
commit 58b53ccd97d353fab0df29f13425b5e341c8fdeb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Dec 18 15:10:01 2023 +0200
all: conf upstream mode
2023-12-25 14:16:48 +03:00
Stanislav Chzhen
abf20c6dea
Pull request 2116: fix-nil-deref
...
Squashed commit of the following:
commit bf6cfdb4e2315dc6826daa4c83aef5e961b86ddc
Merge: 3c532f508 4bc5c346a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Dec 25 13:35:45 2023 +0300
Merge branch 'master' into fix-nil-deref
commit 3c532f50876f3d04c63e1377b1143f2436fd37f2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Dec 20 13:59:29 2023 +0300
home: fix nil deref
2023-12-25 13:48:44 +03:00
Ainar Garipov
d32832735c
Pull request 2111: 6545-schema-version
...
Updates #6545 .
Squashed commit of the following:
commit b1969128a99ff21c97feb4e7805b4b8133d7122f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 15 20:04:37 2023 +0300
home: fix import
commit 872ccea1491a8da76cc24db79247438d0ce4d256
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 15 20:01:15 2023 +0300
all: output schema version
2023-12-15 20:27:47 +03:00
Stanislav Chzhen
9241393ed2
Pull request 2083: AG-27492-client-runtime
...
Squashed commit of the following:
commit e4c2abd37f5885a12da5c68179e3dba18534c3be
Merge: 7411b40b2 dae304fc3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Dec 13 13:15:40 2023 +0300
Merge branch 'master' into AG-27492-client-runtime
commit 7411b40b234a438df4c84823fcb19efecf5eb64d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Dec 12 17:51:51 2023 +0300
all: imp code
commit d5edd0258779c6dfba56da1e4d79e0380b137385
Merge: 371f5b23c c908eec5d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Dec 12 13:45:33 2023 +0300
Merge branch 'master' into AG-27492-client-runtime
commit 371f5b23c9507fb6e8e8f8ec1f644ca8e67ea412
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Dec 12 13:44:38 2023 +0300
client: imp code
commit 9aefb1443082a342270a7e5e77a07d5d1518e327
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Dec 8 17:08:07 2023 +0300
all: imp code
commit 3aa51d10aadfd124f36238a31f3d623706e3c870
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Dec 5 19:20:41 2023 +0300
all: imp docs
commit 71d7187e0c14e143865b055e9b01ff61a2e30083
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Dec 1 17:17:06 2023 +0300
all: imp code
commit e09f8a0bd90f295b5a580e24b2696cc78993713a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Nov 30 14:46:53 2023 +0300
all: imp log msg
commit ce0a9454df9a173694395b4dd8b05347a2e56fdc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Nov 28 16:21:01 2023 +0300
all: imp code
commit e84f176aaba6953b22e13a5fa84079a832d30a24
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 22 17:40:18 2023 +0300
all: add client runtime
2023-12-13 13:39:52 +03:00
Dimitry Kolyshev
c908eec5de
Pull request: home: http dns plain
...
Merge in DNS/adguard-home from AG-28194-plain-dns to master
Squashed commit of the following:
commit a033982b949217d46a8ea609f63198916f779a61
Merge: 03fc28211 79d7a1ef4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Dec 12 12:07:39 2023 +0200
Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns
commit 03fc282119a6372fcb4ce17a5d89779ad84589f5
Merge: e31a65931 34a34dc05
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Dec 12 11:07:46 2023 +0200
Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns
# Conflicts:
# CHANGELOG.md
commit e31a659312fffe0cd5f57710843c8a6818515502
Merge: 0b735eb42 7b5cce517
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Dec 11 11:09:07 2023 +0200
Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns
# Conflicts:
# CHANGELOG.md
commit 0b735eb4261883961058aed562c1e72ad1a20915
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 8 15:22:27 2023 +0200
Revert "safesearch: imp docs"
This reverts commit bab6bf3467f8914a34413bbbcdc37e89ff0401a5.
commit bab6bf3467f8914a34413bbbcdc37e89ff0401a5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 8 15:21:23 2023 +0200
safesearch: imp docs
commit aa5e6e30e01bf947d645ac4a9578eeac09c92a19
Merge: 503888447 2b62901fe
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 8 14:48:13 2023 +0200
Merge remote-tracking branch 'origin/AG-28194-plain-dns' into AG-28194-plain-dns
commit 503888447aaf30d48c3fb9a414e8a65beb1a4e23
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 8 14:47:23 2023 +0200
home: imp code
commit 2b62901feb29c9613ae648fa5e83598157207a17
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Dec 8 11:55:25 2023 +0300
client: add plain dns description
commit 3d51fc8ea1955e599953070a4b330dd4e2fd44bc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 8 10:15:53 2023 +0200
all: changelog
commit 59697b5f1ab049bd2259ffe42cef7223531ef7aa
Merge: 81a15d081 b668c04ea
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 8 10:11:59 2023 +0200
Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns
commit 81a15d0818b18f99e651311a8502082b4a539e4b
Author: Natalia Sokolova <n.sokolova@adguard.com>
Date: Thu Dec 7 17:30:05 2023 +0300
client/src/__locales/en.json edited online with Bitbucket
commit 0cf2f880fbd1592c02e6df42319cba357f0d7bc8
Author: Natalia Sokolova <n.sokolova@adguard.com>
Date: Thu Dec 7 17:29:51 2023 +0300
client/src/__locales/en.json edited online with Bitbucket
commit 2f32c59b8b1d764d060a69c35787566cf5210063
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Dec 7 13:14:04 2023 +0200
home: imp code
commit 01e21a26bdd13c42c55c8ea3b5bbe84933bf0c04
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Dec 7 12:14:02 2023 +0200
all: imp docs
commit b6beec6df7c2a9077ddce018656c701b7e875b53
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Dec 7 12:42:21 2023 +0300
client: fix reset settings
commit 93448500d56a4652a3a060b274936c40015ac8ec
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Dec 7 10:55:25 2023 +0200
home: imp code
commit eb32f8268bee097a81463ba29f7ea52be6e7d88b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Dec 7 10:42:23 2023 +0200
home: imp code
commit 873d1412cf7c07ed985985a47325779bcfbf650a
Merge: 627659680 214175eb4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Dec 7 10:22:25 2023 +0200
Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns
commit 627659680da8e973a3878d1722b276d30c7a27bb
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 6 17:39:14 2023 +0300
client: handle plain dns setting
commit ffdbf05fede721d271a84482a5759284d18eb189
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 1 15:12:50 2023 +0200
home: http dns plain
... and 1 more commit
2023-12-12 13:16:01 +03:00
Eugene Burkov
ce868268bc
Pull request 2094: AG-27796 upd golibs
...
Squashed commit of the following:
commit a205c1302e3979d1c4270b11d253b6bc0d292216
Merge: de289ff4f 214175eb4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 7 16:36:53 2023 +0300
Merge branch 'master' into AG-27796-upd-golibs
commit de289ff4f3199bc2dffb029a9804cabe86b3b886
Merge: b2322093c a0ec0b2b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 6 12:12:35 2023 +0300
Merge branch 'master' into AG-27796-upd-golibs
commit b2322093cea0ecdf34be66b56a9ab0fd7b32c7b9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 5 19:20:30 2023 +0300
filtering: imp cognit
commit 563aa45824a2cc9d63d2c394f6a60f053e5d6d3b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 4 17:02:56 2023 +0300
all: imp code
commit 064a00bce4340caa4cea052fa8234cedb8dcea01
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 28 18:41:07 2023 +0300
all: upd golibs
2023-12-07 16:48:55 +03:00
Dimitry Kolyshev
75cb9d412a
Pull request: all: upd dnsproxy
...
Squashed commit of the following:
commit 65525439e8f8868d4bc2b444bad9e96f702dadda
Merge: a6c507977 2965d1fb6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 1 10:02:29 2023 +0200
Merge remote-tracking branch 'origin/master' into upd-dnsproxy
commit a6c507977968c15ec024a36adfdbc1323505a574
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 30 14:55:15 2023 +0200
dnsforward: imp code
commit 5bd6805d54ec5908682481cd942dd1f088e576ff
Merge: 094a9c9b0 0e4e243e8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 30 10:56:58 2023 +0200
Merge remote-tracking branch 'origin/master' into upd-dnsproxy
commit 094a9c9b091182dadcfcc3a7ef312c1032ac42df
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 30 10:54:39 2023 +0200
all: upd dnsproxy
2023-12-01 11:12:03 +03:00
Dimitry Kolyshev
e1995408e4
Pull request: 6263 custom ups cache
...
Updates #6263 .
Squashed commit of the following:
commit f6b704fb58
Merge: 780d001ce
5dd10d9fc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 24 09:55:04 2023 +0200
Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache
commit 780d001cef
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 24 09:53:46 2023 +0200
all: imp locales
commit 820bcf0e23
Merge: e7ca51563
1320043e9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 23 11:16:54 2023 +0200
Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache
# Conflicts:
# CHANGELOG.md
commit e7ca515630
Merge: 23392d08b
0f5e8ca56
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Nov 22 09:49:32 2023 +0200
Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache
commit 23392d08b1
Merge: a09cd190c
feb15745d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Nov 22 09:49:10 2023 +0200
Merge remote-tracking branch 'origin/6263-custom-ups-cache' into 6263-custom-ups-cache
commit a09cd190c0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Nov 22 09:48:43 2023 +0200
home: imp code
commit feb15745d2
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 21 17:27:38 2023 +0300
client: move cache fields to the upstream tab
commit 789060e4d4
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 21 16:28:03 2023 +0300
client: add form fields
commit a700bfb42e
Merge: 7669419b5
db42254d7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Nov 21 11:44:14 2023 +0200
Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache
commit 7669419b59
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Nov 21 11:34:17 2023 +0200
home: imp code
commit 4a9dc1d6c1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 20 15:08:44 2023 +0200
docs: http client docs
commit 944e0d7a4b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 20 13:51:00 2023 +0200
home: http client dns cache
2023-11-24 15:20:32 +03:00
Ainar Garipov
73358263e8
Pull request 2076: 1660-disable-plain
...
Updates #1660 .
Squashed commit of the following:
commit d928a00b7c77a33717fe3e77aace1f1b41a960d2
Merge: 38e401d78 0f5e8ca56
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 22 13:39:34 2023 +0300
Merge branch 'master' into 1660-disable-plain
commit 38e401d7827ce1ea190b5328cadb3bb0ff5a5cba
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 21 20:17:53 2023 +0300
dnsforward: imp validation
commit f9e99cec209078128fef1b147294c7abe3f6ae70
Merge: cb7529682 c8f1112d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 20 16:02:31 2023 +0300
Merge branch 'master' into 1660-disable-plain
commit cb75296821cae594e8c4d17dfdd8be2190aee7f7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 17 14:20:02 2023 +0300
all: add serve_plain_dns
2023-11-22 13:49:02 +03:00
Dimitry Kolyshev
c8f1112d4e
Pull request home: fix client dns cache
...
Merge in DNS/adguard-home from custom-ups-cache-conf-fix to master
Squashed commit of the following:
commit 01a728e74b2e2e709c496794ca7ceb90703a02fc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 20 11:48:01 2023 +0200
home: fix client dns cache
2023-11-20 15:28:08 +03:00
Ainar Garipov
1c0bf95b5a
Pull request 2075: 1660-refactor-dns
...
Updates #1660 .
Squashed commit of the following:
commit ed4923372bad717403c6f593586580daf00a90da
Merge: 85e82520a 388583cef
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 17 16:00:13 2023 +0300
Merge branch 'master' into 1660-refactor-dns
commit 85e82520a45c30a659af8b43879ca059e7a6755f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 17 14:55:11 2023 +0300
home: imp dns conf
commit bd255a77a77d0552f0a8306a045a98200a4ffb58
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 17 14:30:50 2023 +0300
all: imp dns conf
2023-11-17 16:52:41 +03:00
Dimitry Kolyshev
388583cefe
Pull request: custom upstreams cache
...
Merge in DNS/adguard-home from custom-ups-cache to master
Squashed commit of the following:
commit 98428a87520f70cb522701d8eccfe4c529be1e40
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 17 10:53:32 2023 +0200
all: upd dep
commit 775a639af4a2a45220b17e8b0037edc126ff62e4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 17 09:52:31 2023 +0200
dnsforward: imp test
commit e9e2a58b48e8588dfcb28df319d4651e1fe77af5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 17 09:44:46 2023 +0200
docs: changelog
commit a6d67218f037c8fec29e5fa2967476d63c3cfc32
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 17 09:37:17 2023 +0200
all: upd dep
commit b101ff6e0cf393dacdee6fb68d33ba8f11c36280
Merge: d61f4eb88 8bb1aad73
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 16 15:54:05 2023 +0200
Merge remote-tracking branch 'origin/master' into custom-ups-cache
commit d61f4eb8871f8ae8504259998bf9015b29001cfb
Merge: 567a8a4af fdf60eeed
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 13 10:32:22 2023 +0200
Merge remote-tracking branch 'origin/master' into custom-ups-cache
commit 567a8a4af34ad001d0e6d7d2efdc123205569e8c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 13 10:30:24 2023 +0200
home: imp code
commit a3c16facbebc166e5c0c731c1e892b61c0950d9e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 10 14:34:04 2023 +0200
all: imp code
commit 84160eafee1d0f2d0cd3f025f2d5070e4f597ad6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 10 14:31:26 2023 +0200
all: conf custom ups cache
commit b7f6581901ebad96c87e765a305a1fa5b336efbb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 10 14:29:47 2023 +0200
all: conf custom ups cache
commit d07df945d4e7614a679ef5dc77756096abf1e66c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 10 09:26:29 2023 +0200
all: docs
commit 998124bac08889c7d354dd1a099929726725bccc
Merge: f665e2f85 53170d871
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 10 09:24:28 2023 +0200
Merge remote-tracking branch 'origin/master' into custom-ups-cache
commit f665e2f85bce12d95f80aba6614b6bfd4874b122
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 10 09:22:46 2023 +0200
all: conf custom ups cache
commit a4b26973bef4f3b339198ffbe52a50baca303daf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 9 12:46:39 2023 +0200
all: conf custom ups cache
2023-11-17 15:51:51 +03:00
Eugene Burkov
8bb1aad739
Pull request 2070: 4923 gopacket DHCP vol.4
...
Merge in DNS/adguard-home from 4923-gopacket-dhcp-vol.4 to master
Updates #4923 .
Squashed commit of the following:
commit 4b87258c70ac98b2abb1ac95f7e916e244b3cd08
Merge: 61458864f 9b91a8740
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 16 14:05:34 2023 +0300
Merge branch 'master' into 4923-gopacket-dhcp-vol.4
commit 61458864f3df7a027e65060a5f0fb516cc7911a7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 15 18:48:40 2023 +0300
all: imp code
commit 506a0ab81e76beebb900f86580577563b471e4e2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 14 15:59:56 2023 +0300
all: cleanup moving lease
commit 8d218b732662ac4308ed09d28c1bf9f65906d47c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Nov 13 18:13:39 2023 +0300
all: rm old leases type
2023-11-16 14:14:40 +03:00
Eugene Burkov
9b91a87406
Pull request 2064: AG-23599 Upd proxy
...
Merge in DNS/adguard-home from AG-23599-upd-proxy to master
Squashed commit of the following:
commit 31a4da2fe425d648a94f13060e8786ffae0be3ca
Merge: 2c2fb253d 94bceaa84
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 16 13:37:55 2023 +0300
Merge branch 'master' into AG-23599-upd-proxy
commit 2c2fb253d489baa6b97a524b7e3327676ee6aa6f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 15 19:03:20 2023 +0300
dnsforward: imp code
commit 7384365758f80753cc4234184e7bd7311a85435d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 14 17:02:07 2023 +0300
all: imp code
commit 9c0be82285eed0602f593f805cfb7d02ace17a64
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 10 20:21:00 2023 +0300
all: imp code, docs
commit 5a47875882b5afd0264e4d473e884843745ff3f4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 9 16:50:51 2023 +0300
all: upd proxy
2023-11-16 14:05:10 +03:00
Stanislav Chzhen
53170d8711
Pull request 2060: 6368-conf-ratelimit-subnet-len
...
Updates #6368 .
Squashed commit of the following:
commit def3bd7c746c671efaf655c3cfbb1a7664becd85
Merge: 59d678c95 d3862614e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Nov 9 16:27:36 2023 +0300
Merge branch 'master' into 6368-conf-ratelimit-subnet-len
commit 59d678c95978d4ab21b952ef0cae70cad1ad50d8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 8 18:16:40 2023 +0300
all: imp chlog
commit 69d6a57d7facbdc6038612f31796f727adcb107f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 8 17:48:19 2023 +0300
all: upd chlog
commit fa1998352618c839e248eb86c84e75933e0a5d0f
Merge: 236ba3bce f8fe9bfc8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 8 16:22:31 2023 +0300
Merge branch 'master' into 6368-conf-ratelimit-subnet-len
commit 236ba3bceefbe6f9eeb6c70150f5a371f014f60d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 8 16:21:09 2023 +0300
all: upd dnsproxy
commit 771af632f7795af6cdd53ffd81d0294165441439
Merge: 5a23b039e cbcc17a58
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Nov 7 17:51:56 2023 +0300
Merge branch 'master' into 6368-conf-ratelimit-subnet-len
commit 5a23b039e59d1ec5cb2bfea3942da7104db3b9bd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Nov 7 17:49:27 2023 +0300
all: upd dnsproxy
commit 8b7aca3fbd21897183378470fd687380630602eb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Nov 3 16:37:41 2023 +0300
all: upd chlog
commit bd7d23bacc08d8f907e0e7e07a48259bb9ed17e8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Nov 3 15:52:06 2023 +0300
all: conf ratelimit subnet len
2023-11-09 16:44:28 +03:00
Stanislav Chzhen
f3817e4411
Pull request 2053: 6357-auth-log-remote-ip
...
Updates #6357 .
Squashed commit of the following:
commit 0d375446204d126d3fc20db0a0718e849112450b
Merge: 61858bdec 52713a260
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Nov 3 14:47:10 2023 +0300
Merge branch 'master' into 6357-auth-log-remote-ip
commit 61858bdec27f9efb35c6fa5306ace1c0053300ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Nov 3 14:44:58 2023 +0300
all: upd chlog
commit 1eef67261ff1e4eb667e11a58a5fe1f9b1dbdd7c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Nov 2 19:20:41 2023 +0300
home: imp code
commit 2956aed9054309ab15dc9e61bcae59b76ccd5930
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Nov 2 16:10:07 2023 +0300
home: imp docs
commit ca0f53d7c28d17287d80c0c5d1d76b21506acb64
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 31 15:08:37 2023 +0300
home: imp code
commit 6b11b461180f1ee7528ffbaf37d5e76a1a7f208a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Oct 27 19:45:55 2023 +0300
home: auth log remote ip
2023-11-03 16:07:15 +03:00
Ainar Garipov
8b6c260de8
Pull request 2028: upd-golibs
...
Squashed commit of the following:
commit cdb77df24d1f62b2cf4b26a6e65342e6362d2091
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 6 16:31:11 2023 +0300
all: upd golibs
2023-10-06 16:45:48 +03:00
Ainar Garipov
8bb80ba98f
Pull request 2022: 6280-password-length
...
Updates #6280 .
Squashed commit of the following:
commit 85014e27da6f289a4ecdd8cbd05c0bee358da39e
Merge: 2d93201ce 5f61b550f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:58:48 2023 +0300
Merge branch 'master' into 6280-password-length
commit 2d93201cea23517cdf3c2b3a4a4c26b7d89d2511
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:43:05 2023 +0300
client: rm dep
commit 3b11d10af8200110fbb1a1d7a7e6e26715ee0436
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:22:58 2023 +0300
client: imp i18n
commit f88dfc9a991c961b17a9add229a768a5cc127071
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:17:56 2023 +0300
all: imp i18n, names
commit a7874f5f1a057a76e05a009ed5204bb1a3d70f50
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:07:10 2023 +0300
all: fix passwd check
2023-10-05 16:20:28 +03:00
Eugene Burkov
5f61b550fa
Pull request 2021: upd golibs
...
Merge in DNS/adguard-home from upd-golibs to master
Squashed commit of the following:
commit 266b002c5450329761dee21d918c80d08e5d8ab9
Merge: 99eb7745d e305bd8e4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 5 14:21:51 2023 +0300
Merge branch 'master' into upd-golibs
commit 99eb7745d0bee190399f9b16cb7151f34a591b54
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 5 14:14:28 2023 +0300
home: imp alignment
commit 556cde56720ce449aec17b500825681fc8c084bf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 5 13:35:35 2023 +0300
dnsforward: imp naming, docs
commit 1ee99655a3318263db1edbcb9e4eeb33bfe441c8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 5 13:28:39 2023 +0300
home: make ports uint16
commit b228032ea1f5902ab9bac7b5d55d84aaf6354616
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 4 18:56:59 2023 +0300
all: rm system resolvers
commit 4b5becbed5890db80612e53861f000aaf4c869ff
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 4 17:30:16 2023 +0300
all: upd golibs
2023-10-05 15:26:19 +03:00
Stanislav Chzhen
4479b32ad4
Pull request 2020: AG-26236-ring-buffer
...
Squashed commit of the following:
commit 4b9cc9ddf52739fc5f918babedc99ac7ac0e2415
Merge: a6259ed57 39aeaf891
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 3 20:39:58 2023 +0300
Merge branch 'master' into AG-26236-ring-buffer
commit a6259ed5758156e4110ee3ea6a49760d2880ade3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 3 20:30:20 2023 +0300
querylog: imp code
commit 40f9f7cd5a1cff22bcb858020f2cfa9be8399671
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 3 20:11:49 2023 +0300
querylog: fix typo
commit 1aabbadcb5fcbe6a95945c5bd1455b956b85a8d0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 3 20:05:22 2023 +0300
querylog: imp err msg
commit 02913d35b43e190e42765823ccfcdd332839e984
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 3 19:37:47 2023 +0300
aghalg: imp tests
commit 98a7909088d2a65b78afa9fa3113545c94429e65
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 3 19:23:10 2023 +0300
all: imp tests
commit e147804eeafe89e5020cd917784eef3ff2b310d0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 3 18:49:49 2023 +0300
all: imp code
commit 5f21f2f63b7bce89f2bc79c97c7350cd693c956b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Oct 3 14:39:43 2023 +0300
all: add tests
commit 35a45c7dc5d5961f6987da7c69249c56e54e97f5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Oct 2 17:43:09 2023 +0300
all: imp code
commit 21e51fcbe411258eaf830825df9d05b7ddcc187a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Sep 29 18:21:00 2023 +0300
all: add ring buffer
2023-10-03 20:50:43 +03:00
Stanislav Chzhen
93ab0fde23
Pull request 2015: AG-23168-imp-updater-tests
...
Squashed commit of the following:
commit 402ac873839fcf4dfb762872497b740bd55b2dcc
Merge: 209e1b171 af38476ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Sep 21 16:46:47 2023 +0300
Merge branch 'master' into AG-23168-imp-updater-tests
commit 209e1b171cb4c55d177ef5a4198cf24c2bc41195
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Sep 21 14:09:43 2023 +0300
updater: fix windows build
commit d112ca53540e0c999fe126442e8c526ff7e33bf5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Sep 20 18:57:54 2023 +0300
all: imp tests, docs
commit f940724f81a90af6c07de523c8fcce66240dbec9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Sep 20 16:07:48 2023 +0300
all: imp tests
commit 8915818e81360a7f6ff5b652a983ca034ad6d0c4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Sep 19 19:33:20 2023 +0300
all: add test
commit c1cb8df2b056cefc5d7f1b32c089cd0ede0af9d2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Sep 14 19:12:47 2023 +0300
updater: imp tests
2023-09-21 17:07:57 +03:00
Stanislav Chzhen
5c6b3ace4a
Pull request 2012: 6158-fix-context-filters
...
Updates #6158 .
Squashed commit of the following:
commit 7d1661c5d7824cd8cd988f8b1d2b1a600aad00ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Sep 12 17:26:43 2023 +0300
home: fix context filters
2023-09-12 17:46:14 +03:00
Ainar Garipov
5f696da9dc
Pull request 2005: 6181-safebrowsing-default
...
Updates #6181 .
Squashed commit of the following:
commit 3c4d0fe0750823c81548c2e81988ec27c718028f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 8 14:23:13 2023 +0300
home: fix default safe browsing, parental
2023-09-08 15:04:25 +03:00
Stanislav Chzhen
42291cd547
Pull request 1983: 5720-wildcard-ignored-domains
...
Updates #5720 .
Squashed commit of the following:
commit e8093c990f15e2efc496f1a04f87360825e34e96
Merge: df5413eef 28fefaff1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Sep 5 15:06:33 2023 +0300
Merge branch 'master' into 5720-wildcard-ignored-domains
commit df5413eefeac2c7e34eb725db9e2908b5b2d08cb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Sep 5 14:49:05 2023 +0300
confmigrate: imp docs
commit 1644d99b730cc7f22c9d75b8e990149d3ce5b32a
Merge: 9542ee161 1e4517898
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Sep 5 14:23:42 2023 +0300
Merge branch 'master' into 5720-wildcard-ignored-domains
commit 9542ee1616c1dd4bdb6ec9a2af79a2af3858a7e3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Sep 5 12:48:48 2023 +0300
all: upd chlog
commit 183f84a7f73c7bd33669bd108076f60514ca101e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Sep 1 17:11:31 2023 +0300
all: imp chlog
commit a704325352a577a9b6652f011b82180ec3a6e095
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 31 18:59:52 2023 +0300
all: imp code
commit fe99c3b883500850399b1feb72c914ab878b3107
Merge: 7f11e9460 0182b9ec1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 31 18:43:09 2023 +0300
Merge branch 'master' into 5720-wildcard-ignored-domains
commit 7f11e94609027ed821a125d27a1ffde03f37334a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Aug 30 19:57:51 2023 +0300
aghnet: add tests
commit f10f9190ce1064a5d03155e8b6bba61db977897b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Aug 30 18:32:07 2023 +0300
all: add conf migration
commit a53c14df129765366966c5230dd53aa29bdd25c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Aug 30 13:37:30 2023 +0300
all: add ignore engine
2023-09-05 15:13:35 +03:00
Eugene Burkov
1e45178980
Pull request 1991: AG-25392 confmigrate vol.2
...
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.2 to master
Squashed commit of the following:
commit 7bcdf443135523022a7e5ed6b2da05fcd784a896
Merge: 4c25331b5 f84ff2bd0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:33:08 2023 +0300
Merge branch 'master' into AG-25392-confmigrate-vol.2
commit 4c25331b507078670e7f3505384b53179a210292
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:14:23 2023 +0300
confmigrate: fix fmt
commit d7dbfc46a7f825d248cb028d50b60eede941bf67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:07:25 2023 +0300
confmigrate: imp code
commit cd29729a23d1782a0b5fbd1e9153fe61ff3dbc71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 18:21:14 2023 +0300
confmigrate: imp code, split files
commit f075a14c251c68a13152709e14a326ad17c2f889
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 17:19:47 2023 +0300
confmigrate: imp code
commit 37335597e7870184528c1d868e2d5bd5525a74bb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 16:54:13 2023 +0300
confmigrate: imp code, docs
commit 1df0ddcad99e5056b4989d17490ca4b44ae17838
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 14:41:52 2023 +0300
all: add testdata
commit e62690dbe8e458811bbd6b115b4449affa729560
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 31 16:13:14 2023 +0300
all: imp code
commit 0934d5974b31a58b31b12412c3cd1a50810ffc4f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:50:52 2023 +0300
home: don't reread config
commit 7566ab6f330460bd608aae6dc0428a631e2fa4e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:43:57 2023 +0300
all: imp code
commit 6f6aae6290f8d3101f3678ecc705eee7030ad8d5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:25:46 2023 +0300
all: introduce confmigrate
2023-09-04 20:45:50 +03:00
Stanislav Chzhen
905f9615a8
Pull request 1989: AG-24794-client-source
...
Squashed commit of the following:
commit 5cf83aafc8ddfea15b4f8e9b4061af021727f68c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Sep 1 14:58:03 2023 +0300
client: imp code
commit 4325c8f610d1329ad38c800e20275668f1690f51
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Sep 1 14:38:33 2023 +0300
all: add client source
2023-09-01 15:24:44 +03:00
Stanislav Chzhen
0182b9ec18
Pull request 1988: 6158-fix-service-restart
...
Updates #6158 .
Squashed commit of the following:
commit d474a7cb2cdf0a28cf2df320f9095a739241dcc3
Merge: 9c371bde4 53625d891
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 31 17:33:14 2023 +0300
Merge branch 'master' into 6158-fix-service-restart
commit 9c371bde4b32eee7b5b36766095af3d579e14f2c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 31 16:53:11 2023 +0300
aghos: imp code
commit 2722d38ad51ea6b42caf81bbfc41206c95dac358
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 31 16:29:22 2023 +0300
home: imp code more
commit 50de4c3379cf6e46e5a7cf287381d2b2c3b97127
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 31 16:20:18 2023 +0300
home: imp code
commit dcba579fbe5cb82bea391bd08caee9df82c2618b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 31 14:57:24 2023 +0300
home: fix service restart for windows
2023-08-31 17:50:46 +03:00
Eugene Burkov
53625d8913
Pull request 1984: AG-25392 confmigrate vol.1
...
Merge in DNS/adguard-home from AG-25392-confmigrate to master
Squashed commit of the following:
commit 695717573e228a71e387d1b597f0d32f2eb20e67
Merge: 2c4f3e096 27ec6cd59
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 31 16:22:55 2023 +0300
Merge branch 'master' into AG-25392-confmigrate
commit 2c4f3e096bb14724c0d0fcc20e5ac1462068504e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 31 16:13:14 2023 +0300
all: imp code
commit 0fc6854598a67fc5ea74a93ff8c99b32886f43f1
Merge: 719f2db95 a2ca8b5b4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 18:30:36 2023 +0300
Merge branch 'master' into AG-25392-confmigrate
commit 719f2db95a337f343752f5b18ce935bae83127be
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:50:52 2023 +0300
home: don't reread config
commit 2e25fb738b11675d25574da9e5eebacd72a793ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:43:57 2023 +0300
all: imp code
commit be3021f03097e18228dd9904dacc283f2576472e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:25:46 2023 +0300
all: introduce confmigrate
2023-08-31 16:34:15 +03:00
Ainar Garipov
18d15be4e8
Pull request 1985: 2998-hsts
...
Updates #2998 .
Updates #4941 .
Squashed commit of the following:
commit ef6ed6acb89b10c4bf1b0c7ba34002f9d7f2e68c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 30 18:43:25 2023 +0300
all: imp chlog
commit 0957a85d53edcd5eba591e42301191db42a258ad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 30 18:31:46 2023 +0300
home: add hsts when force_https is true
2023-08-30 18:57:36 +03:00
Dimitry Kolyshev
a2ca8b5b4a
Pull request 1979: AG-25263 filtering config
...
Squashed commit of the following:
commit a5607f811ab4642a0e34d3042240e3a9aafc3d84
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 15:44:26 2023 +0300
home: upgrade yaml
commit 0593e4da17613b8770c4567fdd5fbfde31631e6f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 15:01:14 2023 +0300
home: upgrade yaml
commit 59ec4ba0bbe59fb2e95290f4f8101891ce4ff959
Merge: 6555941f5 a325c9b6b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 14:57:41 2023 +0300
Merge remote-tracking branch 'origin/master' into AG-25263-filtering-config
# Conflicts:
# internal/dnsforward/http.go
# internal/dnsforward/http_test.go
# internal/dnsforward/process.go
# internal/dnsforward/process_internal_test.go
commit 6555941f57e99aa8bc2473b8be9e4f096ce665e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 14:38:01 2023 +0300
docs: changelog
commit c66d14cecbb1f08869a90c46e58d08ec03e29de5
Merge: a50ff1622 aac36a2d2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 12:58:41 2023 +0300
Merge remote-tracking branch 'origin/master' into AG-25263-filtering-config
commit a50ff162291f7953912c1bb195bd7b5d802d0ab3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 11:22:12 2023 +0300
home: imp code
commit ef40d073e00d6acb164c0d680ed9971c4e75fbb7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 16:19:14 2023 +0300
home: imp code
commit 5fa09a95e901a72dc5d2a90ba47c96842152587b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 14:47:48 2023 +0300
home: imp code
commit 52bb295120f468faf94c953d0e795d1d58696ef1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 13:33:01 2023 +0300
home: imp code
commit 24cfccf071385d660aeba4ced744ebbacc819686
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 12:24:20 2023 +0300
filtering: imp code
commit 758242b69ee5f351b25407340f989ec6b90d3607
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 10:32:51 2023 +0300
home: imp code
commit 906deaa3bf86af5038fb05a54c34cc9511500ac9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 14:46:01 2023 +0300
dnsforward: imp code
commit 978bb508349cd0b6a1a0bd3df5b879b6a4dd9e29
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 14:40:31 2023 +0300
home: imp code
commit d5b8dd5c930b0ccbe612f320a9908f2849370fd4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 12:34:32 2023 +0300
filtering: imp code
commit d3e5726df6bc93112329ec81bc83932ccf64b8de
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 11:57:33 2023 +0300
home: upgrade yaml
commit 75d701553595786d5695540c001e6d46153351a9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 11:46:55 2023 +0300
home: upgrade yaml
commit cd8cb623b0e6eb00fd05fb62b7445ca4315b94e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 11:29:16 2023 +0300
docs: changelog
commit 31c098d6f8d68a4afa30246c8d067a1ef4586de9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 11:08:48 2023 +0300
docs: changelog
commit 24c88dd5d42b0168a13ea11b3f760eae1e804558
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Aug 27 19:12:55 2023 +0300
home: imp code
commit 94f2d386c9c1b6be5df06525078c90a3d068641f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Aug 27 16:15:05 2023 +0300
home: upgrade yaml
... and 10 more commits
2023-08-30 18:26:02 +03:00
Eugene Burkov
a325c9b6bb
Pull request 1978: 4923 gopacket dhcp vol.2
...
Merge in DNS/adguard-home from 4923-gopacket-dhcp-vol.2 to master
Updates #4923 .
Squashed commit of the following:
commit d0ef7d44af9790ed55401f6f65c7149f4c3658f7
Merge: f92b4c72d a4fdc3e8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 13:43:41 2023 +0300
Merge branch 'master' into 4923-gopacket-dhcp-vol.2
commit f92b4c72de03ceacb9b8890b7cf4307688795ce5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 28 12:33:29 2023 +0300
dhcpd: imp code
commit 63f0fce99a0343af2670943770cfef4694ae93ed
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 24 15:01:34 2023 +0300
all: imp dhcpd code
commit 563b43b4b5ab6c9c9046c7f09008ea3ef344f4e9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 28 17:03:55 2023 +0300
dhcpd: imp indexing
commit 340d3efa90ac4d34ba3d18702692de0fbc0247be
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 28 16:22:43 2023 +0300
all: adapt current code
2023-08-30 14:02:12 +03:00
Stanislav Chzhen
aac36a2d2f
Pull request 1907: 951-blocked-services-schedule-api
...
Updates #951 .
Squashed commit of the following:
commit 6b840fd516f5a87fde0420e3aceb9c239b22c974
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Aug 29 19:53:03 2023 +0300
client: imp docs more
commit 7fc8f0363fbe4c4266cb0f67428fe4d18c351d2d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Aug 29 19:40:00 2023 +0300
client: imp docs
commit 00bc14d5760614f2797714cdc2c4c19b1a94b86e
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 18:43:49 2023 +0300
try to fix lock file
commit d749df74b576091e0b58928d86ea8b3b49f919da
Merge: c69f9230b e1f6229e5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Aug 28 18:14:02 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule-api
commit c69f9230b12f7c983db06b74324b3df77d74b32b
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 17:16:20 2023 +0300
revert eslintrc
commit b37916c2dff0ddea5293d87570bb58e3443d2d21
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 12:02:39 2023 +0300
fix translations
commit f5bb67d81506c687d0abd580049a3eee0af808e0
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 11:43:57 2023 +0300
fix helpers
commit 13ec6a8b3a0acfb62762ae7e46c6e98eb7c82212
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 11:24:57 2023 +0300
remove todo
commit 23724ec2fd683ed17b9f1cee841ad9aaf4c9d04f
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 09:56:56 2023 +0300
add clients schedule form
commit 84d29e558a329068e64e7a95ee183946aa4515b5
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 25 17:44:40 2023 +0300
fix schedule form
commit 83e4017688082e9eb670091d5a24d98157050502
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:58:16 2023 +0300
remove unused
commit ef2b68e138da382e3cf42586ae604e12d9493504
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:57:37 2023 +0300
client: fix translation string
commit 32ea80c968f52f18adbc811b2f06874644cdfe20
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:26:26 2023 +0300
wip schedule
commit 9b770873859186c9424c8d108812e32ddff33bad
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 21 14:29:50 2023 +0300
all: imp naming
commit ea4e9514ea3b264bcce7f2a301db817de4e87059
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jul 19 18:09:27 2023 +0300
all: imp code
commit 98a705bdaa5c1e79394c73e5d75af2416fe9f297
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jul 18 18:23:26 2023 +0300
all: imp naming
commit 4f84b55c7bfc9f7b680feac0ec45f5ea9189299a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 14 15:01:17 2023 +0300
all: add global schedule api
commit 87cf1646869ee9138964b47a27b7493674c8854a
Merge: cabb80ac1 2adc8624c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 14 12:09:29 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule-api
commit cabb80ac16de437a8118bb0166479574379c97a3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 13 13:37:23 2023 +0300
openapi: fix typo
commit 2279b03acbcfc3d76216f8aaf30ae1c7894127bc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 13 12:26:19 2023 +0300
all: imp docs
... and 3 more commits
2023-08-29 20:03:40 +03:00
Stanislav Chzhen
59a4a009a0
Pull request 1977: 6100-fix-query-log
...
Updates #6100 .
Squashed commit of the following:
commit f8a37b46620c8fbe7ff1cf06b70af3805c9dc049
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Aug 28 14:08:41 2023 +0300
home: imp code
commit 2dd357fa3b41c36cec10ba136d4aecb0e41dbba3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Aug 25 19:35:42 2023 +0300
all: imp docs
commit 369f17897ab6befa78af163bead5deb8ceac0fa1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Aug 25 19:26:14 2023 +0300
all: upd chlog
commit c07d80ee437a9eeef547d308d00bcd12d52ed8ff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Aug 25 16:22:58 2023 +0300
home: fix more
commit 3872806618d09b7eaa19eb1ce5cd8df2d55c10ff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 24 15:35:22 2023 +0300
home: fix query log
2023-08-28 16:40:46 +03:00
Stanislav Chzhen
6fea7099a2
Pull request 1967: AG-24794-imp-arpdb
...
Squashed commit of the following:
commit 6f6f6cc5d9b9ae04e369e0b789aaab74f234e6a0
Merge: 9aa3ac58c 8fb76701f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Aug 24 13:29:47 2023 +0300
Merge branch 'master' into AG-24794-imp-arpdb
commit 9aa3ac58c76fc4b2f950a988d63dfebd0652e507
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Aug 23 16:14:02 2023 +0300
scripts: gocognit: add arpdb
commit e99b0534be1891de1c13f4010beeedb4459ccd7c
Merge: 84893bc2d 3722c2846
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Aug 23 16:08:25 2023 +0300
Merge branch 'master' into AG-24794-imp-arpdb
commit 84893bc2d3018c9ee1e411578b33cdb6ba6d3d81
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Aug 23 16:07:43 2023 +0300
arpdb: add todo
commit ad4b3689b51324521bf47c478c61b6008332b4f5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Aug 23 14:02:07 2023 +0300
arpdb: imp code
commit 9cdd17dadbb91ccc3f8e79ba7a21bc365647e089
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Aug 18 19:05:10 2023 +0300
all: imp arpdb
2023-08-24 13:42:17 +03:00
Eugene Burkov
28cfde9212
Pull request 1966: 6050 upd urlfilter
...
Merge in DNS/adguard-home from upd-urlfilter to master
Updates #6050 .
Squashed commit of the following:
commit 80337ab02d616e25fa455e46c9535c088b5c5ea5
Merge: fb2cfd1a5 31f7aaecc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 16:50:49 2023 +0300
Merge branch 'master' into upd-urlfilter
commit fb2cfd1a5c94d92030fc8832615764f100d010e5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 16:22:43 2023 +0300
dnsforward: imp code, docs
commit 2900333bb85d4e064db9de27bd5bfe7c3ef00747
Merge: 977ed35e4 2bfc9fcb1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 18:06:05 2023 +0300
Merge branch 'master' into upd-urlfilter
commit 977ed35e4ed377f1031721d58e0fcb58de1e74ac
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 17:06:30 2023 +0300
all: log changes
commit 1228a0770485799bf50bbe68005dbb0ba9a96a9c
Merge: 78305eb2e 4b4036fa6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 16:51:42 2023 +0300
Merge branch 'master' into upd-urlfilter
commit 78305eb2ebc3854dd11ce35d6b4c7eecccd7cc78
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 15:55:05 2023 +0300
all: upd urlfilter
commit 63a29e18d5034e5f9433121ff7e7c45aebfa1f0f
Merge: 748c53430 762e5be97
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 21 20:12:49 2023 +0300
Merge branch 'master' into upd-urlfilter
commit 748c5343020b0c6d4d4f16eb3d30b875c0a94e0f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 21 20:07:44 2023 +0300
all: imp code, docs
commit 91975140f3305a6793e07142f7c9a75120a4ce8c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 17 16:16:19 2023 +0300
all: upd urlfilter
2023-08-23 16:58:24 +03:00
Eugene Burkov
4b4036fa6a
Pull request 1964: AG-23599 use hostsfile
...
Merge in DNS/adguard-home from AG-23599-use-hostsfile to master
Squashed commit of the following:
commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214
Merge: 38369360b 762e5be97
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 16:33:54 2023 +0300
Merge branch 'master' into AG-23599-use-hostsfile
commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 21 18:09:15 2023 +0300
filtering: imp tests
commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 21 14:00:10 2023 +0300
filtering: imp cognit, cyclo
commit c50c33d7240c2812a715759fabf140e02184b729
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 21 12:57:31 2023 +0300
filtering: imp code
commit 92203b16719a717a2946c0401e166b1b38ddb7bc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Aug 18 17:39:11 2023 +0300
all: imp code, docs
commit 523e8cd50f9136feede657385b7274fa6ba64131
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 17 15:14:02 2023 +0300
all: fix ipv6
commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 17 14:17:27 2023 +0300
all: rm urlfilter from hosts
commit d6666e851680c7e586325ea5970e0356ab919074
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 16 15:09:52 2023 +0300
WIP
commit 4a2732960558bef6636d3c428bad4c7c830016ca
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 16 14:47:13 2023 +0300
all: use hostsfile
2023-08-22 16:45:11 +03:00
Ainar Garipov
05262d7b6b
Pull request 1962: upd-code-deps
...
Squashed commit of the following:
commit 7a24cf8f9c5515f642cbfc7e730b95005eeab11d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 15 14:54:16 2023 +0300
all: upd code, deps, tools
2023-08-15 15:09:08 +03:00
Dimitry Kolyshev
85e87b9c1d
Pull request: 6093-log-conf
...
Updates #6093 .
Squashed commit of the following:
commit f3478b9ad30a025b2a4044ab4ca54517568c833d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Aug 11 15:27:51 2023 +0300
home: imp code
commit 07b51d83eb1491f33ef959406495f3154aadd774
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Aug 11 15:18:00 2023 +0300
all: imp docs
commit 4892c8673af738d9f1b2abd5b1da854f60439bcf
Merge: 7cb376c95 c54635e8a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Aug 11 13:57:02 2023 +0300
Merge remote-tracking branch 'origin/master' into 6093-log-conf
commit 7cb376c953222437aba67120ab14f74341260b20
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Aug 11 12:48:26 2023 +0300
all: docs
commit 89f0d46bd99cebde234e56db6867fdf371d8191b
Merge: 67c776763 94cf50a53
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Aug 11 12:46:26 2023 +0300
Merge remote-tracking branch 'origin/master' into 6093-log-conf
commit 67c7767631da510bcb05856a6556fb6aff172fda
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Aug 11 12:39:26 2023 +0300
home: log conf
2023-08-14 18:53:05 +03:00
Eugene Burkov
94cf50a53d
Pull request 1955: Upd libraries
...
Merge in DNS/adguard-home from upd-libs to master
Squashed commit of the following:
commit 72f4fb7d5ab8eaecb917a843dec56e3fa38b725c
Merge: 8defe106f 111005b8d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 10 19:50:33 2023 +0300
Merge branch 'master' into upd-libs
commit 8defe106fc982ba916f42d5722f1cc0152042d04
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 10 19:38:01 2023 +0300
dnsforward: revert behavior
commit 8ccb2f675373772f8a6f829b80b317fda0c5f730
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 9 18:35:12 2023 +0300
all: imp code
commit a3112d3438a466bae515e56a6ee97394066ba481
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 9 17:26:52 2023 +0300
filtering: revert type
commit 56d2528fb4c8ee5504de0c6ec24050d63c8e6330
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 9 14:57:04 2023 +0300
stats: fix sort
commit 0dbb446602b7536df508a8e53c4a532455c9d064
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 9 14:52:28 2023 +0300
all: upd golibs & dnsproxy
2023-08-10 20:00:17 +03:00
Dimitry Kolyshev
5eb3cd0f92
Pull request 1947: AG-24320 home: pprof conf
...
Squashed commit of the following:
commit bc0facffe41e140fab00edeeeca3b69306cf2ceb
Merge: 71e0806ba c0691cab6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 2 17:34:15 2023 +0300
Merge branch 'master' into pprof-conf
commit 71e0806bac52412cae7cad2748216ece7fbed36f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 2 08:37:51 2023 +0300
all: docs
commit 6ebb6f9a5f4dbeb753dd470879f2e5ff556ee5f1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 1 15:56:45 2023 +0300
home: imp code
commit ca084011cddc20f5c0b770ee38f9ac55d62bff24
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 1 13:57:53 2023 +0300
all: docs
commit 1b498a84d6cb8207d350fceb4db64d45dc2aa46d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 1 13:46:13 2023 +0300
all: docs
commit 0cd76c057e0f3e9e62e5bf38f95080afa830f4ff
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 1 13:00:43 2023 +0300
home: pprof conf
2023-08-02 17:39:33 +03:00
Ainar Garipov
fe0edc0065
Pull request 1948: imp-test
...
Squashed commit of the following:
commit d2e61b0a2406a503d9d7bcd12612ed7e04c1fac6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 1 18:02:29 2023 +0300
client: imp addrproc test
commit f7cf0fb1549299b00fdbe400bb4a96c73530bfe0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 1 17:23:12 2023 +0300
dnsforward: rm mutex
2023-08-01 19:10:41 +03:00
Ainar Garipov
698b963e11
Pull request 1937: imp-filter-upd
...
Squashed commit of the following:
commit 6ce649c06398cf8a6f8e1a90f560fa8205f6500e
Merge: 1c6327e5d 996c6b3ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jul 25 17:42:01 2023 +0300
Merge branch 'master' into imp-filter-upd
commit 1c6327e5d4c04393abc5d4d3e4b8568d4c6eca23
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jul 21 17:32:47 2023 +0300
all: imp code; use renameio/v2 consistently
commit 1669288c9b662d1310f83a4e0d3f1f60731188cd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jul 21 16:26:17 2023 +0300
all: add renameioutil; imp flt upd
2023-07-25 17:47:24 +03:00
Ainar Garipov
84a2991ac2
Pull request 1935: upd-pprof
...
Squashed commit of the following:
commit 71d8936bddcf2d2b293015d3091df72aa1333270
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 20 18:48:08 2023 +0300
next/websvc: fix pprof disabling
commit 30cc75d1eb89f7422555c18ad474324ab55eb13b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 20 18:30:29 2023 +0300
all: upd golibs; add pprof to next
2023-07-20 18:57:06 +03:00
Ainar Garipov
685d982924
Pull request 1930: fewer-globals
...
Squashed commit of the following:
commit ce882cfff4c1f7afdf0cba13b39e6ee568eb812f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jul 19 15:56:52 2023 +0300
all: imp code, lint
commit 96fc5c589e7474f4bba291b0a20a0834148bb9c1
Merge: 3e91eea6b b0185201c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jul 18 21:22:32 2023 +0300
Merge branch 'master' into fewer-globals
commit 3e91eea6b68bac51251784e3069b1c9d241da439
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jul 18 19:01:45 2023 +0300
home: rm globals
2023-07-19 16:57:57 +03:00
Ainar Garipov
b0185201c6
Pull request 1931: 6006-fix-cmdline-upd
...
Updates #6006 .
Squashed commit of the following:
commit f974a08856b894fd586cfbba703d98dbcf8c6a97
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jul 18 20:51:58 2023 +0300
home: fix cmdline update
2023-07-18 21:20:43 +03:00
Stanislav Chzhen
33ce24abe4
Pull request 1922: AG-23889-upd-dnsproxy
...
Merge in DNS/adguard-home from AG-23889-upd-dnsproxy to master
Squashed commit of the following:
commit ec61d4824946d28bf898d023d3321753273b7df3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jul 18 19:09:32 2023 +0300
all: imp code
commit 271f1ca0e6e583c829519cb0b5b24ab070e08933
Merge: 684c5aedc dee7c0681
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jul 18 17:54:52 2023 +0300
Merge branch 'master' into AG-23889-upd-dnsproxy
commit 684c5aedc7206578f89b80932999e714506d5ce0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jul 18 16:51:17 2023 +0300
dnsforward: save prev proxy behavior
commit 9032c2179b941bec6d43b3e6bafdca5125a462b4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jul 17 17:45:10 2023 +0500
dnsforward: use proxy ua
commit f658c031957fe45243e66a589ed32294e9aa4e27
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jul 17 17:37:03 2023 +0500
dnsforward: fix private rdns ups conf for dns64
commit 70080e347dbc32cbdcb7d757514da13f865f8381
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 13 16:56:34 2023 +0300
all: upd dnsproxy
2023-07-18 20:02:01 +03:00
Ainar Garipov
7bfad08dde
Pull request 1927: 6006-use-address-processor
...
Updates #6006 .
Squashed commit of the following:
commit ac27db95c12858b6ef182a0bd4acebab67a23993
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jul 18 15:47:17 2023 +0300
all: imp code
commit 3936288512bfc2d44902ead6ab1bb5711f92b73c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 17 19:23:46 2023 +0300
all: imp client resolving
2023-07-18 17:02:07 +03:00
Ainar Garipov
40884624c2
Pull request 1916: 5990-root-ignore
...
Updates #5990 .
Squashed commit of the following:
commit 1d5d3451c855681a631b85652417ee1bebadab01
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jul 11 20:11:45 2023 +0300
all: allow ignoring root in querylog and stats
2023-07-11 20:42:40 +03:00
Ainar Garipov
61ed743748
Pull request 1913: parental-cache-size
...
Squashed commit of the following:
commit 6e7dcf0c59c478869e65cb6945d8d262b9eb1879
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 10 19:44:49 2023 +0300
home: fix parental cache size
2023-07-10 20:00:29 +03:00
Stanislav Chzhen
c21f958eaf
Pull request 1878: AG-22597-imp-rdns
...
Squashed commit of the following:
commit ccad155c34989943d88a0a260c50845d1f4ece6b
Merge: 0cd889f6a 5a195b441
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 6 17:00:58 2023 +0300
Merge branch 'master' into AG-22597-imp-rdns
commit 0cd889f6a500f5616af0f8d8fdcde0403b87ad4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 6 12:20:49 2023 +0300
dnsforward: imp code
commit 1aaa1998b914b0d53142c21fa3bdcae502e4f3f6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jul 4 20:11:55 2023 +0300
home: add todo
commit aed232fcf70ef546f373d5235b73abcb4fbb4b6c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jul 4 13:25:28 2023 +0300
all: imp code, tests
commit 5c028c2766ffb8ebdc358a245a249c6a55d9ad81
Merge: 83d6ae7f6 97af062f7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jul 3 18:54:42 2023 +0300
Merge branch 'master' into AG-22597-imp-rdns
commit 83d6ae7f61a7b81a8d73cd6d747035278c64fb70
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jul 3 18:53:05 2023 +0300
home: imp code
commit 8153988dece0406e51a90a43eaffae59dba30a36
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 30 18:06:09 2023 +0300
all: imp code
commit 00d3cc11a9378318f176aae00ddf972f255d575c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 30 13:05:04 2023 +0300
all: add tests
commit ffdc95f237bfdb780922b4390d82cdc0154b0621
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 29 15:20:00 2023 +0300
all: imp code, docs
commit 0dc60e2b355750ca701558927d22fb9ad187ea7e
Merge: 69dd56bdb d4a4bda64
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 29 15:13:19 2023 +0300
Merge branch 'master' into AG-22597-imp-rdns
commit 69dd56bdb75056b0fa6bcf6538af7fff93383323
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 14:36:29 2023 +0300
rdns: add tests
commit 16909b51adbe3a3f230291834cc9486dd8a0e8f8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 19 16:28:26 2023 +0300
rdns: extract rdns
2023-07-06 17:10:06 +03:00
Dimitry Kolyshev
5a195b441c
Pull request: log-yaml-conf
...
Updates #4897 .
Squashed commit of the following:
commit 8a961157c9930bf4859ce2209e5016ce94987e12
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jul 5 10:13:24 2023 +0400
home: imp code
commit 509c07eed06311d773bc3e34b3ca28d9f14186fe
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 4 17:33:31 2023 +0400
all: fix
commit f032e28f98552f238721491c998fca2d7d4b9802
Merge: ee0113435 c46516475
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 4 17:31:29 2023 +0400
Merge remote-tracking branch 'origin/master' into log-yaml-conf
# Conflicts:
# CHANGELOG.md
commit ee011343512e82d4e21cb402759d0284523ba02a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 4 12:31:42 2023 +0400
all: changelog
commit 07f4c4a244b1b6200d3056cde5ebced6254084a7
Merge: 2042c0753 97af062f7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 4 12:25:21 2023 +0400
Merge remote-tracking branch 'origin/master' into log-yaml-conf
commit 2042c0753ec29de6045c3f1de6d075cb93d6ec27
Merge: a1d3a5130 8004b135b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jul 3 16:25:26 2023 +0400
Merge remote-tracking branch 'origin/master' into log-yaml-conf
commit a1d3a51307e80f9e509bd6f3bee1a7b17bf1ffe6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jun 30 11:11:32 2023 +0400
home: imp code
commit 2392a3b02620b8c38e88afb4d75988be85fe1338
Merge: 4224fbed7 39f5c50ac
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 16:46:47 2023 +0400
home: imp code
commit 4224fbed7113e94bee44d0ab0272e8302a8086f3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 16:39:35 2023 +0400
home: imp code
commit 5ce708cc50bed83e64f062e599fc8b6143d0d44d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 12:48:42 2023 +0400
all: docs
commit 4b6d898a888818410f59b843c3ca1a685aafec82
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 12:20:54 2023 +0400
home: imp code
commit 431b44eda71f488c747c3efa4da0a6c222b1cf06
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 12:03:17 2023 +0400
home: imp tests
commit 53a5c31060018c37953beb27d80c46f92bbe14af
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 17:40:49 2023 +0400
home: imp docs
commit bfa57d9f21e3326baafd3a52e91d54396d8e03fa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 15:49:40 2023 +0400
home: log conf
commit 49e06dca9dc2ceb2647b7e36dac145ccf78a6c3f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 15:41:02 2023 +0400
home: log conf
commit 9be432dea7cec8ae0c0d3ee1f73c58c76376d07e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 10:45:01 2023 +0400
home: log conf
2023-07-06 10:09:04 +03:00
Stanislav Chzhen
1fd6cf1a2f
Pull request 1901: 5946-fix-blocked-services-client-schedule
...
Updates #5946 .
Squashed commit of the following:
commit cd6ba613fae56d05a2e51ae1a65e9fcf4a39899e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 30 11:27:52 2023 +0300
home: fix blocked services client schedule
2023-06-30 11:56:03 +03:00
Dimitry Kolyshev
39f5c50acd
Pull request: home: http conf
...
Updates #2860 .
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits
2023-06-29 15:29:52 +03:00
Ainar Garipov
6889837785
Pull request 1893: all: imp logs; upd dnsproxy
...
Updates #5285 .
Squashed commit of the following:
commit 8e7d17505492b6983ba9e713455b98652938d73d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 28 13:33:14 2023 +0300
all: imp logs; upd dnsproxy
2023-06-28 13:46:04 +03:00
Stanislav Chzhen
d88181343c
Pull request 1883: 951-blocked-services-client-schedule
...
Updates #951 .
Squashed commit of the following:
commit 94e4766932940a99c5265489bccb46d0ed6cec25
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 17:21:41 2023 +0300
chlog: upd docs
commit b4022c33860c258bf29650413f0c972b849a1758
Merge: cfa24ff01 e7e638443
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 16:33:20 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit cfa24ff0190b2bc12736700eeff815525fbaf5fe
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 15:04:10 2023 +0300
chlog: imp docs
commit dad27590d5eefde82758d58fc06a20c139492db8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 26 17:38:08 2023 +0300
home: imp err msg
commit 7d9ba98c4477000fc2e0f06c3462fe9cd0c65293
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 26 16:58:00 2023 +0300
all: add tests
commit 8e952fc4e3b3d433b29efe47c88d6b7806e99ff8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 16:36:10 2023 +0300
schedule: add todo
commit 723573a98d5b930334a5fa125eb12593f4a2430d
Merge: 2151ab2a6 e54fc9b1e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 11:40:03 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit 2151ab2a627b9833ba6cce9621f72b29d326da75
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 11:37:49 2023 +0300
all: add tests
commit 81ab341db3e4053f09b181d8111c0da197bdac05
Merge: aa7ae41a8 66345e855
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 22 17:59:01 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit aa7ae41a868045fe24e390b25f15551fd8821529
Merge: 304389a48 06d465b0d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 17:10:11 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit 304389a487f728e8ced293ea811a4e0026a37f0d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 17:05:31 2023 +0300
home: imp err msg
commit 29cfc7ae2a0bbd5ec3205eae3f6f810519787f26
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 20:42:59 2023 +0300
all: imp err handling
commit 8543868eef6442fd30131d9567b66222999101e9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 18:21:50 2023 +0300
all: upd chlog
commit c5b614d45e5cf25c30c52343f48139fb34c77539
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 14:37:47 2023 +0300
all: add blocked services schedule
2023-06-27 18:03:07 +03:00
Dimitry Kolyshev
e54fc9b1e9
Pull request: web-addr-cmdline
...
Merge in DNS/adguard-home from web-addr-cmdline to master
Squashed commit of the following:
commit 27652dbfae227f9a9f4d921f14af1e5897d7830d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 17:51:43 2023 +0400
home: web-addr opt
commit b234d108e70fed3ff11eeb4986946f8a50dda515
Merge: eef1b5cbb 66345e855
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 17:10:57 2023 +0400
Merge remote-tracking branch 'origin/master' into web-addr-cmdline
# Conflicts:
# CHANGELOG.md
commit eef1b5cbb9f7dd9819c8038800a4bbcf3ff575aa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 17:04:12 2023 +0400
all: docs
Updates #4231 .
commit b4adb0bae82e44101f7b6685a29926c3d02e95af
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 16:58:12 2023 +0400
all: docker
Updates #4231 .
commit a4012fddc50a3f5143136df8f3b865d7e1b9087c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 11:24:02 2023 +0400
all: docker
commit bd5cc3308298b1022dea501c2fe79d96df24ce2a
Merge: 36841dd85 123ca8738
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 11:22:51 2023 +0400
Merge remote-tracking branch 'origin/master' into web-addr-cmdline
commit 36841dd85fe1d006e6ec518329cb8ceea0915599
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 21 11:53:40 2023 +0400
all: docker
commit 5c4756a56d251f1486b92f333f11485b5f4807f4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 21 11:50:41 2023 +0400
all: imp docs
commit 7b6fba81f2d5a354bdf259d812d04f3bd64de0c6
Merge: 54c119024 ca313521d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 21 11:47:36 2023 +0400
Merge remote-tracking branch 'origin/master' into web-addr-cmdline
commit 54c119024f3999d5c4dec06b21e3bb78803bf388
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 20 15:57:54 2023 +0400
home: imp code
commit c87e0a690376aa6a28a018c3cbbb5de0ad16333d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 20 15:56:45 2023 +0400
all: imp docs
commit de240d00e334f7fd3dbf39ac08472183deeb32db
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 20 15:54:27 2023 +0400
all: docker
commit 568d5371e73fb6c5ba19a036e7a5135764f6538b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 20 13:38:53 2023 +0400
all: docs
commit 407e230c8e3bc293e8d533ca5db1f28fec4b3c54
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 20 13:24:23 2023 +0400
home: deprecate opts
commit 6e628fad6f4ee9f23213eeb55bec500db4435175
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 20 13:18:10 2023 +0400
home: web-addr opt
2023-06-23 10:03:01 +03:00
Stanislav Chzhen
37e046acc4
Pull request 1886: fix-blocked-services-client-schedule
...
Merge in DNS/adguard-home from fix-blocked-services-client-schedule to master
Updates #951 .
Squashed commit of the following:
commit 1c890953ff4b7862db10f99f4851797050ad9d8e
Merge: ac0b722d1 f40ef76c7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 22 15:54:03 2023 +0300
Merge branch 'master' into fix-blocked-services-client-schedule
commit ac0b722d1deef664ab464e0bff387542e027bd3f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 22 14:32:03 2023 +0300
home: fix typo
commit 64eb519c4b77cff1071059f1f41acfd0e3ea9513
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 22 14:23:07 2023 +0300
home: add test case
commit c7b60f3ea89e41f8b84bf6f2f5e075e9b3dd45ec
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 22 12:00:24 2023 +0300
home: imp code
commit 7806c920bb0c4b4c44c3fed7e920f795904630b2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 20:49:47 2023 +0300
home: add tests
commit d37c9fde882965f005ddec86ad0502585d2eea95
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 18:49:43 2023 +0300
home: fix client blocked services
2023-06-22 15:58:09 +03:00
Eugene Burkov
f40ef76c79
Pull request 1861: 4923-gopacket-dhcp vol.1
...
Merge in DNS/adguard-home from 4923-gopacket-dhcp to master
Updates #4923 .
Squashed commit of the following:
commit edf36ce8b1873272c3daebe8cc8f8132793aac44
Merge: a17513d3e 123ca8738
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jun 22 14:14:39 2023 +0300
Merge branch 'master' into 4923-gopacket-dhcp
commit a17513d3e0a9e596d56444dfa46478eee15631de
Merge: f04727c29 994906fbd
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jun 21 17:49:09 2023 +0300
Merge branch 'master' into 4923-gopacket-dhcp
commit f04727c29eaf22f9eb53f3aa33d42d00e177b224
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jun 20 15:42:31 2023 +0300
home: revert clients container
commit c58284ac6b5b2274da5eed2e853847d757709e5b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jun 19 21:10:36 2023 +0300
all: imp code, names, docs
commit 4c4613c939e1325d11655822d9dbc3f05a6d203c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jun 13 18:51:12 2023 +0300
all: imp code
commit 0b4a6e0dd561d9b7bb78dea21dcc947bcd0bd583
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jun 7 18:40:15 2023 +0300
all: imp api
commit 0425edea03d6ca0859657df683bef6ec45bfc399
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jun 5 15:57:23 2023 +0300
dhcpsvc: introduce package
commit 5628ebe6cccf91e2c48778966730bcbbe9e1d9f2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jun 1 17:49:12 2023 +0300
WIP
2023-06-22 14:18:43 +03:00
Stanislav Chzhen
06d465b0d1
Pull request 1858: AG-22594-imp-whois
...
Merge in DNS/adguard-home from AG-22594-imp-whois to master
Squashed commit of the following:
commit 093feed53291d02469fb1bd8d99472597ebd5015
Merge: 956d20dc4 ca313521d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 12:42:40 2023 +0300
Merge branch 'master' into AG-22594-imp-whois
commit 956d20dc473dcec90895b6f618fc56e96e9ff833
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 18:30:48 2023 +0300
whois: imp code more
commit c771fd9c5e4d90e76d079a0d25ab097ab5652a42
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 15:05:45 2023 +0300
whois: imp code
commit 21900fd468e10d9aee22149a6312b8596ff39810
Merge: 8dbe132c0 371261b2c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 11:34:06 2023 +0300
Merge branch 'master' into AG-22594-imp-whois
commit 8dbe132c08d3ad4a63b0d4bdb9d00a5bc25971f4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 11:33:26 2023 +0300
whois: imp code more
commit f5e761a260237579c67cbd48f01ea90499bff6b0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 19 16:04:35 2023 +0300
whois: imp code
commit 2780f7e16aacddad8736f83b77ef9bfa1271f8b1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 16 17:33:47 2023 +0300
all: imp code
commit 1fc67016068b745a46b3d0d341ab14f9f5bdc9aa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 16 17:29:19 2023 +0300
whois: imp tests
commit 204761870764fb10feea20065d79dee8c321e70b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 16 11:55:37 2023 +0300
all: upd deps
commit ded4f59498c5c544277b9c8e249567626547680e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 20:43:32 2023 +0300
all: imp tests
commit 0eed9834ff9dd94d0788ce69d0bb0521fa725410
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 19:31:49 2023 +0300
all: imp code
commit 9f867587c8ad87363b8c8b061ead536c1ec59c5d
Merge: 504e9484d 681c604c2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 14:20:44 2023 +0300
Merge branch 'master' into AG-22594-imp-whois
commit 504e9484dd84ab9d7c84a3f8399993d6422d3b67
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 14:18:06 2023 +0300
all: imp cache
commit c492abe41ace7ad76fcd4e297c22b910a90fec30
Merge: db36adb9c 826b314f1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 16:06:12 2023 +0300
Merge branch 'master' into AG-22594-imp-whois
commit db36adb9c14ce92b3971db0d87ec313d5bcd787e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 15:53:33 2023 +0300
all: add todo
commit 5cf192de9f93cd0d8521a3a6b4ded7f2bc5e0031
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 14:59:26 2023 +0300
all: imp docs
commit 021aa3eb5b9476a93b4af5fc90cc9ccf014ca152
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 5 18:35:25 2023 +0300
all: imp naming
commit 4626c3a7fa3f2543501806c9fa1a19531547f394
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 17:41:00 2023 +0300
all: imp tests
commit 1afcc9605ca176e4c7f76a03a2c996cf7d6bde13
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 12:44:32 2023 +0300
all: imp docs
commit cdd0544ff1a63faed5ced3dae6bfb3b783e45428
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 1 17:21:37 2023 +0300
all: add docs
... and 2 more commits
2023-06-21 12:53:53 +03:00
Stanislav Chzhen
d3ada9881a
Pull request 1854: 951-blocked-services-schedule
...
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits
2023-06-14 15:08:57 +03:00
Stanislav Chzhen
a7680a593a
Pull request 1855: fix-clients-races
...
Merge in DNS/adguard-home from fix-clients-races to master
Squashed commit of the following:
commit 2b29271b4c04b1c3046bd4cb3fb82f82fff0973b
Merge: 7f553feff cbc7985e7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 17:43:07 2023 +0300
Merge branch 'master' into fix-clients-races
commit 7f553feff3aa46ae124a984776b60ed625148a1f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 16:25:43 2023 +0300
home: imp docs more
commit aaf74666cf069fc6cdd5a5e64915fef5675e0382
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 13:57:42 2023 +0300
home: imp docs
commit 50085085da3ae07b58bcc471906725339eec353e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 24 15:41:52 2023 +0300
home: imp code more
commit 9dc001640ec4bef62b2ccaed307a9daeeb3a8d3a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue May 23 15:30:53 2023 +0300
home: imp code
commit fa906e78ec0777c8c585622873addd0f4791554e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue May 23 14:17:16 2023 +0300
home: fix clients races
2023-05-25 17:45:55 +03:00
Dimitry Kolyshev
c77b2a0ce5
Pull request: home: imp code
...
Merge in DNS/adguard-home from home-imp-code to master
Squashed commit of the following:
commit 459297e189c55393bf0340dd51ec9608d3475e55
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 11:42:34 2023 +0300
home: imp code
commit ab38e1e80fed7b24fe57d4afdc57b70608f65d73
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 11:01:23 2023 +0300
all: lint script
commit 7df68b128bf32172ef2e3bf7116f4f72a97baa2b
Merge: bcb482714 db52f7a3a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 10:59:40 2023 +0300
Merge remote-tracking branch 'origin/master' into home-imp-code
commit bcb482714780da882e69c261be08511ea4f36f3b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:48:27 2023 +0300
all: lint script
commit 1c017f27715202ec1f40881f069a96f11f9822e8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:45:25 2023 +0300
all: lint script
commit ee3d427a7d6ee7e377e67c5eb99eebc7fb1e6acc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:44:53 2023 +0300
home: imp code
commit bc50430469123415216e60e178bd8e30fc229300
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:12:10 2023 +0300
home: imp code
commit fc07e416aeab2612e68cf0e3f933aaed95931115
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 11:42:32 2023 +0300
aghos: service precheck
commit a68480fd9c4cd6f3c89210bee6917c53074f7a82
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 11:07:05 2023 +0300
home: imp code
commit 61b743a340ac1564c48212452c7a9acd1808d352
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 17:17:21 2023 +0300
all: lint script
commit c6fe620510c4af5b65456e90cb3424831334e004
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 17:16:37 2023 +0300
home: imp code
commit 4b2fb47ea9c932054ccc72b1fd1d11793c93e39c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 16:55:44 2023 +0300
home: imp code
commit 63df3e2ab58482920a074cfd5f4188e49a0f8448
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 16:25:38 2023 +0300
home: imp code
commit c7f1502f976482c2891e0c64426218b549585e83
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 15:54:30 2023 +0300
home: imp code
commit c64cdaf1c82495bb70d9cdcaf7be9eeee9a7c773
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:35:04 2023 +0300
home: imp code
commit a50436e040b3a064ef51d5f936b879fe8de72d41
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:24:02 2023 +0300
home: imp code
commit 2b66464f472df732ea27cbbe5ac5c673a13bc14b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:11:53 2023 +0300
home: imp code
commit 713ce2963c210887faa0a06e41e01e4ebbf96894
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:10:54 2023 +0300
home: imp code
2023-05-10 16:30:03 +03:00
Stanislav Chzhen
381f2f651d
Pull request 1837: AG-21462-imp-safebrowsing-parental
...
Merge in DNS/adguard-home from AG-21462-imp-safebrowsing-parental to master
Squashed commit of the following:
commit 85016d4f1105e21a407efade0bd45b8362808061
Merge: 0e61edade 620b51e3e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 27 16:36:30 2023 +0300
Merge branch 'master' into AG-21462-imp-safebrowsing-parental
commit 0e61edadeff34f6305e941c1db94575c82f238d9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 27 14:51:37 2023 +0300
filtering: imp tests
commit 994255514cc0f67dfe33d5a0892432e8924d1e36
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 27 11:13:19 2023 +0300
filtering: fix typo
commit 96d1069573171538333330d6af94ef0f4208a9c4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 27 11:00:18 2023 +0300
filtering: imp code more
commit c2a5620b04c4a529eea69983f1520cd2bc82ea9b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 26 19:13:26 2023 +0300
all: add todo
commit e5dcc2e9701f8bccfde6ef8c01a4a2e7eb31599e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 26 14:36:08 2023 +0300
all: imp code more
commit b6e734ccbeda82669023f6578481260b7c1f7161
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 25 15:01:56 2023 +0300
filtering: imp code
commit 530648dadf836c1a4bd9917e0d3b47256fa8ff52
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 24 20:06:36 2023 +0300
all: imp code
commit 49fa6e587052a40bb431fea457701ee860493527
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 24 14:57:19 2023 +0300
all: rm safe browsing ctx
commit bbcb66cb03e18fa875e3c33cf16295892739e507
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 21 17:54:18 2023 +0300
filtering: add cache item
commit cb7c9fffe8c4ff5e7a21ca912c223c799f61385f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 20 18:43:02 2023 +0300
filtering: fix hashes
commit 153fec46270212af03f3631bfb42c5d680c4e142
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 20 16:15:15 2023 +0300
filtering: add test cases
commit 09372f92bbb1fc082f1b1283594ee589100209c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 20 15:38:05 2023 +0300
filtering: imp code
commit 466bc26d524ea6d1c3efb33692a7785d39e491ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 19 18:38:40 2023 +0300
filtering: add tests
commit 24365ecf8c60512fdac65833ee603c80864ae018
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 19 11:38:57 2023 +0300
filtering: add hashprefix
2023-04-27 16:39:35 +03:00
Eugene Burkov
620b51e3ea
Pull request 1840: 5752-unspec-ipv6
...
Merge in DNS/adguard-home from 5752-unspec-ipv6 to master
Closes #5752 .
Squashed commit of the following:
commit 654b808d17c6d2374b6be919515113b361fc5ff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Apr 21 18:11:34 2023 +0300
home: imp docs
commit 28b4c36df790f1eaa05b11a1f0a7b986894d37dc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Apr 21 16:50:16 2023 +0300
all: fix empty bind host
2023-04-21 18:57:53 +03:00
Ainar Garipov
d6043e2352
Pull request 1838: 5716-content-type
...
Updates #5716 .
Squashed commit of the following:
commit 584e6771c82b92857e3c13232e942cad5c183682
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 19 14:54:43 2023 +0300
all: fix content types
2023-04-19 14:58:56 +03:00
Stanislav Chzhen
a91a257b15
Pull request 1817: AG-20352-imp-leases-db
...
Merge in DNS/adguard-home from AG-20352-imp-leases-db to master
Squashed commit of the following:
commit 2235fb4671bb3f80c933847362cd35b5704dd18d
Merge: 0c4d76d4f 76a74b271
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 18 15:09:34 2023 +0300
Merge branch 'master' into AG-20352-imp-leases-db
commit 0c4d76d4f6222ae06c568864d366df866dc55a54
Merge: e586b82c7 4afd39b22
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 18 11:07:27 2023 +0300
Merge branch 'master' into AG-20352-imp-leases-db
commit e586b82c700c4d432e34f36400519eb08b2653ad
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 18 11:06:40 2023 +0300
dhcpd: imp docs
commit 411d4e6f6e36051bf6a66c709380ed268c161c41
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 17 16:56:56 2023 +0300
dhcpd: imp code
commit e457dc2c385ab62b36df7f96c949e6b90ed2034a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 17 14:29:29 2023 +0300
all: imp code more
commit c2df20d0125d368d0155af0808af979921763e1f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 14 15:07:53 2023 +0300
all: imp code
commit a4e9ffb9ae769c828c22d62ddf231f7bcfea14db
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 12 19:19:35 2023 +0300
dhcpd: fix test more
commit 138d89414f1a89558b23962acb7174dce28346d9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 12 18:08:29 2023 +0300
dhcpd: fix test
commit e07e7a23e7c913951c8ecb38c12a3345ebe473be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 12 17:22:27 2023 +0300
all: upd chlog
commit 1b6a76e79cf4beed9ca980766ce97930b375bfde
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 12 13:24:11 2023 +0300
all: migrate leases db
2023-04-18 15:12:11 +03:00
Ainar Garipov
1842f7d888
Pull request 1831: home: imp depr option doc
...
Merge in DNS/adguard-home from imp-option-doc to master
Squashed commit of the following:
commit 267410fcc2c9e757c7d8fb7d9059a709932dda9d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 17 14:30:12 2023 +0300
home: imp depr option doc
2023-04-18 14:18:28 +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
Ainar Garipov
7631ca4ab3
Pull request 1828: AG-21377-default-safe-search
...
Merge in DNS/adguard-home from AG-21377-default-safe-search to master
Squashed commit of the following:
commit 35c66b97c787d02fe6f2ffb6902dcd9b6f9b9569
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 13 20:05:13 2023 +0300
home: fix default safe search svcs
2023-04-13 20:17:59 +03:00
Ainar Garipov
b23ea0a690
Pull request 1816: 5704-rm-endian
...
Updates #5704 .
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian
2023-04-11 20:07:39 +03:00
Ainar Garipov
a186b5c436
Pull request 1815: 5701-log-ip
...
Updates #5701 .
Squashed commit of the following:
commit 332530cbae602e9b0e4c89351bde6b0da017fc67
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 18:56:27 2023 +0300
home: imp docs
commit 35a649ffed9ca736e63842f077411c5f5cbb57f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 18:27:25 2023 +0300
home: fix login attempt logging
2023-04-11 19:43:38 +03:00
Ainar Garipov
0376afb38e
Pull request 1814: AG-21291-web-races
...
Merge in DNS/adguard-home from AG-21291-web-races to master
Squashed commit of the following:
commit 1134013f928aa5e186db3b6d0450e425cb053e9c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 16:52:52 2023 +0300
home: fix web api races
2023-04-11 17:22:51 +03:00
Ainar Garipov
950ecb1f5e
Pull request 1812: AG-21286
...
Merge in DNS/adguard-home from AG-21286 to master
Squashed commit of the following:
commit 587b4a3704fd63aa3da6c1be83f8a49bf4e27b00
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 14:15:05 2023 +0300
all: fix negative pause duration
2023-04-11 15:02:29 +03:00
Ainar Garipov
15bba281ee
Pull request 1807: upd-golibs
...
Merge in DNS/adguard-home from upd-golibs to master
Squashed commit of the following:
commit cde42a72c2140245f345681cbb936ed3bc4645a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 7 13:57:02 2023 +0300
all: upd golibs, use hdrs
2023-04-07 14:21:37 +03:00
Stanislav Chzhen
f9fe3172c4
Pull request 1791: 4299-querylog-stats-clients
...
Merge in DNS/adguard-home from 4299-querylog-stats-clients to master
Squashed commit of the following:
commit 33b80b67224f7c1a15bee8e6a23d9d5bab6ac629
Merge: 61964fdd 5d5a7295
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 7 12:43:22 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients
commit 61964fdd02221abbddedf2d6d02bb0bce6845362
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 7 12:42:01 2023 +0300
dnsforward: imp code
commit 7382168500bab6ca7494d39aabfc2d7bfceb5d24
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 7 11:13:07 2023 +0300
all: imp code, chlog
commit c7852902f635af6c296dcb6735f7b0bfb83f4e87
Merge: aa4dc0a5 a55cbbe7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 6 14:34:24 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients
commit aa4dc0a54e95bc5b24718ec158340b631a822801
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 6 12:54:02 2023 +0300
all: imp code
commit dd541f0cd7ecbf0afcf10ccbd130fd1d1fa4c1c4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 31 13:01:53 2023 +0300
querylog: fix typo
commit d2c8fdb35b04d27c8957fa027882fde704cc07be
Merge: 83d0baa1 2eb3bf6e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 31 12:36:49 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients
commit 83d0baa1f1202f9c62d4be2041d7aed12ee9ab2c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 31 12:35:15 2023 +0300
all: add tests
commit a459f19f25cf9646d145813fe7834b2d9979c516
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 29 16:51:53 2023 +0300
all: add clients querylog stats ignore
2023-04-07 13:17:40 +03:00
Ainar Garipov
b1120221c7
Pull request 1805: imp-pprof
...
Merge in DNS/adguard-home from imp-pprof to master
Squashed commit of the following:
commit 2d56e0820fd26720c87978d0096405257100f3f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 15:10:12 2023 +0300
home: imp rate
commit 97611a26e224f354d42ea16f3193c6cb72de3a48
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 15:03:33 2023 +0300
home: imp pprof block, mutex profiles
2023-04-06 15:14:30 +03:00
Ainar Garipov
61b4043775
Pull request 1803: 5685-fix-safe-search
...
Updates #5685 .
Squashed commit of the following:
commit 5312147abfa0914c896acbf1e88f8c8f1af90f2b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 14:09:44 2023 +0300
safesearch: imp tests, logs
commit 298b5d24ce292c5f83ebe33d1e92329e4b3c1acc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:36:16 2023 +0300
safesearch: fix filters, logging
commit 63d6ca5d694d45705473f2f0410e9e0b49cf7346
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:24:47 2023 +0300
all: dry; fix logs
commit fdbf2f364fd0484b47b3161bf6f4581856fdf47b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:01:08 2023 +0300
all: fix safe search update
2023-04-06 14:12:50 +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
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
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
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