mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-03-22 02:13:53 +03:00
Code Issues Projects Releases Packages Wiki Activity
AdGuardHome/internal/home
History
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
..
auth.go Pull request: HOFTIX-csrf 2022-09-29 19:04:26 +03:00
auth_test.go Pull request: refactor-opts 2022-10-05 17:07:08 +03:00
authglinet.go Pull request: replace agherr with golibs' errors 2021-05-24 17:28:11 +03:00
authglinet_test.go Pull request: use testutil 2021-10-22 11:58:18 +03:00
authratelimiter.go Pull request: use mathutil 2023-01-24 19:50:19 +03:00
authratelimiter_test.go Pull request: 2826 auth block 2021-04-27 18:56:32 +03:00
client.go Pull request: 1163 safesearch vol.2 2023-03-15 14:31:07 +03:00
clients.go Pull request 1771: AG-20352-dhcpd-lease-netip-addr 2023-03-23 16:52:01 +03:00
clients_test.go Pull request 1771: AG-20352-dhcpd-lease-netip-addr 2023-03-23 16:52:01 +03:00
clientshttp.go Pull request: 1163 safesearch http api vol.3 2023-03-23 15:25:58 +03:00
clientstags.go Pull request: all: fix lint and naming issues vol. 3 2020-12-07 16:04:53 +03:00
config.go Pull request 1736: 4299-querylog-stats-api 2023-03-23 13:46:57 +03:00
control.go Pull request: 1333-protection-pause vol.1 2023-03-24 15:11:47 +03:00
controlinstall.go Pull request 1729: upd-go 2023-02-08 13:39:04 +03:00
controlupdate.go Pull request 1752: 5373-mips-autoupdate 2023-02-27 17:07:31 +03:00
dns.go Pull request 1736: 4299-querylog-stats-api 2023-03-23 13:46:57 +03:00
home.go Pull request: 1163 safesearch vol.2 2023-03-15 14:31:07 +03:00
home_test.go Pull request: imp-tests 2022-10-27 16:11:36 +03:00
i18n.go Pull request: 613-dark-theme vol.1 2023-01-13 19:24:17 +03:00
middlewares.go Pull request 1717: remove-client2 2023-01-23 12:47:59 +03:00
middlewares_test.go Pull request: use testutil 2021-10-22 11:58:18 +03:00
mobileconfig.go Pull request: 4871 imp filtering 2022-09-23 13:23:35 +03:00
mobileconfig_test.go Pull request: 4925-refactor-tls-vol-2 2022-10-14 19:37:14 +03:00
options.go Pull request: 5191-update-flag 2023-01-09 13:38:31 +03:00
options_test.go Pull request: 4223 home: cmd update 2022-11-15 17:44:50 +03:00
profilehttp.go Pull request: 613-dark-theme vol.1 2023-01-13 19:24:17 +03:00
rdns.go Pull request: 4939 Client update 2023-02-10 16:40:36 +03:00
rdns_test.go Pull request: 4939 Client update 2023-02-10 16:40:36 +03:00
service.go Pull request: 5191-update-flag 2023-01-09 13:38:31 +03:00
service_linux.go Pull request: 5191-update-flag 2023-01-09 13:38:31 +03:00
service_openbsd.go Pull request: 5191-update-flag 2023-01-09 13:38:31 +03:00
service_others.go Pull request: Improve build tags 2022-09-13 20:06:23 +03:00
tls.go Pull request 1717: remove-client2 2023-01-23 12:47:59 +03:00
tls_internal_test.go Pull request: 4898-redirect-https 2022-11-01 13:09:52 +03:00
upgrade.go Pull request 1781: 5627-fix-migration 2023-03-24 13:17:57 +03:00
upgrade_test.go Pull request 1781: 5627-fix-migration 2023-03-24 13:17:57 +03:00
web.go Pull request 1729: upd-go 2023-02-08 13:39:04 +03:00
whois.go Pull request: 5035-more-clients-netip-addr 2022-11-09 14:37:07 +03:00
whois_test.go Pull request: all: imp docs, names 2021-06-18 18:13:36 +03:00