mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,055 Commits 96 Branches 201 Tags 57 MiB
Commit Graph

3055 Commits

Author SHA1 Message Date
Eugene Burkov b0013065a2 Pull request: 2723 autogenerate hostnames 
Merge in DNS/adguard-home from 2723-dhcp-hostnames to master

Updates #2723.

Squashed commit of the following:

commit f9b9d2269c25cabd225ba712730f04496ab81715
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 16:47:31 2021 +0300

    aghnet: fix test

commit a2845d1003093ce38870b2cc89e9bd98ea2b8249
Merge: 74e450c9 0bcea347
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 16:45:59 2021 +0300

    Merge branch 'master' into 2723-dhcp-hostnames

commit 74e450c919b4c39ed6f8489aea398b225a4c6861
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 16:44:08 2021 +0300

    all: imp code, docs

commit 77cdb1232d18c8a2642b7131f051e318844c2c47
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 14:29:40 2021 +0300

    all: add gen func, use it
 2021-04-15 16:59:05 +03:00
Ainar Garipov 0bcea34767 Pull request: client: imp setup guide 
Merge in DNS/adguard-home from imp-setup-guide to master

Squashed commit of the following:

commit 06c92e34293849bb3c0c2195b69ea7e0aa366f17
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 15 14:54:40 2021 +0300

    client: imp setup guide
 2021-04-15 15:43:04 +03:00
Eugene Burkov 69f526b13d Pull request: 2956 fix clients disabling 
Merge in DNS/adguard-home from 2956-fix-flag to master

Closes #2956.
Updates #1947.

Squashed commit of the following:

commit ffb98f752f6d4c40ea166ff1e482edcd7f028513
Merge: 800d67db 7be2fc37
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 14 19:01:34 2021 +0300

    Merge branch 'master' into 2956-fix-flag

commit 800d67db84786c8fe93d38b6aa932aa4dd4dd345
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 14 18:54:26 2021 +0300

    home: fix clients disabling
 2021-04-14 19:18:48 +03:00
Ainar Garipov 7be2fc37e6 Pull request: client: imp i18n 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 9befed3c5b1d113972df9fbcc3245b7be1a0eaf5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 18:53:29 2021 +0300

    client: imp en

commit c543428e6302620577ac699701d23967b9b1909d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 18:49:26 2021 +0300

    client: imp i18n
 2021-04-14 19:00:29 +03:00
Ainar Garipov b3f6592a5f Pull request: client: upd i18n 
Updates #2643.

Squashed commit of the following:

commit b264cd4e3de284cc1ed70f07797b4f4510f28018
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 14:51:38 2021 +0300

    client: imp ja

commit cdda71a28e75e5494a9d903001d8f48be109010f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 14:12:14 2021 +0300

    client: upd i18n
 2021-04-14 14:56:38 +03:00
Ainar Garipov c82080e1a7 Pull request: clear working directory after each build to prevent agent's disk bloat 
Merge in DNS/adguard-home from clean-working-directory to master

Squashed commit of the following:

commit cf5908c8bff984544f6d6fcad5bcd0b8e2109225
Author: Константин Замякин <sc@adguard.com>
Date:   Wed Apr 14 02:06:20 2021 +0300

    clear working directory after each build to prevent agent's disk bloat
 2021-04-14 12:40:48 +03:00
Ainar Garipov 39b9807f19 Pull request: client: upd i18n 
Updates #2643.

Squashed commit of the following:

commit d923a934d9bca757f5abd26abc616197e5f1fec9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 19:10:08 2021 +0300

    client: upd ru

commit 114483ee80a0c850a0c25ce9c419e5d1f69d2fec
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 18:43:03 2021 +0300

    client: imp en

commit 1e57298d66d67ab4a2cbb1c3045094eefb05d667
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:46:07 2021 +0300

    client: fix ru

commit 5baca6561d844fe257ff6f3a70d64c9a7dc2273f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:39:51 2021 +0300

    client: upd i18n
 2021-04-13 19:36:55 +03:00
Ainar Garipov 7d8f01b88a Pull request: bamboo-specs: fix notification url 
Merge in DNS/adguard-home from bamboo-fix to master

Squashed commit of the following:

commit 8b04bcc350a196cf1a4e98c559b41e9e262ce539
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:23:33 2021 +0300

    bamboo-specs: fix notification url
 2021-04-13 17:35:58 +03:00
