Ainar Garipov
ea03d1af93
Pull request 1821: all: upd chlog
...
Merge in DNS/adguard-home from upd-chlog to master
Squashed commit of the following:
commit a1a550ec26227c2050eb192e1ae53577d699e0ea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 12 16:50:53 2023 +0300
all: upd chlog
2023-04-12 16:56:33 +03:00
Ainar Garipov
67d8b7df90
Pull request 1820: upd-all
...
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 88aee29c6685816eaef8ff63af380d609f308ead
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 12 14:25:19 2023 +0300
all: upd i18n, svcs
2023-04-12 14:29:56 +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
Artem Krisanov
6da7392345
AG-20897 - Fixed bug with checkbox's actual state on filter adding.
...
Updates#5647
Squashed commit of the following:
commit 610f4dae6f7e0e2576669489030eb43bd06d6da6
Merge: fb0c0472 c1924a8b
Author: Artem Krisanov <a.krisanov@adguard.com>
Date: Tue Apr 11 18:16:44 2023 +0300
Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home into 5647-filter-adding
commit fb0c04725c41707ca6a1e4ce36a8e17a6898ee27
Author: Artem Krisanov <a.krisanov@adguard.com>
Date: Mon Apr 10 16:51:45 2023 +0300
Fixed bug with checkbox's actual state on filter adding.
2023-04-11 18:39:46 +03:00
Artem Krisanov
c1924a8b8a
AG-21184 - Added transforming protection_disabled_duration field value from 0 to null;
...
Updates#5689
Squashed commit of the following:
commit 4de24101622c8c76be8e2f1eb1b670c36a1e74c8
Merge: fd9ee1fb 0376afb3
Author: Artem Krisanov <a.krisanov@adguard.com>
Date: Tue Apr 11 18:12:57 2023 +0300
Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home into 5689-protection-status
commit fd9ee1fba4e507875dd8b2b605d14cd78aa4e918
Author: Artem Krisanov <a.krisanov@adguard.com>
Date: Tue Apr 11 14:10:44 2023 +0300
Added transforming protection_disabled_duration field value from 0 to null;
2023-04-11 18:16:24 +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
Stanislav Chzhen
230d7b8c17
Pull request 1813: fix-chlog
...
Merge in DNS/adguard-home from fix-chlog to master
Squashed commit of the following:
commit 47f6b33780d7c1d99a6fc36ddf435db068938174
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 11 16:38:04 2023 +0300
all: fix chlog
2023-04-11 16:43:47 +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
Ildar Kamalov
9e14d5f99f
Pull request: fix missing icons on login page
...
Updates #5620
Squashed commit of the following:
commit 61969c83c3dd6bd6688f0aabc9d6160b53701866
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Apr 10 14:50:47 2023 +0300
AG-20691 fix theme select on login page
commit c87b6c37284021f33f440dcd31be5b653e8e689d
Merge: aa744756 89bf3721
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Apr 10 14:21:01 2023 +0300
Merge branch 'master' into AG-20691
commit aa744756d18d9ed3bc7f60108235d8403e7cb5e0
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Apr 7 15:53:38 2023 +0300
AG-20691 fix missing icons on login page
2023-04-10 17:12:52 +03:00
Stanislav Chzhen
89bf3721b5
Pull request 1800: AG-20352-dhcpd-lease-is-static
...
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-is-static to master
Squashed commit of the following:
commit e4f4278a7ffa0f084ed41472dd3e7de4466c9f50
Merge: b6e3b62e 15bba281
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 11:13:05 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-is-static
commit b6e3b62ed4e7bc17fc3fdd2f4faa940a7f4334c2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 6 15:20:42 2023 +0300
dhcpd: imp naming
commit e2d9ed0832b329f4cebcf8cbfcfadc5755fe441b
Merge: ecd244a6 10bffd89
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 16:53:55 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-is-static
commit ecd244a60841d3cb96d292da688e353650baf645
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 16:53:15 2023 +0300
dhcpd: add lease json form
commit 9ebc246ed4711ff46091326a7cb35ea90b880cff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 13:11:25 2023 +0300
dhcpd: imp code
commit fc3d0cdaebf9e32e73d57e80296f9891896259cf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 13:00:59 2023 +0300
all: fix json
commit d722578543b98b1fefabecd6486f3bc102263d71
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 12:23:34 2023 +0300
dhcpd: add lease is static
2023-04-10 11:17:05 +03:00
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
5d5a729569
Pull request 1806: 5661-fix-protection-update-lock
...
Updates #5661 .
Squashed commit of the following:
commit 02e83c75c8f44f084c0cb8d33b7d6a524c8c1b0e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 19:28:17 2023 +0300
dnsforward: imp logs
commit 0f27265fc94f0e3b8e2dee79dbf9ab5344416c61
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 19:18:19 2023 +0300
dnsforward: imp locks
2023-04-06 19:33:25 +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
f553eee842
Pull request 1804: newline-lint
...
Merge in DNS/adguard-home from newline-lint to master
Squashed commit of the following:
commit 2fc0b662b9ac9d954275c5ebe8c140be4cd365be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 14:16:14 2023 +0300
client: rm line
commit 10246727179a84094edd17fad5cd6f0a5c38b821
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 13:51:06 2023 +0300
all: add newline lint
2023-04-06 14:21:46 +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
a55cbbe79c
Pull request 1802: upd-chlog
...
Merge in DNS/adguard-home from upd-chlog to master
Squashed commit of the following:
commit baab9ebc632d0e66d279e9d65632b1bd6a2d8a22
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 16:54:56 2023 +0300
all: upd chlog
2023-04-05 16:59:14 +03:00
Ainar Garipov
10bffd89c9
Pull request 1801: upd-go
...
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n
2023-04-05 16:12:09 +03:00
Ainar Garipov
91ecbede7d
Pull request 1799: AG-21072-stats-conf-race
...
Merge in DNS/adguard-home from AG-21072-stats-conf-race to master
Squashed commit of the following:
commit 26843b70ab8bfe0fa110c4156f2fd3f53ec5ee74
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 4 20:30:22 2023 +0300
all: imp docs, locks
commit 942a5baa9606376dd06a3ef3284c17133014f768
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 4 19:15:18 2023 +0300
stats: fix conf races
2023-04-05 15:50:14 +03:00
Ainar Garipov
27dbb427a1
Pull request 1798: 4262-ipv6-pref
...
Updates #4262 .
Squashed commit of the following:
commit de64f9c40c00317dbb5dbdda900d9b4c574a0a32
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 19:23:15 2023 +0300
all: add ipv6 boostrap pref
2023-04-04 13:28:21 +03:00
Stanislav Chzhen
195300f56e
Pull request 1778: AG-20200-translation-script-update-auto
...
Merge in DNS/adguard-home from AG-20200-translation-script-update-auto to master
Squashed commit of the following:
commit 22c68f8443c59a5ba7ff7cd33c395f6dcf321e04
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 18:08:40 2023 +0300
scripts: imp err more
commit a6ea94b75c4bb09868f45f5c61d62622acf36d0c
Merge: 69749b17 2a0d0629
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 17:38:05 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 69749b1767bd49d27c96ac17ef049f6ff6827f86
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 17:37:27 2023 +0300
scripts: imp err
commit 6d3eb3270e6fcbe94e9c8f73d654b65a15abcb37
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 13:10:08 2023 +0300
scripts: imp err msg
commit a95e3383f1c27b73eaa570dbe8e008c2bdf22be5
Merge: 16caba76 3575aa05
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 12:06:28 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 16caba76f0a16d70542f6fa0d6d83b134c630da4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 3 12:05:49 2023 +0300
scripts: fix err
commit 3566193a7db677420722938c98089a40809c8739
Merge: 55efdeb8 da9008ab
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 30 13:13:54 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 55efdeb80b44183767b188109f1e21aac2fa9839
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 30 13:13:05 2023 +0300
scripts: simplify
commit 4a090a6f015e4adb9d5a3f6e3c3c5294daf67f1d
Merge: 571b2a29 c576d505
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 29 14:10:06 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 571b2a29777e694971cc02c895328d733b411803
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 29 14:09:17 2023 +0300
scripts: fix log msg
commit 6e92a76c4b9b1240501612878d5f42b3058cba32
Merge: 207c8bac 487675b9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 18:01:58 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 207c8bacd4818c496b409cee96a4b6f65fbf8c24
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 18:01:23 2023 +0300
scripts: add verbose flag
commit e82270f53ce5cf8b1fdb39bff6367fd800483abb
Merge: 11761bdc 132ec556
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 15:09:21 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 11761bdc3d9fd10221d0c21d993db0983d9e222f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 15:08:39 2023 +0300
scripts: upd readme
commit cdac6cf37022e67d4a45be587210765294e96270
Merge: 5f824358 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:28:37 2023 +0300
Merge branch 'master' into AG-20200-translation-script-update-auto
commit 5f82435847d74bf12a7b450b70d9326a57c99da6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:27:01 2023 +0300
scripts: add locale update auto
2023-04-03 18:22:15 +03:00
Ainar Garipov
2a0d062947
Pull request 1797: AG-21072-querylog-conf-race
...
Merge in DNS/adguard-home from AG-21072-querylog-conf-race to master
Squashed commit of the following:
commit fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races
2023-04-03 16:29:07 +03:00
Ainar Garipov
3575aa0570
Pull request 1796: 5661-opt-more-lock
...
Updates #5661 .
Squashed commit of the following:
commit 0a1425df0ea1278c73ac88cbee053897d3daaf1b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 18:31:19 2023 +0300
querylog: opt locks more
2023-03-31 18:44:51 +03:00
Eugene Burkov
f191cb07a5
Pull request 1794: 3290-kill-zombies
...
Merge in DNS/adguard-home from 3290-kill-zombies to master
Updates #3290 .
Squashed commit of the following:
commit 3e0626024243e48e253451a322961e1011976ce3
Merge: 5aa7aa4e 1731ce9c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 31 20:04:04 2023 +0500
Merge branch 'master' into 3290-kill-zombies
commit 5aa7aa4e17c76d1226ba1d44639c67e12454e4e7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 31 16:38:00 2023 +0500
docker: add doc
commit 52a0b671c3f229250988ecd32c0bf909b50fc59b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 31 14:41:41 2023 +0500
docker: add init emulator
2023-03-31 18:07:00 +03:00
Ainar Garipov
1731ce9c63
Pull request 1795: 5661-imp-querylog-logging
...
Updates #5661 .
Squashed commit of the following:
commit 3fac63fb4ac906e61f6bb2d2af5408771d93a206
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 17:24:00 2023 +0300
querylog: imp locks even more
commit bf14ab9a5ea1be83ac156dc5f3d7f3717d50767b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 17:09:25 2023 +0300
querylog: imp locks more
commit 40e885f39b4c38dcd387d4799529b0fa150ed520
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 16:26:15 2023 +0300
querylog: imp locks, logs
2023-03-31 17:39:04 +03:00
Ainar Garipov
2eb3bf6ea5
Pull request 1793: upd-all
...
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 19535409f54360618e1239bddd7ce495d19e0ca4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 30 16:06:49 2023 +0300
all: upd deps, i18n, filters, services, tools
2023-03-30 16:13:19 +03:00
Ainar Garipov
a0349b6c7e
Pull request 1792: 5633-invalid-date
...
Updates #5633 .
Squashed commit of the following:
commit 889bc7acb82472d72d7b3103554e70342513a567
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 30 14:31:42 2023 +0300
client: fix dashboard date
2023-03-30 14:37:05 +03:00
Eugene Burkov
da9008aba3
Pull request 1790: 5624-fix-filter-add
...
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624 .
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly
2023-03-29 19:09:54 +03:00
Stanislav Chzhen
c576d5059e
Pull request 1789: AG-20200-translation-script-fix-upload
...
Merge in DNS/adguard-home from AG-20200-translation-script-fix-upload to master
Squashed commit of the following:
commit 4d898926828dc438c29b0ae7cbad70d8dea0b8de
Merge: 41ad204b 487675b9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 13:30:36 2023 +0300
Merge branch 'master' into AG-20200-translation-script-fix-upload
commit 41ad204bc3ce52ecc61e95261b9519cfc0af9abe
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 13:29:26 2023 +0300
scripts: imp more
commit 5ea4821ee49638ad9011809faba0316a753a078b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 12:38:22 2023 +0300
scripts: imp code
commit 253a72fd0e195c7603883322885b7206ed434918
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 12:04:16 2023 +0300
scripts: add docs
commit bfd70e338c78fd5b0292480d7f54f396593e98ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 10:56:05 2023 +0300
scripts: imp more
commit 547b82785f210cc137903cb5b7e2ee41b2a20e59
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 28 10:08:16 2023 +0300
scripts: imp code
commit a788e5ef8a3aa2633cc9fb64c83534f1d4080ef7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 20:14:55 2023 +0300
scripts: add multipart
commit 39d352edf85288a51931dea5b758bc74dd08e19d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 18:35:08 2023 +0300
scripts: fix more
commit bcbf155135c53789cc5c6c2c7c8b57dd471e4ea2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 27 17:47:40 2023 +0300
scripts: fix upload
2023-03-28 18:02:32 +03:00
Ainar Garipov
487675b9ad
Pull request 1786: rm-context-fields
...
Merge in DNS/adguard-home from rm-context-fields to master
Squashed commit of the following:
commit 402bbba6a68f163cd6a3751a50ecd544eebc875f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:07:11 2023 +0300
aghnet: names
commit 209a2bb7878ee9110595f1fcf09df7f83777b80f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:03:33 2023 +0300
home: typo
commit 61684815c260d5d7a34be612e06714456399a833
Merge: 7adfcf15 132ec556
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:02:18 2023 +0300
Merge branch 'master' into rm-context-fields
commit 7adfcf1576b52f80137aa9044355bfbec6243e28
Merge: 0d5b85f5 0df32601
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 14:25:27 2023 +0300
Merge branch 'master' into rm-context-fields
commit 0d5b85f51b3eb72c3e905d5ad82c17cd932b246b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 13:21:26 2023 +0300
all: rm unnecessary home context fields
2023-03-28 13:27:46 +03:00
Eugene Burkov
132ec556dc
Pull request 1788: 5642-fix-healthcheck-ssl
...
Merge in DNS/adguard-home from 5642-fix-healthcheck-ssl to master
Updates #5642 .
Updates #3290 .
Squashed commit of the following:
commit c457ecbc08f58bb4f31bade314dd447832c5bfed
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 27 15:35:32 2023 +0500
docker: imp docs
commit fddabb95118a85921bf4f50e9b91f4602ba02b0f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 27 15:18:22 2023 +0500
docker: skip ssl check
2023-03-27 13:43:38 +03:00
Eugene Burkov
d58772f177
Pull request 1779: 3290-docker-healthcheck
...
Merge in DNS/adguard-home from 3290-docker-healthcheck to master
Updates #3290 .
Squashed commit of the following:
commit 3ac8f26c1c22855d973910fd13c096776aa8dfa6
Merge: bc17565f 0df32601
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 27 01:09:03 2023 +0500
Merge branch 'master' into 3290-docker-healthcheck
commit bc17565fcb5acba68129734450fb08b4fe341771
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 18:04:08 2023 +0500
all: fix script
commit e150fee8025dacdc5aa1d12916d1f42e89216156
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 17:18:12 2023 +0500
all: imp naming
commit 26b6448d10af39f8363eadd962af228a9d4ae51d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 03:13:47 2023 +0500
all: support https web
commit b5c09ce8b2ac52d6e47a00f76125bee229f616a0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sat Mar 25 20:03:45 2023 +0500
all: imp scripts fmt, naming
commit 8c3798c46974e48cc0c379c2ecc46a6d8d54164b
Merge: e33b0c5c fb7b8bba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sat Mar 25 00:25:38 2023 +0500
Merge branch 'master' into 3290-docker-healthcheck
commit e33b0c5cbfe5a28b29734c9ceee046b0f82a0efe
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:47:26 2023 +0500
all: fix docs
commit 57bfd898b9c468b2b72eba06294ed5e5e0226c20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:44:40 2023 +0500
dnsforward: add special-use domain handling
commit f04ae13f441a25d0b4dc1359b328552f7507fc23
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:05:10 2023 +0500
all: imp code
commit 32f150f88390320d2da85b54e27f6c751eccb851
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 04:19:10 2023 +0500
all: mv Dockerfile, log changes
commit a094a44ccfa26988f0e71f19288e08b26e255e2b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 04:04:27 2023 +0500
all: finish scripts, imp names
commit 4db0d0e7cb7ed69030994bc1b579534dd2c3395d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 23 18:33:47 2023 +0500
docker: add script and awk program
2023-03-26 23:12:24 +03:00
Ainar Garipov
0df32601bb
Pull request 1787: 5639-querylog-filter-fix
...
Fixes #5639 .
Squashed commit of the following:
commit 1aa02c8fa2b858f9c9a41c5dd6746d4d2e3de654
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 13:39:29 2023 +0300
querylog: fix filtered log filter
2023-03-26 14:19:19 +03:00
Eugene Burkov
fb7b8bba6a
Pull request 1784: 5631-lookup-panic
...
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631 .
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy
2023-03-24 18:47:53 +03:00
Ildar Kamalov
d859a33787
Pull request: add UI theme controls
...
Updates #5620
Squashed commit of the following:
commit a7095b8ba35c34d333b0bbe772ac02a4ba90fbfd
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:23:27 2023 +0300
fix icon
commit ea565f152a1ce4ad8797cf36cacdfd67146a125d
Merge: 5ebb20d2 67c9abe1
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 17:20:42 2023 +0300
Merge branch 'master' into AG-20691
commit 5ebb20d298735982f3c547c81ade4384f4f62196
Merge: 41b0d597 0bc3ef89
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:37:05 2023 +0300
Merge branch 'master' into AG-20691
commit 41b0d597a68006397a7561dfffb1fb51068ded2c
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 14:20:20 2023 +0300
fix string
commit 775afb99fb5ffd17118becba4f1e83d4ce77be48
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Mar 23 19:03:45 2023 +0300
client: add ui theme controls
2023-03-24 17:28:31 +03:00
Stanislav Chzhen
67c9abe119
Pull request 1782: 5630-fix-interval
...
Merge in DNS/adguard-home from 5630-fix-interval to master
Updates #5630 .
Squashed commit of the following:
commit eb3839bb63cde40c477843cad1262c8eaa95406a
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 16:25:23 2023 +0300
fix lint
commit 1899810ba8e3d2496f35bb052aeda60da565ffa3
Merge: 52526687 2409282d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 16:01:50 2023 +0300
Merge branch 'master' into 5630-fix-interval
commit 52526687e651254a81da091106d88b50b656af2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 15:26:01 2023 +0300
convert milliseconds to days for stats interval
commit e719814e84bf0ddaec8f4d47a94cc2b5075a7dc5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 24 14:05:55 2023 +0300
openapi: fix description
2023-03-24 16:49:02 +03:00
Ainar Garipov
2409282d51
Pull request 1783: fix-openapi-chlog
...
Merge in DNS/adguard-home from fix-openapi-chlog to master
Squashed commit of the following:
commit cc8a7526a230edffd0eb86a5a69c565c221996f1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 15:19:57 2023 +0300
openapi: fix chlog
2023-03-24 15:25:16 +03:00
Dimitry Kolyshev
9c48e96939
Pull request: 1333-protection-pause vol.1
...
Merge in DNS/adguard-home from 1333-protection-pause-1 to master
Squashed commit of the following:
commit 5ff98385bc5ff66e214d80782eb4dc41e344aa38
Merge: 97f94a54 0bc3ef89
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 24 19:08:21 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
commit 97f94a5498ac221f88f2f7dfef4b255f4945329e
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Fri Mar 24 13:03:20 2023 +0200
Fix protection timer bugs
commit 1cc61af1996bd803f3fa638cb9e2388470072bf0
Merge: 5a144ea3 235ce458
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 22:27:47 2023 +0700
Merge remote-tracking branch 'origin/1333-protection-pause-1' into 1333-protection-pause-1
commit 5a144ea3a48c3d0d5e57dd14232ab7a8e77a8c1e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 22:25:08 2023 +0700
dnsforward: imp code
commit 235ce458a62b3152f36e32580ed0226a56580ec6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 23 17:35:06 2023 +0300
dnsforward: imp locks
commit 0ea3a0a176b810a2b3f0b307aa406fe1670c9219
Merge: 52f66810 df61741f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 19:30:41 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# openapi/CHANGELOG.md
commit 52f668109673286a50909c042e6352cd803e8eed
Merge: 9a7eb7b3 306c1983
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 11:23:50 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# internal/dnsforward/http.go
commit 9a7eb7b3ab2b5f6ad321aa3245d33839c3aa6fbd
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Wed Mar 22 06:56:55 2023 +0200
Review fix
commit 5612d51252ba91842bd6811baec1c91136bb3bf2
Merge: c0a918a5 c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Mar 21 22:00:39 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# client/src/__locales/en.json
commit c0a918a518ad9b37041aed159d215516258bc987
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Mar 21 12:13:18 2023 +0200
Review fix
commit 34faa61cc1e6210a612e7a2f4895a1504df37680
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Mar 21 10:43:37 2023 +0200
Fix props to new api
commit 158e582373863495f0e0ca177d7b365cc66ad671
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Mon Mar 20 18:44:34 2023 +0200
Review fix
commit 9e8b8c3778b8e1dfad0d39e44f70886dfd3aeb9a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:31:28 2023 +0700
all: docs
commit 761a203f53b535ca235cfe62f289bd0e02b90be2
Merge: d0b07231 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:26:13 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
commit d0b07231b6f29b534930f1fcfc82b4934c295ff8
Merge: ea448760 a2053526
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 13:00:52 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# client/src/components/App/index.css
# internal/dnsforward/config.go
commit ea4487608a9c81d25f155ff63fee7c9dcf21f448
Merge: dfd0f33f a556ce8f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Feb 21 11:54:27 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
commit dfd0f33fb474d497cbc9237ee466276728eea397
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Feb 21 11:51:40 2023 +0700
all: docs
commit d36df96fba8c6d923faef85c198b6bd0743b7ee8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Feb 20 12:41:49 2023 +0700
all: safesearch
commit 60f2ceec563221337f34bb60baa96aa2b2429c40
Merge: 7c514427 6f6ced33
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Feb 20 12:30:42 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
commit 7c514427e77c5b09d8e148c78220a71046e68cd1
Merge: 0fa4ff99 4d295a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Feb 16 11:55:21 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
... and 26 more commits
2023-03-24 15:11:47 +03:00
Ainar Garipov
0bc3ef89ea
Pull request 1781: 5627-fix-migration
...
Updates #5627 .
Squashed commit of the following:
commit 018ead11959efeaace5312b5990ad82b6fa1f72d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 12:48:25 2023 +0300
home: fix more
commit 4bc57a07412bfb7fb7e6c88c14037c567c94d373
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 12:32:57 2023 +0300
home: fix statistics migration
2023-03-24 13:17:57 +03:00
Ainar Garipov
8de994d077
Pull request 1774: 5615-rm-raw
...
Updates #5615 .
* commit '59a8265e31f802009f4ac6893ccec839cc5a2fb0':
all: fmt go.mod
Remove direct dep on mdlayher/raw package
2023-03-23 17:44:41 +03:00
Ainar Garipov
59a8265e31
Merge branch 'master' into 5615-rm-raw
2023-03-23 17:39:03 +03:00
Stanislav Chzhen
bea39934bd
Pull request 1771: AG-20352-dhcpd-lease-netip-addr
...
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr
2023-03-23 16:52:01 +03:00
Dimitry Kolyshev
df61741f60
Pull request: 1163 safesearch http api vol.3
...
Merge in DNS/adguard-home from 1163-safesearch-1-3 to master
Squashed commit of the following:
commit f26c5fb4f7a27dc61b10c28d6672d5307796784c
Merge: e7a1b885 143616ca
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 18:45:25 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
# Conflicts:
# CHANGELOG.md
commit e7a1b885d67628c187ce08327338cf3138012f03
Merge: 01b73d76 eb5d8a49
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:55:23 2023 +0200
Merge branch '1163-safesearch-1-3' of ssh://bit.adguard.com:7999/dns/adguard-home into 1163-safesearch-1-3
commit 01b73d763c6ee76de995093cc7107f113c7785ce
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:52:02 2023 +0200
client: add safe search extended settings to clients
commit eb5d8a499ac1036e5077d2b4aa84479381577e10
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 18:50:23 2023 +0700
all: docs
commit 2043a8fba7f664ef365ccc5abac14a85035eb4b7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:50 2023 +0700
all: docs
commit bb1d2f6c0252891ccac3d3727eb23288a24d4bda
Merge: 95f9fd3d c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:00 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 95f9fd3dd1e8abcdf1a156e81aff8e52f320f4c3
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 15:25:39 2023 +0200
client: move to new safe search api
commit ac823a911f0d6ab6f1813d11a0ca082d54cc9131
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:40:29 2023 +0700
all: docs
commit aaa287b125c7c7a775b821e0dd272199229a7538
Merge: 16fa7031 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:14 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 16fa7031ab2aec31139ace54ffa0155cde8e9135
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:03 2023 +0700
all: docs
commit 498f7d3cbb842eda218b0fd06fc3bb3601b81f80
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:59:47 2023 +0700
filtering: imp code
commit aab7b70e2355ba86577e5156c1d5569b21b4b358
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:40:18 2023 +0700
filtering: imp code
commit d2870a18ffdb1d293993487073912168d6b75a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 21:57:58 2023 +0700
filtering: imp code
commit 868f5d1ed29c3af702114079e7ffe46e136eb901
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:06:36 2023 +0700
all: imp docs
commit f6d70b06ed873684501ce17f647ccf07a85dd50b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:05:40 2023 +0700
filtering: imp code
commit 7cd9a37dde6262a8cf4f0f13f9946e011cc0e2cf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 14:56:51 2023 +0700
home: imp code
commit 84d8817512e47a517ed2880ffa9dde5ffda1d288
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 09:39:41 2023 +0700
all: safesearch http api
2023-03-23 15:25:58 +03:00
Stanislav Chzhen
143616ca6e
Pull request 1736: 4299-querylog-stats-api
...
Merge in DNS/adguard-home from 4299-querylog-stats-api to master
Updates #1717 .
Updates #4299 .
Squashed commit of the following:
commit 5b706b7997a536bc4fd2c532fb89ca5ab3536848
Merge: 48b62b0f 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 13:53:09 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 48b62b0f1882f1ad120c6cdd90cd7dd8cb8a7738
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 12:25:04 2023 +0200
client: fix styles, add titles and descrs
commit 97e31cff70d05b51bd0e5ea2d20e8e7a251a7e41
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 18:38:12 2023 +0200
client: add ignored domains for querylog
commit 24d75c4376382205ae6b8f731b1cd23d517772c9
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 18:21:13 2023 +0200
client: add ignore domains for stats
commit eefc3891d01f90af79fdac9ba8eea06d4d54a0bc
Merge: 978675ea 1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 10:53:35 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 978675ea2c07bf248b4c8f26ebdf78cf59a12ef5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 10:53:11 2023 +0300
openapi: fix chlog
commit 2ed33007aade115d38b0ca582206cc10678b084c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:49:07 2023 +0300
home: fix tests
commit 6af11520c164553ee9fce8f214ea169672188d7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:40:16 2023 +0300
home: fix typo
commit 56acdfde5b1ee8d16b232c1293b91affbe319ad1
Merge: 319da34d 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:32:58 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 319da34de41ec84310b23bba2ad79c8a3a4c14ff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 17:34:38 2023 +0300
querylog: fix docs
commit d5a8f24d5b336e7bdbbca18069f6ede8c96bcc2c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 11:42:00 2023 +0300
stats: fix docs
commit e0cbfc1c4078180a05835ce7587e9f45484adc81
Merge: 4743c810 012e5beb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 18:45:17 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 4743c81038052b9e0ca29ae5f1565021d36ca1ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 18:14:16 2023 +0300
all: imp code; fix time conversion
commit 34310cffd7e331d098c535590245387051674fa8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:34:11 2023 +0300
chlog: restore order
commit cadd864a66655242948f1cb16e6d4945c0235d7e
Merge: 2f3e25be bb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:26:06 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 2f3e25bee56d2c6ddcf4aa2fc6a1dc51ed9b06e1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:25:14 2023 +0300
all: fix fmt
commit d54022baa6c8a3d0d3c308a9b6b1a6a9dc6ac7b6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 28 16:16:40 2023 +0300
all: imp code; fix chlog
commit df22de91f59a51194c55e7bcbe5bc3fcc60cb8e3
Merge: e1ea4797 a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:24:09 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit e1ea4797af974c36f06683ffc6eaaae917921a43
Merge: d7db0a5a bb80a7c2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:23:20 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit d7db0a5af1e1f49f6174c1c42e6d9306f2381d16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:12:20 2023 +0300
all: imp docs
... and 15 more commits
2023-03-23 13:46:57 +03:00
Stanislav Chzhen
306c1983a2
Pull request 1758: 1472-edns-custom-ip-api
...
Merge in DNS/adguard-home from 1472-edns-custom-ip-api to master
Updates #1472
Squashed commit of the following:
commit 7605ec5bd5467ddd28a650385193eb2332653bb6
Merge: 8b2ac227 194ead34
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 13:39:25 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 8b2ac22793a51d2555d32c1f5b5c118118807d1f
Merge: d5ca8b6e c3edab43
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 18:26:55 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit d5ca8b6e1d87480d4ee4afd346e6bf04907fca95
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 18:26:24 2023 +0300
dnsforward: imp tests
commit 1302586d22812c22755ea1c7e7fcd32330d707c5
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 16:47:56 2023 +0200
client: change validation for custom edns ip
commit 44e4dc6d1e47de6597ed9ee328db9639e38b4868
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 16:31:42 2023 +0200
client: implement edns custom ip
commit 8a3e7ad8ebf16262818821340da23baa5f004bff
Merge: 04ac1112 f736d85e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 15:04:40 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 04ac1112dda2e778243555b2f54819e5ba586e05
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 15:03:39 2023 +0300
dnsforward: imp tests
commit b44f6d0ccb3ba7b7a5be07c9cf293dad9c83c794
Merge: 19c6851e 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:55:49 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 19c6851e30f30b0572334822e8639e03760de986
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 10 10:40:15 2023 +0300
all: fix chlog
commit 6dcdcbd666ebf3a56a38251e8ead09c605068ce3
Merge: a7f1bf71 a2053526
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 10 10:23:37 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit a7f1bf715e3557c710b700b9bd923868eb07715b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:24:18 2023 +0300
home: fix default value
commit 0311a9bb6571975963d747ef4ef427b59dca03bc
Merge: 7e0bb3df 1011b8f9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:04:18 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 7e0bb3df78f10f4b4ae0fd49681d1aa0040521c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:03:24 2023 +0300
all: fix chlog
commit 202d7ccf4721ccf39726da01d237e07317bfaa58
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 11:35:41 2023 +0300
dnsforward: fix typo
commit fe95e003a0c3b316a44b5ec0b848a60ddd4c85cf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 11:28:21 2023 +0300
all: fix docs
commit 66835a9aa22b3015f9238c1d6f5aa9bd6067db8a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 10:48:08 2023 +0300
dnsforward: add todo
commit b58255e1e6660a8229bb9c40f2acddebb3dbdc66
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 6 15:40:02 2023 +0300
all: upd chlog
commit 9b2be7facba30c815144e08a7835353cad14c405
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 11:22:19 2023 +0300
dnsforward: edns custom ip api
2023-03-22 13:42:20 +03:00
Vladislav Abdulmyanov
194ead3479
Pull request 1777: client: include safesearch to count percent
...
Updates #5568 .
Squashed commit of the following:
commit 3d3a8c187b27307b69b160283f3cd6f9c40cc68e
Merge: 7f4b6357 c3edab43
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 11:53:06 2023 +0200
Merge branch 'master' into 5568-save-search-percent
commit 7f4b6357c6f7941eb37175a83972a9821dd08974
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 13:36:14 2023 +0200
client: include safesearch to count percent
2023-03-22 12:55:53 +03:00
Stanislav Chzhen
c3edab4387
Pull request 1763: AG-20200-translation-script
...
Merge in DNS/adguard-home from AG-20200-translation-script to master
Squashed commit of the following:
commit 3113b77c0312219f8134324caa232a53c42a3988
Merge: bbd784ab f736d85e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 17:41:08 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit bbd784ab817955f3342d140644a3199d558c22b8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 13:23:48 2023 +0300
scripts: imp code
commit 7d379ab1fc2ae9858f8e7e3754de9be3d23153b6
Merge: 4f6278ad 1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 12:01:16 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit 4f6278adb28287205a4fc89239e7ba776a15ff7a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 14:27:32 2023 +0300
scripts: imp error handling
commit 64e307a591cfeac1986d477a55bcc714636663bc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 15:41:39 2023 +0300
scripts: imp code
commit fe06df88f2bb3fc0de83f83deea26652485a22d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 15:23:20 2023 +0300
scripts: add docs
commit 15d65a075373586fc31a595d7c831b80752d7cf2
Merge: ddd3cacd 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 13:04:16 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit ddd3cacd507ca861c4d9d5f7600bdcc2c3068315
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 13:03:11 2023 +0300
scripts: imp code
commit 4e8ebdc199f0c0ff4e7c7b8ae71483cca6c4d428
Merge: 73fedefa c6706445
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:25:36 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit 73fedefa4ceaf2273648afe5816f1903d96ba213
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:25:04 2023 +0300
scripts: fix chlog
commit 780b0a257b6b2e684cfe8a49e4c4d22bcd4056ec
Merge: ef70d192 595484e0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 14 14:58:24 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit ef70d192555a9ef2acd6dd1caeb4f05a10a1de63
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 14 14:57:36 2023 +0300
scripts: upd readme
commit e28655826c8c5ce6ddf3cc904201681286a6be87
Merge: cae3b769 a2053526
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 13 14:28:47 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit cae3b769dfa6906653b32104169ae4a08a2c3723
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 13 14:27:29 2023 +0300
scripts: rm translations js
commit 77e2e3480b52a70b8ef9be8f1edf581cca2a1a3a
Merge: 99e2382a c11a52d6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 16:04:06 2023 +0300
Merge branch 'master' into AG-20200-translation-script
commit 99e2382a161dee0bff30ae488d8b42565330d82e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 16:03:19 2023 +0300
scripts: add translations go
2023-03-21 17:43:48 +03:00
Vladislav Abdulmyanov
f736d85e6e
Pull request 1776: client: add transform dynamic lease to static
...
Updates #3459 .
Squashed commit of the following:
commit 7a660c689da898c125a268f88378e38a58b457da
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 10:40:25 2023 +0200
consider issues
commit 066bf77ac44fa8602c66aa0ea220b52fca6d1180
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 18:37:14 2023 +0200
client: fix icon
commit 356b4c3895436f165697510bb3b3abf95f18894f
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 18:32:03 2023 +0200
client: add transform dinamic lease to static
2023-03-21 14:42:54 +03:00
Vladislav Abdulmyanov
1daabb97e5
Pull request 1775: 5581-leases-table-mobile
...
Updates #5581 .
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile
2023-03-20 18:51:52 +03:00