Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from AdguardTeam:master #183

Merged
merged 3 commits into from
Sep 4, 2023
Merged

[pull] master from AdguardTeam:master #183

merged 3 commits into from
Sep 4, 2023

Commits on Sep 4, 2023

  1. Pull request 1990: 5793-fix-stats-date 

    Updates #5793.

Squashed commit of the following:

commit 6ad10c0
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Sep 4 13:08:22 2023 +0300

    all: upd chlog

commit ab579d9
Author: Stanislav Chzhen <[email protected]>
Date:   Fri Sep 1 19:39:00 2023 +0300

    client: fix stats date
    @schzhn
    schzhn committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    51340ad View commit details
    Browse the repository at this point in the history

  2. Pull request: AG-25263 dns config 

    Merge in DNS/adguard-home from AG-25263-dns-config to master

Squashed commit of the following:

commit 478b607
Merge: b944d12 51340ad
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Sep 4 18:04:56 2023 +0400

    Merge remote-tracking branch 'origin/master' into AG-25263-dns-config

commit b944d12
Merge: b474f71 0182b9e
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Sep 1 09:13:36 2023 +0400

    Merge remote-tracking branch 'origin/master' into AG-25263-dns-config

    # Conflicts:
    #	internal/dnsforward/dnsforward.go

commit b474f71
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Sep 1 09:11:17 2023 +0400

    all: imp code

commit 635a316
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Aug 30 16:18:25 2023 +0300

    all: dnsfilter rm config embed

commit 5aa6212
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Aug 30 12:45:01 2023 +0300

    all: dnsfilter rm config embed
    @Mizzick
    Mizzick committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    f84ff2b View commit details
    Browse the repository at this point in the history

  3. 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 7bcdf44
Merge: 4c25331 f84ff2b
Author: Eugene Burkov <[email protected]>
Date:   Mon Sep 4 20:33:08 2023 +0300

    Merge branch 'master' into AG-25392-confmigrate-vol.2

commit 4c25331
Author: Eugene Burkov <[email protected]>
Date:   Mon Sep 4 20:14:23 2023 +0300

    confmigrate: fix fmt

commit d7dbfc4
Author: Eugene Burkov <[email protected]>
Date:   Mon Sep 4 20:07:25 2023 +0300

    confmigrate: imp code

commit cd29729
Author: Eugene Burkov <[email protected]>
Date:   Mon Sep 4 18:21:14 2023 +0300

    confmigrate: imp code, split files

commit f075a14
Author: Eugene Burkov <[email protected]>
Date:   Mon Sep 4 17:19:47 2023 +0300

    confmigrate: imp code

commit 3733559
Author: Eugene Burkov <[email protected]>
Date:   Mon Sep 4 16:54:13 2023 +0300

    confmigrate: imp code, docs

commit 1df0ddc
Author: Eugene Burkov <[email protected]>
Date:   Mon Sep 4 14:41:52 2023 +0300

    all: add testdata

commit e62690d
Author: Eugene Burkov <[email protected]>
Date:   Thu Aug 31 16:13:14 2023 +0300

    all: imp code

commit 0934d59
Author: Eugene Burkov <[email protected]>
Date:   Wed Aug 30 15:50:52 2023 +0300

    home: don't reread config

commit 7566ab6
Author: Eugene Burkov <[email protected]>
Date:   Wed Aug 30 15:43:57 2023 +0300

    all: imp code

commit 6f6aae6
Author: Eugene Burkov <[email protected]>
Date:   Wed Aug 30 15:25:46 2023 +0300

    all: introduce confmigrate
    @EugeneOne1
    EugeneOne1 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    1e45178 View commit details
    Browse the repository at this point in the history