Eugene Burkov d7b2d63e4c Pull request: 1868 fix rdns 
Merge in DNS/adguard-home from 1868-rdns-ipv6 to master

Updates #2943.
Updates #2704.

Squashed commit of the following:

commit 53d67ecf17ed4f9c544344288b58f3596c7246e2
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 13 16:18:33 2021 +0300

    all: imp code, docs

commit 2bc15941b87f92b6fa0a7568538e02700a4385a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 13 16:09:08 2021 +0300

    all: imp code
 2021-04-13 16:23:36 +03:00
Ainar Garipov 773f02cf7d Pull request: dhcpd: normalize client host 
Updates #2946.

Squashed commit of the following:

commit f830c03ddee65f7e86c43baa00a7dcc022091d93
Merge: df6c83d7 327e76cd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:55:58 2021 +0300

    Merge branch 'master' into 2946-norm-dhcp-host

commit df6c83d7d117b718110a035216e708d5131bf71c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:49:03 2021 +0300

    dhcpd: imp docs

commit 1407e9bd7b7694bd3069349faba3ec9ff5eb468b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:27:38 2021 +0300

    dhcpd: normalize client host
 2021-04-13 16:00:09 +03:00
Ainar Garipov 327e76cd65 Pull request: 2842 DHCP validation ui 
Closes #2842.

Squashed commit of the following:

commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8
Merge: a5d7187b ab85ad5a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:29:06 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit a5d7187bba1ae3595bbc26a362ff27aae81a7048
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 15:08:28 2021 +0300

    fix: revert deleted translation

commit 50169266111032f6de3bc159ba562ee9580532fb
Merge: 46adf2c0 48d702f7
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 14:39:40 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit 46adf2c05b6bedd55e60475eac060347db6572b7
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 14:13:12 2021 +0300

    fix: no-bitwise

commit 1afc4030a5ea885545e51748976724959f87fb26
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 13:57:43 2021 +0300

    fix: IPv4 in CIDR validation

commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 11:58:03 2021 +0300

    fix: translations

commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 11:57:27 2021 +0300

    fix: MAC validation

commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c
Merge: 48b50ce9 65553a29
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 18:12:06 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Apr 5 19:04:35 2021 +0300

    Add leases ip validation

commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Apr 5 13:59:16 2021 +0300

    Add helper for subnet to bitmap mask conversion, write test

commit 80dc7a8d19b27cecc50e2c610619574374f363d3
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Fri Apr 2 17:46:27 2021 +0300

    2842 Update DHCP range validation in UI
 2021-04-13 15:29:28 +03:00
Eugene Burkov ab85ad5a55 Pull request: home: fix help 
Merge in DNS/adguard-home from fix-help to master

Updates #2893.

Squashed commit of the following:

commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 13 14:51:53 2021 +0300

    home: fix help
 2021-04-13 15:13:28 +03:00
Ainar Garipov 48d702f76a Pull request: all: fix client custom upstream comments 
Updates #2947.

Squashed commit of the following:

commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:40:29 2021 +0300

    Merge branch 'master' into 2947-cli-ups-comment

commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:34:28 2021 +0300

    all: imp code, tests

commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:17:09 2021 +0300

    Merge branch 'master' into 2947-cli-ups-comment

commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 22:13:41 2021 +0300

    all: fix client custom upstream comments
 2021-04-13 13:44:29 +03:00
Ainar Garipov 21e2c419b9 Pull request: client: imp letter case consistency 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 209c0aa8ebaea976558012707154c27813b40fa6
Merge: 758aa913 6410feeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:16:41 2021 +0300

    Merge branch 'master' into imp-i18n

commit 758aa913f5c1916c40c58ad5e511e0e3b8d57951
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 20:38:25 2021 +0300

    client: imp letter case consistency
 2021-04-13 13:39:45 +03:00
Ildar Kamalov 6410feeb45 Merge: client: fix charts height 
Closes #2944

Squashed commit of the following:

commit c8c6a0533df0123f458603cc204f1f796b9e59d8
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 10:56:02 2021 +0300

    client: fix charts height
 2021-04-13 11:19:45 +03:00
Ainar Garipov 90f96eafe8 Pull request: all: try reenabling newer github cache action 
Merge in DNS/adguard-home from gh-cache to master

Squashed commit of the following:

