Ainar Garipov
933ca2af2a
Pull request: scripts: don't use features not guaranteed by posix
...
Merge in DNS/adguard-home from 2276-fix-portability to master
Updates #2276 .
Squashed commit of the following:
commit 3019099f2498923495575873daf372598aa72478
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 31 14:31:02 2020 +0300
scripts: don't use features not guaranteed by posix
2020-12-31 15:12:46 +03:00
Ainar Garipov
cfd492cf7c
Pull request: scripts: fix build-release
...
Merge in DNS/adguard-home from 2276-fix-release-3 to master
Updates #2276 .
Updates #2507 .
Squashed commit of the following:
commit 1f756975922b403e06dca3e9d44d9ed2edccb97c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 31 13:45:25 2020 +0300
scripts: fix build-release
2020-12-31 13:55:39 +03:00
Ainar Garipov
3706f559c1
Pull request: scripts: fix Dockerfile, build-release.sh
...
Merge in DNS/adguard-home from 2276-fix-release-2 to master
Updates #2276 .
Squashed commit of the following:
commit cc7edffca6862579a745600b4008428d4c9a73d9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 30 22:56:01 2020 +0300
scripts: fix Dockerfile, build-release.sh
2020-12-30 23:18:15 +03:00
Ainar Garipov
e20e94ddd4
Pull request: all: fix gpg_key, release
...
Merge in DNS/adguard-home from 2276-fix-release to master
Updates #2276 .
Squashed commit of the following:
commit d7b4af6aa867159c5ced8b421a20606f5ee11fd6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 30 20:26:33 2020 +0300
all: remove comment
commit cd779699159c4efee4b64184b331add94a7ba57e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 30 20:25:24 2020 +0300
all: fix gpg_key, release
2020-12-30 20:36:57 +03:00
Ainar Garipov
0e84962fde
Pull request: all: add a new Makefile and scripts, remove goreleaaser
...
Merge in DNS/adguard-home from 2276-releases to master
Updates #2276 .
Squashed commit of the following:
commit 84961947c51477aae53606ec6e2e0cce0bdfc139
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 30 14:36:13 2020 +0300
all: fix github build
commit 54af2adbf2f433e80393fb142e66ba6b3a78b13e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 30 14:34:02 2020 +0300
all: remove old Dockerfile, improve build scripts
commit 99bb2f2ba1458d32074ac0911b5c02ce6669e43e
Merge: 2292b677a 5e20ac7ed
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 30 13:47:19 2020 +0300
Merge branch 'master' into WIP-2276-releases
commit 2292b677a20ce8e93d9e6e2bb042cd468606fec3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 30 13:30:10 2020 +0300
all: improve docker build
commit 0bcc97c41f105ee4a4363f20fa4775c7643bf0cc
Merge: c7d3f12ef aef4659e9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 29 17:47:45 2020 +0300
Merge branch 'master' into WIP-2276-releases
commit c7d3f12ef2b63ddfa2acf46e3129fcbc56fb0a90
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 29 16:28:25 2020 +0300
all: improve build scripts
commit 55de1e5d7ef0fbdbd1a76cfb71362d16ca0a1966
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 29 15:36:47 2020 +0300
all: fix Makefile
commit d11b1fe28d0fde1efeaf6160a614951b19d0ef94
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 29 14:16:19 2020 +0300
scripts: fix build-release
commit ecc0577e2451afa86c37da7283a63a9d26fb37ba
Merge: dde64ed8e 483f02c92
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 29 13:59:32 2020 +0300
Merge branch 'master' into WIP-2276-releases
commit dde64ed8e456f73559f21c2ca549dc3b46724add
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 25 18:04:46 2020 +0300
all: imp docs, other improvements
commit be8574408db79901bb15c1d31916db3ca352a35f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 25 14:48:30 2020 +0300
all: imp docker build
commit fc1876f34b93d667bf166226f4bc666d394f10c7
Merge: fa5a304c8 955b735c8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 25 13:54:29 2020 +0300
Merge branch 'master' into WIP-2276-releases
commit fa5a304c83d86145796a2de4141de6d18f7c56bf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 19:10:51 2020 +0300
all: improve scripts
commit 3f32e3fd5e658d058d5c5172519384efc6cfef83
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 18:50:01 2020 +0300
all: improve scripts
commit 2d38b81421acab4b90a7a19da7598c75063e8e93
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 18:25:21 2020 +0300
all: fix shell for windows, improve go-lint.sh
commit d695285cd6dc476c0d972cfe0c49bbeea5f5a049
Merge: 313b020e9 9fb6bf82c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 18:14:38 2020 +0300
Merge branch 'master' into WIP-2276-releases
commit 313b020e9dfcdab736670cee72b2171eac8c32b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 18:13:31 2020 +0300
Makefile: use npm ci again
commit 5acee9d6a6c8cd2a7dd04b173a73929650882bad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 17:57:54 2020 +0300
all: try fixing windows build
commit c63a2a54641ac8cd032a3306bb35e49b9ae74728
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 17:39:30 2020 +0300
all: imp scripts, try another goproxy and direct
commit 423229e8b63ee73caeee8e84c23f67d145aff9df
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 17:25:29 2020 +0300
all: imp HACKING.md, try a new proxy
... and 1 more commit
2020-12-30 18:26:25 +03:00
Eugene Burkov
5e20ac7ed5
Pull request: beta client squashed
...
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed
2020-12-29 19:53:56 +03:00
Artem Baskal
aef4659e93
2487 Fix the remaining stylint issues
...
* commit 'fa96d49dcb690131d4a559ab16b27453c147a4c9':
Fix the remaining stylint issues
2020-12-29 17:07:45 +03:00
Artem Baskal
455efd60f4
2469 allow zoom
...
* commit '18b5f6e5e468548b9006f163b3ebf0ba237688a0':
Allow scroll
Allow users to zoom
2020-12-29 17:07:26 +03:00
jvoisin
fa96d49dcb
Fix the remaining stylint issues
2020-12-29 12:22:02 +03:00
Eugene Burkov
483f02c92a
Pull request: doc the Question[0] inspection
...
Merge in DNS/adguard-home from 2465-question-0 to master
Closes #2465 .
Squashed commit of the following:
commit 0dbcaf7eea4f582cedc31f37d1b20162fe1c38df
Merge: 0d7c22cd0 8a1d86aa7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 28 19:09:25 2020 +0300
Merge branch 'master' into 2465-question-0
commit 0d7c22cd0eb930bd301a4bb7b8f23e9fd78a2ccd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Dec 23 14:17:13 2020 +0300
dnsforward: doc the Question[0] inspection
2020-12-28 19:26:37 +03:00
Eugene Burkov
8a1d86aa7d
Pull request: data race
...
Merge in DNS/adguard-home from 2489-data-race to master
Closes #2489 .
Squashed commit of the following:
commit 7745b79f0489970f3ba1bb11bb757b998fa6369c
Merge: d070cfd53 93ffed780
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 28 19:00:07 2020 +0300
Merge branch 'master' into 2489-data-race
commit d070cfd53e72b609f305cd8d79d747fbf47dc5f4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Dec 25 20:31:21 2020 +0300
util: fix ignoring write events bug
commit 725850bdbd96eaf65fb3228fcaeba51a3ec95905
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Dec 25 17:38:29 2020 +0300
util: simpl hosts upd algo
2020-12-28 19:07:29 +03:00
Ainar Garipov
93ffed7809
Pull request: dnsfilter: improve cname rewrite validation
...
Merge in DNS/adguard-home from 2492-dnsrw-host to master
Closes #2492 .
Squashed commit of the following:
commit 7128ed15de86c926ea4cff9fd8d3d3821657254f
Merge: e678c64e6 338209f32
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 18:42:25 2020 +0300
Merge branch 'master' into 2492-dnsrw-host
commit e678c64e656ccf69c6818e9165ff1451f7c8fde6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 18:04:52 2020 +0300
dnsfilter: improve cname rewrite validation
2020-12-28 18:49:36 +03:00
Ainar Garipov
338209f32b
Pull request: all: improve dnsrewrite handling
...
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master
Closes #2491 .
Squashed commit of the following:
commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 18:33:32 2020 +0300
Merge branch 'master' into 2491-dnsrewrite-log
commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 28 18:11:01 2020 +0300
Add RewriteRule for client
commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 17:22:44 2020 +0300
all: imp naming, docs
commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 17:16:35 2020 +0300
all: imp naming, add todo
commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 28 16:53:00 2020 +0300
all: improve dnsrewrite handling
2020-12-28 18:41:50 +03:00
Artem Baskal
15d8f979b1
client: 2451 Remove empty rules label
...
Close #2451
* commit '67ad07d69ad3d8805c3d42f836b0759bc0b95a4e':
client: 2451 Remove empty rules label
2020-12-28 16:53:36 +03:00
Artem Baskal
67ad07d69a
client: 2451 Remove empty rules label
2020-12-28 16:39:15 +03:00
Andrey Meshkov
ace7c1c892
fixed comparison
2020-12-28 12:28:47 +03:00
Andrey Meshkov
e5780fa308
Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home
2020-12-28 12:25:27 +03:00
Artem Baskal
644a9b5565
client: 2451 Support multiple matched rules in the UI
...
Close #2451
Squashed commit of the following:
commit f6d0a8fe4fa575dff67b2d2f4c9f6aaf6a6414d3
Merge: 3b13e529d 955b735c8
Author: Artem Baskal <a.baskal@adguard.com>
Date: Fri Dec 25 14:53:16 2020 +0300
Merge branch 'master' into feature/2451
commit 3b13e529da01823cbc674d81be065b68cd08bbd3
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Dec 24 12:53:13 2020 +0300
Update JSXElement in jsdocs
commit f0749cd0466ef69d964b1c2575dffacb33f71b31
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 21 13:23:48 2020 +0300
minor
commit bd014b00e762a1895c132bc962c06f107c50fe17
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 21 12:49:29 2020 +0300
Minor helper update
commit 260a66b7b78eb80596b88fec14f409838727e4bb
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 21 12:31:08 2020 +0300
Rule locale update
commit c960cf9f658e52cb587676dceb97506880a9db94
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 21 12:27:50 2020 +0300
Add styles for filters list
commit 6f3b2176fd52598cddb147ad7828adb95abf08f0
Author: Artem Baskal <a.baskal@adguard.com>
Date: Fri Dec 18 18:34:17 2020 +0300
client: 2451 Support multiple matched rules in the UI
2020-12-25 15:03:37 +03:00
Ainar Garipov
955b735c8b
Pull request: all: add depracation section to CHANGELOG.md, imp HACKING.md
...
Merge in DNS/adguard-home from doc-deprecated to master
Squashed commit of the following:
commit c189404164af25786eea83fcee635c497f0cfe00
Merge: 108097cda 1191a9acb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 25 13:40:11 2020 +0300
Merge branch 'master' into doc-deprecated
commit 108097cda62866ea78a55b9ddbbba1fdc68cef09
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 25 13:05:03 2020 +0300
all: imp markup and wording
commit 05a630da77b9b8491ba07cd647d9379c63b9c64e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 20:57:43 2020 +0300
all: add depracation section to CHANGELOG.md, imp HACKING.md
2020-12-25 13:50:52 +03:00
Ainar Garipov
1191a9acb7
Pull request: 2473 update backoff
...
Merge in DNS/adguard-home from 2473-update-backoff to master
Updates #2473 .
* commit 'cbdf80727f3cfb7f7908393c194cf8d5f0fb90c5':
home: imp naming
home: improve error handling
Use a simple backoff for retrying the update
2020-12-25 13:38:26 +03:00
Ainar Garipov
cbdf80727f
Merge branch 'master' into 2473-update-backoff
2020-12-25 12:57:44 +03:00
Ainar Garipov
0801c89234
Pull request: 2472 readme pihole
...
Merge in DNS/adguard-home from 2472-readme-pihole to master
Updates #2472 .
Squashed commit of the following:
commit 0a609eff90c6e5097d79562560aff52c6f752669
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 21:07:18 2020 +0300
all: imp table in README.md
commit c544a43b74e81c4404a20f2ff69cb5b8a0787226
Author: jvoisin <julien.voisin@dustri.org>
Date: Tue Dec 22 11:44:21 2020 +0100
Update the comparison with the Pi-Hole
- AGH is written in Go, which is memory-safe, instead of using dnsmasq which
has a terrible security record.
- AGH is able to run without root privileges, while the Pi-Hole isn't.
2020-12-25 12:56:03 +03:00
Ainar Garipov
4bc1337cc9
home: imp naming
2020-12-25 12:54:22 +03:00
Ainar Garipov
664ef85c6c
home: improve error handling
2020-12-24 21:45:15 +03:00
jvoisin
39268c754a
Use a simple backoff for retrying the update
...
- Not sleeping might be too fast for the DNS server to restart
- Fix the link to the issue
2020-12-24 21:45:15 +03:00
Artem Baskal
18b5f6e5e4
Allow scroll
2020-12-24 19:06:44 +03:00
Ainar Garipov
9fb6bf82c7
Pull request: all: improve prerelease version selection
...
Merge in DNS/adguard-home from fix-prereleases to master
Squashed commit of the following:
commit 34424e41a0d4f1e22a0dede91e0de1b463d08a0a
Merge: 02e832fc0 6f50a4c96
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 24 17:46:43 2020 +0300
Merge branch 'master' into fix-prereleases
commit 02e832fc02dc197e40997bf566081b6d8f54420e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 23 17:27:37 2020 +0300
all: improve prerelease version selection
2020-12-24 18:02:56 +03:00
jvoisin
8e793261e6
Allow users to zoom
...
This is useful for users with bad eyes, since it
allows them to zoom on the page.
2020-12-24 15:42:27 +03:00
Artem Baskal
6f50a4c964
2485 Fix a couple of stylelint violations
...
* commit '334b3fc636025657ac6af2df0b90ec01332c8187':
Fix a couple of stylelint violations
2020-12-24 15:38:40 +03:00
Artem Baskal
6a5bd99eed
2475 Inline a handler for consistency's sake
...
* commit '4cc68341865f5ccae294ec63103911cb032be3a0':
Inline a handler for consistency's sake
2020-12-24 15:38:05 +03:00
Artem Baskal
ab1cefca4b
2474 fix typing problems
...
* commit 'bc9be8d9eebdc8ab19607b8547d81736b32ba58c':
Update type definition
Fix some typing problems
2020-12-24 15:37:37 +03:00
Artem Baskal
5b3dfe3274
2468 Use a meaningful alt for adguard home's logo
...
* commit 'a8677c082b4661552a5619a86f9a52b0822ab3d7':
Use a meaningful alt for adguard home's logo
2020-12-24 15:37:03 +03:00
Artem Baskal
fa1056b424
2467 button title
...
* commit '1f649b9799a67588b771ec61658ff5e8ac83f57c':
Change button title translation key
Add a title to the refresh buttons
2020-12-24 15:36:34 +03:00
Artem Baskal
a560dafa37
2466 Remove a superfluous argument
...
* commit 'e393acf5eb08251cd38073a181f5ddce08264af5':
Remove a superfluous argument
2020-12-24 15:35:44 +03:00
Artem Baskal
bc9be8d9ee
Update type definition
2020-12-24 12:34:38 +03:00
jvoisin
334b3fc636
Fix a couple of stylelint violations
2020-12-23 18:14:42 +01:00
Artem Baskal
1f649b9799
Change button title translation key
2020-12-23 19:03:46 +03:00
Ainar Garipov
e829e7a064
Pull request: 2471 defer
...
Merge in DNS/adguard-home from 2471-defer to master
Updates #2471 .
* commit '1c754788f9139ed9741cf01c6d94bcced6909b8c':
home: improve getCurrentUser
home: improve checkSession
Use a couple of defer in internal/home/auth.go
2020-12-23 13:16:44 +03:00
Ainar Garipov
fc79e2e8f8
Pull request: all: support more $dnsrewrite rr types
...
Merge in DNS/adguard-home from 2102-dnsrewrite-2 to master
Updates #2102 .
Updates #2452 .
Squashed commit of the following:
commit b41e57731b4f276e97202e172fa400067174653d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 20:40:56 2020 +0300
dnsforward: improve naming
commit 70b832ce969d8cdcf4224d221e5e1e2057fba6ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 22 19:36:21 2020 +0300
all: support more $dnsrewrite rr types
2020-12-23 12:35:07 +03:00
Ainar Garipov
1c754788f9
home: improve getCurrentUser
2020-12-22 21:09:53 +03:00
Ainar Garipov
925c5df801
home: improve checkSession
2020-12-22 21:05:12 +03:00
jvoisin
f893df7e64
Use a RWMutex instead of a Mutex for authosts
2020-12-22 13:39:50 +01:00
jvoisin
4cc6834186
Inline a handler for consistency's sake
2020-12-22 13:30:25 +01:00
jvoisin
07497beb78
Fix some typing problems
...
- Using '' as default value is confusing when the function expects a number
as parameter
- `validateRequiredValue` can take a number as well as a string as first
parameter
2020-12-22 13:18:14 +01:00
jvoisin
7eb3e00b35
Use a couple of defer in internal/home/auth.go
2020-12-21 19:39:39 +01:00
Andrey Meshkov
c62dd03921
Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home
2020-12-21 19:34:23 +03:00
Andrey Meshkov
ab63b6e131
Added links to README
2020-12-21 19:34:19 +03:00
jvoisin
a8677c082b
Use a meaningful alt for adguard home's logo
2020-12-21 17:07:53 +01:00
jvoisin
026cc2ecbf
Add a title to the refresh buttons
...
This increases a bit the accessibility.
2020-12-21 17:01:09 +01:00
Ainar Garipov
bdff46ec1d
Pull request: all: add $dnsrewrite handling
...
Merge in DNS/adguard-home from 2102-dnsrewrite to master
Updates #2102 .
Squashed commit of the following:
commit 8490fc18179d38c4b162ff9b257fea1f8535afbd
Merge: d9448ddca e7f7799b3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 21 16:44:00 2020 +0300
Merge branch 'master' into 2102-dnsrewrite
commit d9448ddca6d4ef3635d767e3e496e44c35d3fc6e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 21 15:44:54 2020 +0300
querylog: support dnsrewrite rules
commit 40aa5d30acddf29fb90d249d8806941c6e1915a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 18 19:27:40 2020 +0300
all: improve documentation
commit f776a0cd63b1640ba1e5210d9301e2a2801fd824
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 18 19:09:08 2020 +0300
dnsfilter: prevent panics, improve docs
commit e14073b7500d9ed827a151c5b8fb863c980c10e8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 4 15:51:02 2020 +0300
all: add $dnsrewrite handling
2020-12-21 17:48:07 +03:00