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.

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

[pull] master from AdguardTeam:master #120

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d40de33
Pull request 2273: AG-27492-client-storage-runtime-sources
schzhn Sep 30, 2024
54a975f
Pull request 2280: upd-all
ainar-g Sep 30, 2024
5578987
Pull request 2282: all: upd go, tools, deps
ainar-g Oct 2, 2024
5b5b397
Pull request 2283: AG-27492-fix-safesearch-cache
schzhn Oct 2, 2024
355cec1
Pull request 2284: AG-32257-file-permission-mitigation
ainar-g Oct 2, 2024
b32b8f9
Pull request 2285: fix-test
ainar-g Oct 3, 2024
4919630
Pull request 2288: upd-chlog
schzhn Oct 3, 2024
df09734
Pull request 2287: 7315-fix-client-storage-panic
schzhn Oct 4, 2024
2c64ab5
Pull request 2289: upd-urlfilter
schzhn Oct 4, 2024
6363f8a
Pull request 2286: AGDNS-2374-slog-safesearch
schzhn Oct 9, 2024
73ff401
Pull request 2290: 7250-custom-client-cache
schzhn Oct 10, 2024
5b45f6d
Pull request 2293: fix-snap-build
schzhn Oct 14, 2024
41cce62
Pull request 2292: 7338-stats-log-msg
schzhn Oct 14, 2024
e529d29
Pull request 2291: AGDNS-2374-slog-client
schzhn Oct 22, 2024
e77de2e
Pull request 2294: AGDNS-2455 Windows permissions
EugeneOne1 Oct 29, 2024
1d2026b
Pull request 2295: upd-all
ainar-g Oct 29, 2024
47dfa44
Pull request 2297: AG-20945-filter-storage
ainar-g Nov 5, 2024
80ec01d
Pull request 2298: 7314 Fix updater
EugeneOne1 Nov 5, 2024
d06b18a
Pull request 2300: upd-chlog
ainar-g Nov 6, 2024
b1a0f4f
Pull request 2299: AG-29637 Sign release
EugeneOne1 Nov 6, 2024
6673bb1
Pull request 2301: Update all
EugeneOne1 Nov 6, 2024
ac5a96f
Pull request 2302: upd-all
ainar-g Nov 8, 2024
1d6d85c
Pull request 2303: AGDNS-2505-upd-next
ainar-g Nov 13, 2024
d96e65c
Pull request 2304: AGDNS-2374-slog-querylog
schzhn Nov 21, 2024
098cbab
Pull request 2305: 7400 Disable permcheck
EugeneOne1 Nov 22, 2024
abb7380
Pull request 2308: AGDNS-2374-slog-client-storage
schzhn Nov 22, 2024
d4ca148
Pull request 2309: fix-safesearch-test
schzhn Nov 25, 2024
d578c71
Pull request 2310: 6818-fix-goroutine-leak
schzhn Nov 26, 2024
4a49c4d
Pull request 2307: AGDNS-2556 Custom updater URL
EugeneOne1 Nov 26, 2024
9789e5b
Pull request 2311: 7465 Fix nil dereference
EugeneOne1 Nov 27, 2024
a843129
Pull request 2313: 7357-upd-proxy
schzhn Nov 29, 2024
4d470f9
Update wiki-start in README.md
MaggieFero Dec 2, 2024
37b16bc
Pull request 2315: 7479-readme-fix
ainar-g Dec 3, 2024
3895cfb
Pull request 2312: 7400 Windows permcheck
EugeneOne1 Dec 3, 2024
c234e5d
Pull request 2317: Update all
EugeneOne1 Dec 4, 2024
11dfc7a
Pull request 2316: AGDNS-2239 fix setup guide list styles
IldarKamalov Dec 5, 2024
dab6082
Pull request 2314: AGDNS-2374-slog-home-webapi
schzhn Dec 6, 2024
8f53f65
Pull request 2320: upd-chlog
ainar-g Dec 11, 2024
d3cc2dc
Pull request 2319: websvc-patch
ainar-g Dec 11, 2024
dedbada
Pull request 2321: upd-go-deps
ainar-g Dec 12, 2024
2b55e56
Format values in General Statistics
Hermholtz Dec 14, 2024
fe07786
Pull request #2323: AGDNS-2598-clients-search
schzhn Dec 17, 2024
efe2ed1
all: upd chlog
ainar-g Dec 17, 2024
5c15d1b
Merge branch 'master' into 7505-format-values
ainar-g Dec 17, 2024
21945c6
Pull request 2324: 7505-format-values
ainar-g Dec 17, 2024
261c159
Pull request #2325: 7510 Fix openapi spec
EugeneOne1 Dec 19, 2024
20e56b7
Pull request 2326: more-md-lint
ainar-g Dec 19, 2024
0b25119
Pull request #2327: AGDNS-2622-fix-race
schzhn Dec 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'name': 'build'

'env':
'GO_VERSION': '1.23.1'
'GO_VERSION': '1.23.4'
'NODE_VERSION': '16'

'on':
Expand Down Expand Up @@ -95,7 +95,7 @@
'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
'restore-keys': '${{ runner.os }}-node-'
- 'name': 'Set up Snapcraft'
'run': 'sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft'
'run': 'sudo snap install snapcraft --classic'
- 'name': 'Set up QEMU'
'uses': 'docker/setup-qemu-action@v1'
- 'name': 'Set up Docker Buildx'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'name': 'lint'

'env':
'GO_VERSION': '1.23.1'
'GO_VERSION': '1.23.4'

'on':
'push':
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# This comment is used to simplify checking local copies of the file. Bump
# this number every time a significant change is made to this file.
#
# AdGuard-Project-Version: 1

# Please, DO NOT put your text editors' temporary files here. The more are
# added, the harder it gets to maintain and manage projects' gitignores. Put
# them into your global gitignore file instead.
Expand All @@ -8,6 +13,7 @@
# bottom to make sure they take effect.
*.db
*.log
*.out
*.snap
*.test
/agh-backup/
Expand All @@ -21,6 +27,7 @@
/launchpad_credentials
/querylog.json*
/snapcraft_login
/test-reports/
AdGuardHome
AdGuardHome.exe
AdGuardHome.yaml*
Expand Down
25 changes: 25 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"ul-indent": {
"indent": 4
},
"ul-style": {
"style": "dash"
},
"emphasis-style": {
"style": "asterisk"
},
"no-duplicate-heading": {
"siblings_only": true
},
"no-inline-html": {
"allowed_elements": [
"a"
]
},
"no-trailing-spaces": {
"br_spaces": 0
},
"line-length": false,
"no-bare-urls": false,
"link-fragments": false
}
Loading