commit 0134aa2f6f3892064572222819214c2185b1ac58
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 18:38:23 2021 +0300

    all: try reenabling newer github cache action
 2021-04-12 19:05:13 +03:00
Eugene Burkov e671f43a2f Pull request: 1947 disable autohosts option 
Merge in DNS/adguard-home from 1947-hosts-opt to master

Updates #1947.
Updates #2829.

Squashed commit of the following:

commit d09285c3dbfa7816469eec223b88c320c255c8fe
Merge: cff8c4cd 7c6557b0
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 18:23:20 2021 +0300

    Merge branch 'master' into 1947-hosts-opt

commit cff8c4cdbf4bcd1f5f413c541d7f4a9e42b8b05b
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 17:46:19 2021 +0300

    home: fix help

commit 1fa01d5b30f5adeda564dcc85a7064e2921d5981
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 17:40:48 2021 +0300

    home: fix option order

commit 9d83cb604aaddcc8cbe99bafa544636f8f0b7e54
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 17:28:30 2021 +0300

    aghnet: add important todo

commit 7f1386ff5c3081e07e975b640164a7a05e1319c9
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 17:17:17 2021 +0300

    all: correct naming

commit cbe2b2e4b21d5bceb3ee88e09cad154ba62b5cef
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 15:55:46 2021 +0300

    all: mv functionality from util

commit e82ad53862682d903dd0dd10844db65997a758bc
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 15:41:35 2021 +0300

    home: imp code, docs

commit 9058977f3ff99648fabaebbd7c1c354c71671327
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 15:02:34 2021 +0300

    home: add an option to disable autohosts
 2021-04-12 18:31:45 +03:00
Ainar Garipov 7c6557b05e Pull request: querylog: more opt 
Updates 1273.

Squashed commit of the following:

commit 167c0b5acaab8a2676de2cea556c861dc0efbc72
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 18:12:43 2021 +0300

    querylog: imp naming

commit 5010ad113e46335011a721cbcc9fc9b1fc623722
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 17:53:41 2021 +0300

    querylog: more opt
 2021-04-12 18:22:11 +03:00
Ainar Garipov 279350e4a3 Pull request: querylog: opt client search 
Updates #1273.

Squashed commit of the following:

commit 6c2cc73e3360ae12aaa6e2c9834fddfdba925e2b
Merge: effe2230 fb72d543
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 14:05:04 2021 +0300

    Merge branch 'master' into 1273-querylog-opt

commit effe22303fb2053dfe22b6242231b40f4d462735
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 13:21:06 2021 +0300

    querylog: opt client search
 2021-04-12 14:10:20 +03:00
Ainar Garipov fb72d543a3 Pull request: client: imp en locale 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 637cff971fe0823f46ea070f3868d0823bed66a3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 13:43:17 2021 +0300

    client: imp en locale
 2021-04-12 14:03:28 +03:00
Ainar Garipov 8b8319fca0 Pull request: 2704 local addresses vol.4 
Updates #2704.

Squashed commit of the following:

commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 9 19:22:46 2021 +0300

    all: replace exchanger with proxy
 2021-04-09 21:01:21 +03:00
Ainar Garipov 0247a2da44 Pull request: all: imp shell code 
Merge in DNS/adguard-home from imp-sh to master

Squashed commit of the following:

commit 212f03f3d6e0824428c28ffd79cac8f5ea271d9c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 9 14:51:59 2021 +0300

    all: imp shell code
 2021-04-09 15:07:18 +03:00
Ainar Garipov 6a8f6357e2 Pull request: all: mv IsOpenWrt 
Updates #2829.

Squashed commit of the following:

commit a284a26ba5df101c78e6f866d1bdfa540d205666
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 20:34:20 2021 +0300

    aghos: fix darwin

commit 9dbd42d75ebb048c83dbd06a1f09d950b3d12181
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 20:11:56 2021 +0300

    all: mv IsOpenWrt
 2021-04-08 20:42:04 +03:00
Ainar Garipov 8c7f2b77d5 Pull request: bamboo-specs: push the docker image 
Merge in DNS/adguard-home from spec-docker-push to master

Squashed commit of the following:

commit 73c76cf61463e2982911b8407ca368da5a9e8133
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 18:19:27 2021 +0300

    bamboo-specs: push the docker image
 2021-04-08 18:24:42 +03:00
Eugene Burkov 7afc692632 Pull request: 2889 internal hosts restriction 
Merge in DNS/adguard-home from 2889-imp-autohosts to master

Closes #2889.

Squashed commit of the following:

commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 8 17:59:51 2021 +0300

    Merge branch 'master' into 2889-imp-autohosts

commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 8 17:34:56 2021 +0300

    dnsforward: imp code

commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 8 17:31:34 2021 +0300

    dnsforward: respond with nxdomain

commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 19:16:14 2021 +0300

    dnsforward: restrict the access to intl hosts for ext clients
 2021-04-08 18:07:29 +03:00
Ainar Garipov 1a214eaabc Pull request: bamboo-specs: use our docker image in snap stage 
Merge in DNS/adguard-home from spec-snap-docker to master

Squashed commit of the following:

commit 2a43d33ba712152b0322f2e7ecdf1167c34d3435
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 17:51:07 2021 +0300

    bamboo-specs: use our docker image in snap stage
 2021-04-08 17:56:27 +03:00
Ainar Garipov 1e3fc990eb Pull request: all: fix specs, imp docs 
Merge in DNS/adguard-home from fix-specs-2 to master

Squashed commit of the following:

commit 687c5ead52ba4939ea89405a9a326c23e72c502b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 16:38:34 2021 +0300

    all: fix specs, imp docs
 2021-04-08 16:44:01 +03:00
Ainar Garipov c5f4d0ce44 Pull request: bamboo-specs: cd into dist 
Merge in DNS/adguard-home from fix-specs to master

Squashed commit of the following:

commit 4a46f6f417e3a82c3adc819dc5428125f97bd747
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 16:20:16 2021 +0300

    bamboo-specs: cd into dist
 2021-04-08 16:24:59 +03:00
Ainar Garipov 1c87dc577d Pull request: all: add bamboo specs 
Merge in DNS/adguard-home from add-specs to master

Squashed commit of the following:

commit 011f9ae643e84b9bcd407cba5d86c586a73f7366
Merge: 856364fb 80ed8be1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 20:20:32 2021 +0300

    Merge branch 'master' into add-specs

commit 856364fb55901f977b6e25fa3cd90be5f680d3ad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 14:35:00 2021 +0300

    all: fix awk invocation

commit 202a04f5dd0860c094c887d7fdb71e6424a6d0ce
Merge: cdd95cfa 00a61fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 20:49:05 2021 +0300

    Merge branch 'master' into add-specs

commit cdd95cfa4e6be74acd4d15a2908504e9e27f29d8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 18:03:55 2021 +0300

    all: fix specs

commit fe2a3017f5c88d429ca6f962dee293338d55919f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 17:30:45 2021 +0300

    all: use the correct gpg key

commit a28eff00f7a98a078e34c2b16e887c05364b6087
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 17:14:28 2021 +0300

    all: imp Makefile, specs

commit 6faa3c0687387e4fd60433d326a99da01dd21b02
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 16:50:41 2021 +0300

    all: add bamboo specs
 2021-04-08 13:55:12 +03:00
Eugene Burkov 80ed8be145 Pull request: 2704 local addresses vol.3 
Merge in DNS/adguard-home from 2704-local-addresses-vol.3 to master

Updates #2704.
Updates #2829.
Updates #2928.

Squashed commit of the following:

commit 8c42355c0093a3ac6951f79a5211e7891800f93a
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 7 18:07:41 2021 +0300

    dnsforward: rm errors pkg

commit 7594a21a620239951039454dd5686a872e6f41a8
Merge: 830b0834 908452f8
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 7 18:00:03 2021 +0300

    Merge branch 'master' into 2704-local-addresses-vol.3

commit 830b0834090510096061fed20b600195ab3773b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 7 17:47:51 2021 +0300

    dnsforward: reduce local upstream timeout

commit 493e81d9e8bacdc690f88af29a38d211b9733c7e
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 19:11:00 2021 +0300

    client: private_upstream test

commit a0194ac28f15114578359b8c2460cd9af621e912
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 18:36:23 2021 +0300

    all: expand api, fix conflicts

commit 0f4e06836fed958391aa597c8b02453564980ca3
Merge: 89cf93ad 8746005d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 18:35:04 2021 +0300

    Merge branch 'master' into 2704-local-addresses-vol.3

commit 89cf93ad4f26c2bf4f1b18ecaa4d3a1e169f9b06
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 18:02:40 2021 +0300

    client: add local ptr upstreams to upstream test

commit e6dd869dddd4888474d625cbb005bad6390e4760
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 15:24:22 2021 +0300

    client: add private DNS form

commit b858057b9a957a416117f22b8bd0025f90e8c758
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 13:05:28 2021 +0300

    aghstrings: mk cloning correct

commit 8009ba60a6a7d6ceb7b6483a29f4e68d533af243
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 12:37:46 2021 +0300

    aghstrings: fix lil bug

commit 0dd19f2e7cc7c0de21517c37abd8336a907e1c0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 20:45:01 2021 +0300

    all: log changes

commit eb5558d96fffa6e7bca7e14d3740d26e47382e23
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 20:18:53 2021 +0300

    dnsforward: keep the style

commit d6d5fcbde40a633129c0e04887b81cf0b1ce6875
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 20:02:52 2021 +0300

    dnsforward: disable redundant filtering for local ptr

commit 4f864c32027d10db9bcb4a264d2338df8c20afac
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 17:53:17 2021 +0300

    dnsforward: imp tests

commit 7848e6f2341868f8ba0bb839956a0b7444cf02ca
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 5 14:52:12 2021 +0300

    all: imp code

commit 19ac30653800eebf8aaee499f65560ae2d458a5a
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Sun Apr 4 16:28:05 2021 +0300

    all: mv more logic to aghstrings

commit fac892ec5f0d2e30d6d64def0609267bbae4a202
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 2 20:23:23 2021 +0300

    dnsforward: use filepath

commit 05a3aeef1181b914788d14c7519287d467ab301f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 2 20:17:54 2021 +0300

    aghstrings: introduce the pkg

commit f24e1b63d6e1bf266a4ed063f46f86d7abf65663
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 2 20:01:23 2021 +0300

    all: imp code

commit 0217a0ebb341f99a90c9b68013bebf6ff73d08ae
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 2 18:04:13 2021 +0300

    openapi: log changes

... and 3 more commits
 2021-04-07 20:16:06 +03:00
Ainar Garipov 908452f883 Pull request: all: fix names of runtime clients on query log page 
Updates #2929.

Squashed commit of the following:

commit f02111aac1e9d63732589b65b224613aa3240677
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 17:40:16 2021 +0300

    all: fix names of runtime clients on query log page
 2021-04-07 17:49:37 +03:00
Ainar Garipov c133b01ef7 Pull request: all: add idna handling, imp domain validation 
Updates #2915.

Squashed commit of the following:

commit b907324426c87ee7334edbd61e43c44444ad27a9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 16:26:41 2021 +0300

    all: imp docs, upd

commit c022f75cac006e077095cad283fea0a91d3a0eea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 15:51:30 2021 +0300

    all: add idna handling, imp domain validation
 2021-04-07 16:36:38 +03:00
Ainar Garipov 00a61fdea0 Pull request: all: use renameio instead of golibs/file 
Merge in DNS/adguard-home from use-renameio to master

Squashed commit of the following:

commit 807cda37b0e9e49539c1a8ce7912b74bd3c05b08
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 19:54:21 2021 +0300

    all: use renameio instead of golibs/file
 2021-04-06 20:48:36 +03:00
Ainar Garipov 65553a29e9 Pull request: dhcpd: do not overwrite dhcpv4 options 
Updates #2927.

Squashed commit of the following:

commit b4b0f5928260a7ddada71521e5954eb326d61468
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 16:31:01 2021 +0300

    dhcpd: do not overwrite dhcpv4 options
 2021-04-06 16:40:05 +03:00
Ainar Garipov 8746005d19 Pull request: home: print client ip after failed logins 
Updates #2824.

Squashed commit of the following:

commit 4457725b00b13b52e4fe99a59e7ef8036bb56276
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 14:23:12 2021 +0300

    home: imp docs, spacing

commit 7392cba8b3a32d874042805eb904af7455b1da9a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 14:10:12 2021 +0300

    home: print client ip after failed logins
 2021-04-06 14:31:20 +03:00
Ainar Garipov 2a43560176 Pull request: client: imp locale detection 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit f620ca70b2aba2937cf4c2236ca756329d9f38df
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 2 18:27:53 2021 +0300

    client: imp locale detection
 2021-04-02 18:52:13 +03:00
Ainar Garipov 85b31c58b7 Pull request: all: imp build time, go mod tidy 
Merge in DNS/adguard-home from imp-build-time to master

Squashed commit of the following:

commit 580134d60cfe64fbc3ab388100cf0613095d5b72
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 2 17:48:50 2021 +0300

    all: imp build time, go mod tidy
 2021-04-02 18:10:25 +03:00
Ainar Garipov 7c35d208b1 Pull request: querylog: search clients by name, enrich http resp 
Updates #1273.

Squashed commit of the following:

commit 55b78153b1b775c855e759011141bbbe6d4b962c
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Fri Apr 2 16:55:39 2021 +0300

    Update client_info in case of null

commit 5c80c1438ed9d961af11617831b704d6ae15cc34
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 2 16:24:14 2021 +0300

    querylog: always set client_info

commit b48efd64d757cc0bcf5b34de22fdd0b0464d98a6
Merge: 4ed7eab5 23c9f528
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 2 16:22:08 2021 +0300

    Merge branch 'master' into 1273-querylog-client-name

commit 4ed7eab52b6b5b0c0ddb5aa5a3225a62d1f9265b
Merge: dbf990eb 70d4c70e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 2 12:57:17 2021 +0300

    Merge branch 'master' into 1273-querylog-client-name

commit dbf990eb881116754554270e7b691b5db8e9ee34
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 2 12:56:13 2021 +0300

    home: imp names

commit c2cfdef494ca26fff62b9fa008f1b389d9d4d46b
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Thu Apr 1 19:26:04 2021 +0300

    Rename to whois

commit e3cc4a68ee576770b1922680155308e33bed31e8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 1 19:03:42 2021 +0300

    home: imp whois more

commit 3b8ef8691c298aff35946b35923ef2e5b1f9bbbe
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 1 18:51:14 2021 +0300

    home: imp whois resp

commit fb97e0d74976723a512d6ff4c69e830fe59c8df8
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Thu Apr 1 18:00:03 2021 +0300

    Fix client_info ids prop types

commit 298005189e372651ceff453e88aca19ee925a138
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Thu Apr 1 17:58:14 2021 +0300

    Adapt changes on client

commit aa1769f64197d865478a66271da483babfc5dfd0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 1 17:18:36 2021 +0300

    all: add more fields to querylog client

commit 4b2a2dbd380ec410f3068d15ea16430912e03e33
Merge: cda92c3f 2e4e2f62
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 1 16:57:26 2021 +0300

    Merge branch 'master' into 1273-querylog-client-name

commit cda92c3f0331cbac252f3163d31457f716bc7f2c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 18:03:51 2021 +0300

    querylog: fix windows tests

commit 5a56f0a32608869ed93a38f18f63ea3a20f7bde2
Merge: 627e4958 e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 17:45:53 2021 +0300

    Merge branch 'master' into 1273-querylog-client-name

commit 627e495828e82d44cc77aa393536479f23cc68b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 17:44:49 2021 +0300

    querylog: add tests, imp code, docs

commit 6dec468a2f0c29357875ff99458e0e8f8e580e6d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Mar 26 16:10:47 2021 +0300

    querylog: search clients by name, enrich http resp
 2021-04-02 17:30:39 +03:00
Ainar Garipov 23c9f528db Pull request: all: add race build mode 
Squashed commit of the following:

commit 37ca2962b0c7ee870d07aee5043edcdeb2b2c2ad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 2 13:27:32 2021 +0300

    all: run tests with race enabled

commit 20af1abb95f65c8fa46f6e00172ab8f54a785285
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 2 13:14:36 2021 +0300

    all: add race build mode
 2021-04-02 13:44:55 +03:00
Ainar Garipov 70d4c70e75 Pull request: client: use relative links for mobileconfig api 
Updates #2905.

Squashed commit of the following:

commit af607433e07a43497930cdc1ef0012fa713e64da
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 1 19:33:35 2021 +0300

    client: use relative links for mobileconfig api
 2021-04-02 12:33:16 +03:00
Ainar Garipov 2e4e2f6270 Pull request: client: imp router instructions 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 2585c9ad41e18a11e8f539e30e8ca35fcd8e1314
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 31 16:29:20 2021 +0300

    client: imp router instructions
 2021-03-31 16:54:52 +03:00
Ainar Garipov 1c30b1d5d6 Pull request: Proposes adding tzdata to Dockerfile so that container will respect TZ= environment variable. 
Updates #2898.

* commit '86669b9bed662de3b2c94eec411dfe19dd1da470':
  Proposes adding tzdata to Dockerfile so that container will respect TZ= environment variable.
 2021-03-31 15:51:52 +03:00
Eugene Burkov 86444eacc2 Pull request: 2704 local addresses vol.2 
Merge in DNS/adguard-home from 2704-local-addresses-vol.2 to master

Updates #2704.
Updates #2829.

Squashed commit of the following:

commit 507d038c2709de59246fc0b65c3c4ab8e38d1990
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 14:33:05 2021 +0300

    aghtest: fix file name

commit 8e19f99337bee1d88ad6595adb96f9bb23fa3c41
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 14:06:43 2021 +0300

    aghnet: rm redundant mutexes

commit 361fa418b33ed160ca20862be1c455ab9378c03f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 13:45:30 2021 +0300

    all: fix names, docs

commit 14034f4f0230d7aaa3645054946ae5c278089a99
Merge: 35e265cc a72ce1cf
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 13:38:15 2021 +0300

    Merge branch 'master' into 2704-local-addresses-vol.2

commit 35e265cc8cd308ef1fda414b58c0217cb5f258e4
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 13:33:35 2021 +0300

    aghnet: imp naming

commit 7a7edac7208a40697d7bc50682b923a144e28e2b
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 20:59:54 2021 +0300

    changelog: oops, nope yet

commit d26a5d2513daf662ac92053b5e235189a64cc022
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 20:55:53 2021 +0300

    all: some renaming for the glory of semantics

commit 9937fa619452b0742616217b975e3ff048d58acb
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Mar 29 15:34:42 2021 +0300

    all: log changes

commit d8d9e6dfeea8474466ee25f27021efdd3ddb1592
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Mar 26 18:32:23 2021 +0300

    all: imp localresolver, imp cutting off own addresses

commit 344140df449b85925f19b460fd7dc7c08e29c35a
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Mar 26 14:53:33 2021 +0300

    all: imp code quality

commit 1c5c0babec73b125044e23dd3aa75d8eefc19b28
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Mar 25 20:44:08 2021 +0300

    all: fix go.mod

commit 0b9fb3c2369a752e893af8ddc45a86bb9fb27ce5
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Mar 25 20:38:51 2021 +0300

    all: add error handling

commit a7a2e51f57fc6f8f74b95a264ad345cd2a9e026e
Merge: c13be634 27f4f052
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Mar 25 19:48:36 2021 +0300

    Merge branch 'master' into 2704-local-addresses-vol.2

commit c13be634f47bcaed9320a732a51c0e4752d0dad0
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Mar 25 18:52:28 2021 +0300

    all: cover rdns with tests, imp aghnet functionality

commit 48bed9025944530c613ee53e7961d6d5fbabf8be
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 24 20:18:07 2021 +0300

    home: make rdns great again

commit 1dbacfc8d5b6895807797998317fe3cc814617c1
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 24 16:07:52 2021 +0300

    all: imp external client restriction

commit 1208a319a7f4ffe7b7fa8956f245d7a19437c0a4
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Mar 22 15:26:45 2021 +0300

    all: finish local ptr processor

commit c8827fc3db289e1a5d7a11d057743bab39957b02
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 2 13:41:22 2021 +0300

    all: imp ipdetector, add local ptr processor
 2021-03-31 15:00:47 +03:00
Phill Kelley 86669b9bed
Proposes adding tzdata to Dockerfile so that container will respect TZ= environment variable. 
Example docker-compose.yml

```
version: '3.6'

services:

  adguardhome:
    container_name: adguardhome
    image: adguard/adguardhome
    restart: unless-stopped
    environment:
      - TZ=Australia/Sydney
    ports:
      - "53:53/tcp"
      - "53:53/udp"
      - "8089:8089/tcp"
      - "3001:3000/tcp"
    volumes:
       - ./volumes/adguardhome/workdir:/opt/adguardhome/work
       - ./volumes/adguardhome/confdir:/opt/adguardhome/conf
```

Start container:

```
$ docker-compose up -d adguardhome
Creating adguardhome ... done
```

Test 1: shows container ignoring TZ== and running UTC.

```
$ docker exec adguardhome date
Wed Mar 31 11:05:37 UTC 2021
```

Add tzdata package to container:

```
$ docker exec adguardhome apk add --no-cache tzdata
fetch http://dl-cdn.alpinelinux.org/alpine/v3.12/main/armv7/APKINDEX.tar.gz
fetch http://dl-cdn.alpinelinux.org/alpine/v3.12/community/armv7/APKINDEX.tar.gz
(1/1) Installing tzdata (2021a-r0)
Executing busybox-1.31.1-r19.trigger
OK: 8 MiB in 17 packages
```

Test 2: shows container respecting TZ= and running UTC+11.

```
$ docker exec adguardhome date
Wed Mar 31 22:07:58 AEDT 2021
```
 2021-03-31 22:17:22 +11:00
Ainar Garipov a72ce1cfae Pull request: client: imp en locale, grammar 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 49f565db4e7167ed404413b6eaa75b0ab38c79d4
Merge: f60989f0 1d07afb3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 31 13:04:18 2021 +0300

    Merge branch 'master' into imp-i18n

commit f60989f069fd7c52d00e41e4aaad2e824d2d2e2e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 31 13:04:03 2021 +0300

    client: imp wording

commit 6909bb89f7af74c8245ecd81dc255b2890202cca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Mar 30 18:33:42 2021 +0300

    client: imp en locale, grammar
 2021-03-31 13:29:29 +03:00
Eugene Burkov 1d07afb30e Pull request: 2416 improve version output 
Merge in DNS/adguard-home from 2416-version to master

Updates #2416.

Squashed commit of the following:

commit ad529ee429abd7fa12400e089a4e566da3df9f66
Merge: 9ba2f684 bfc7e16d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 12:42:37 2021 +0300

    Merge branch 'master' into 2416-version

commit 9ba2f6845b1202909f3e142ae99e44815c9e090e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Mar 31 12:40:53 2021 +0300

    all: fix docs

commit 521a61df49381fecf1bc992752d7cbbcccb23bb6
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 17:48:56 2021 +0300

    all: imp code

commit 844c4e0fb0192779bea4bfd3b0f5e4cf69e2073c
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 17:48:56 2021 +0300

    all: imp docs, log changes

commit c8206b0d161a7040dec7983dbaa240a8d08f4746
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 17:19:51 2021 +0300

    version: imp verbose output

commit b2b41d478023bdd2dd01a73c44be309ba94e4ac8
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 16:37:23 2021 +0300

    version: imp code, docs

commit 553bd9ce5fb59348f5ecd21a762dccf3834befee
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Mar 30 14:07:05 2021 +0300

    version: imp verbosed output
 2021-03-31 12:55:21 +03:00
Ainar Garipov bfc7e16d84 Pull request: dhcpd: do not assume mac addrs of 6 bytes 
Closes #2828.

Squashed commit of the following:

commit 26c6cf81c32469e1c4955aafb40490c29b4d1a99
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Mar 30 17:43:53 2021 +0300

    dhcpd: do not assume mac addrs of 6 bytes
 2021-03-31 12:36:57 +03:00
Ainar Garipov 48e82f9ab5 Pull request: 2479 simpl 
Updates #2479.

Squashed commit of the following:

commit 0fdb0d041d0bd0d9af64513cf82397456a30e2f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 19:22:56 2021 +0300

    dnsfilter: add a comment

commit d5d6538b8b5133d7c1e9b242a8ac802448d40893
Merge: 6a09acc2 e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 19:19:39 2021 +0300

    Merge branch 'master' into 2479-simpl

commit 6a09acc262
Author: jvoisin <julien.voisin@dustri.org>
Date:   Tue Dec 22 16:43:47 2020 +0100

    Generalise a construct to simplify a function
 2021-03-29 19:35:35 +03:00
Ainar Garipov e710ce1100 Pull request: client: upd i18n 
Updates #2643.

Squashed commit of the following:

commit 4f6098ce31fb3e9e81d66ca613e02c9573763e13
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 14:01:33 2021 +0300

    client: upd i18n
 2021-03-29 15:39:08 +03:00
Ainar Garipov ffb503976b Pull request: all: fix windows tempdir 
Merge in DNS/adguard-home from try-fixing-windows-tests to master

Squashed commit of the following:

commit 25a43db5d53f24b98921efa21d8d2f231992e761
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Mar 26 21:19:00 2021 +0300

    all: fix windows tempdir
 2021-03-29 11:40:04 +03:00