Igor Lobanov
1afe226ce8
Pull request #2231 : ADG-8368 Frontend rewritten in TypeScript, added Node 18 support
...
Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master
Squashed commit of the following:
commit daa288ae0d76178af24595cc807055902e6f09ab
Merge: 4c89cf720
1085d59a6
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Mon Jun 10 17:22:20 2024 +0200
merge
commit 4c89cf7209
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 6 13:27:18 2024 +0300
remove install from initial state
commit b943f2011f
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 23:10:55 2024 +0200
frontend production build fix
commit cd1be2d66d
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 20:23:14 2024 +0200
production build quickfix
commit 7b8ac01fc2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 5 19:57:31 2024 +0300
all: upd node docker
commit 02afed66d5
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 18:23:12 2024 +0200
changelog fixes
commit 9c0f736f0c
Merge: 62c4fbf1e
e04775c4f
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 18:18:29 2024 +0200
merge
commit 62c4fbf1e3
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 16:22:22 2024 +0200
empty line in changelog
commit 76b1e44a93
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 16:20:37 2024 +0200
changelog
commit f783e90040
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 16:19:13 2024 +0200
filters.js -> filters.ts
commit 3d4ce6554c
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 16:18:03 2024 +0200
generated file removed
commit e35ba58f2a
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 15:45:21 2024 +0200
rollback unwanted changes
commit 1f30d4216d
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 15:27:36 2024 +0200
review fix
commit 6cd4e44f07
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 11:55:39 2024 +0200
missing generated file restoresd
commit 2ab738b303
Author: Igor Lobanov <bniwredyc@gmail.com>
Date: Wed Jun 5 11:40:32 2024 +0200
Frontend rewritten in TypeScript, added Node 18 support
2024-06-10 18:42:23 +03:00
Ildar Kamalov
bec3cab56c
Pull request: add etc timezones to the timezone list
...
Updates #6568
Squashed commit of the following:
commit cea0e9143eb1322d359fdb611ea7572431fef623
Merge: 6f4a5b162 b42063ee8
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Dec 28 13:40:47 2023 +0300
Merge branch 'master' into ADG-7953
commit 6f4a5b1629c2e9cffdc23292af8c1319fdd461f1
Merge: c574e3f52 d75712bb9
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 27 16:29:53 2023 +0300
Merge branch 'master' into ADG-7953
commit c574e3f52a73f39044b333a2857a11a23ca997a8
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 27 09:52:20 2023 +0300
ADG-7953 add etc timezones to the timezones list
2023-12-28 16:27:01 +03:00
Ainar Garipov
8bb80ba98f
Pull request 2022: 6280-password-length
...
Updates #6280 .
Squashed commit of the following:
commit 85014e27da6f289a4ecdd8cbd05c0bee358da39e
Merge: 2d93201ce 5f61b550f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:58:48 2023 +0300
Merge branch 'master' into 6280-password-length
commit 2d93201cea23517cdf3c2b3a4a4c26b7d89d2511
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:43:05 2023 +0300
client: rm dep
commit 3b11d10af8200110fbb1a1d7a7e6e26715ee0436
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:22:58 2023 +0300
client: imp i18n
commit f88dfc9a991c961b17a9add229a768a5cc127071
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:17:56 2023 +0300
all: imp i18n, names
commit a7874f5f1a057a76e05a009ed5204bb1a3d70f50
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 5 15:07:10 2023 +0300
all: fix passwd check
2023-10-05 16:20:28 +03:00
Stanislav Chzhen
aac36a2d2f
Pull request 1907: 951-blocked-services-schedule-api
...
Updates #951 .
Squashed commit of the following:
commit 6b840fd516f5a87fde0420e3aceb9c239b22c974
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Aug 29 19:53:03 2023 +0300
client: imp docs more
commit 7fc8f0363fbe4c4266cb0f67428fe4d18c351d2d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Aug 29 19:40:00 2023 +0300
client: imp docs
commit 00bc14d5760614f2797714cdc2c4c19b1a94b86e
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 18:43:49 2023 +0300
try to fix lock file
commit d749df74b576091e0b58928d86ea8b3b49f919da
Merge: c69f9230b e1f6229e5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Aug 28 18:14:02 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule-api
commit c69f9230b12f7c983db06b74324b3df77d74b32b
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 17:16:20 2023 +0300
revert eslintrc
commit b37916c2dff0ddea5293d87570bb58e3443d2d21
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 12:02:39 2023 +0300
fix translations
commit f5bb67d81506c687d0abd580049a3eee0af808e0
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 11:43:57 2023 +0300
fix helpers
commit 13ec6a8b3a0acfb62762ae7e46c6e98eb7c82212
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 11:24:57 2023 +0300
remove todo
commit 23724ec2fd683ed17b9f1cee841ad9aaf4c9d04f
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 09:56:56 2023 +0300
add clients schedule form
commit 84d29e558a329068e64e7a95ee183946aa4515b5
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 25 17:44:40 2023 +0300
fix schedule form
commit 83e4017688082e9eb670091d5a24d98157050502
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:58:16 2023 +0300
remove unused
commit ef2b68e138da382e3cf42586ae604e12d9493504
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:57:37 2023 +0300
client: fix translation string
commit 32ea80c968f52f18adbc811b2f06874644cdfe20
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:26:26 2023 +0300
wip schedule
commit 9b770873859186c9424c8d108812e32ddff33bad
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 21 14:29:50 2023 +0300
all: imp naming
commit ea4e9514ea3b264bcce7f2a301db817de4e87059
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jul 19 18:09:27 2023 +0300
all: imp code
commit 98a705bdaa5c1e79394c73e5d75af2416fe9f297
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jul 18 18:23:26 2023 +0300
all: imp naming
commit 4f84b55c7bfc9f7b680feac0ec45f5ea9189299a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 14 15:01:17 2023 +0300
all: add global schedule api
commit 87cf1646869ee9138964b47a27b7493674c8854a
Merge: cabb80ac1 2adc8624c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 14 12:09:29 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule-api
commit cabb80ac16de437a8118bb0166479574379c97a3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 13 13:37:23 2023 +0300
openapi: fix typo
commit 2279b03acbcfc3d76216f8aaf30ae1c7894127bc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 13 12:26:19 2023 +0300
all: imp docs
... and 3 more commits
2023-08-29 20:03:40 +03:00
Eugene Burkov
0ef8344178
Pull request: 3503 password policy
...
Merge in DNS/adguard-home from 3503-password-policy to master
Closes #3503 .
Squashed commit of the following:
commit 1f03cd9ef6e76a691ae383d6ba4b7f851eabddb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 10 18:24:59 2022 +0300
client: imp msg
commit e164ae2544284cf9a1d3333c50b68e361f78ce2a
Merge: b7efd764 f53f48cc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 10 16:52:01 2022 +0300
Merge branch 'master' into 3503-password-policy
commit b7efd7640ec0fa3deac5290f8306ce5142428718
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Feb 10 16:17:59 2022 +0300
client: remove empty line
commit f19aba6cb579d2c4681675c881000c8f16257ab9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Feb 10 16:09:14 2022 +0300
client: validate password length
commit a6943c94483306ecfc0d1431d576d42053823b61
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 4 18:57:02 2022 +0300
all: fix docs again
commit 9346bb6c393af0799a79b228285acdd8f8799b83
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 4 18:54:15 2022 +0300
openapi: fix docs
commit a8016443237c130f69108970ddfc77ef71126be6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 4 18:25:55 2022 +0300
all: validate passwd runes count
2022-02-10 18:30:41 +03:00
Dmitry Seregin
8454e65cd9
Pull request #1269 : tls: hide saved private key
...
Merge in DNS/adguard-home from 1898-hide-private-key to master
Squashed commit of the following:
commit 542569bbc098541f8e191cc5c1e5509a65fe2c5f
Merge: a07d715f 756c7064
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Aug 27 13:29:15 2021 +0300
Merge branch 'master' into 1898-hide-private-key
commit a07d715f0f0932fdad4ec3f1e1a265b43809e21b
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Aug 26 19:45:39 2021 +0300
fix bug
commit 9f2b70719a24aab827c2dc300fc94bf2202527a7
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Aug 26 19:07:17 2021 +0300
fixes
commit e79f0e620844531a737fff5a88f5c2cffc403f51
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Aug 26 18:35:32 2021 +0300
more documentation to god of documentation
commit 47790964ed05f50c075f6b6497b1517b0d974bea
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Aug 26 18:23:08 2021 +0300
changed var named && fixed description
commit d35de5a34eafb3ffbd1148982dd31735a2000377
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Aug 26 18:11:13 2021 +0300
revert locales
commit 514ab1a5d90039bf9aad1389dd0ed966fd1a7e65
Merge: 5d9b992a 16092e8b
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Aug 26 14:41:27 2021 +0300
Merge branch 'master' into 1898-hide-private-key
commit 5d9b992a236dec276a46a035509da6938a7da7bf
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Aug 26 14:41:13 2021 +0300
here we go again
commit 2e7b30df5f19953f4e055394083be62b23028ad6
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Aug 20 17:11:49 2021 +0300
update deps
commit 5e58c3e22a77c42f321deb9707f34f031b345d75
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Aug 20 17:10:19 2021 +0300
small fix
commit c2096377de0a8ecf4f36567322ad9171c5fb5ab2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Aug 20 17:07:45 2021 +0300
fixes && updated translations
commit ada2d4784e6288b1740b8564b6ffc1ef8f0dcf68
Merge: dc5ce072 550b1798
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Aug 20 13:17:34 2021 +0300
Merge branch 'master' into 1898-hide-private-key
commit dc5ce0721b5c095ed79f2a302ad90d9616785f93
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Aug 13 20:12:18 2021 +0300
tls: hide saved private key
If private key saved as a string, then hide it from the answer to UI
2021-08-27 13:42:31 +03:00
Ainar Garipov
6e9a90b9a8
Pull request: client: clarify browser sup
...
Merge in DNS/adguard-home from browser-compat to master
Squashed commit of the following:
commit a0e0c7fe879dd610bc5dccdb765a879521a4729f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 12:59:23 2021 +0300
client: clarify browser sup
2021-06-16 13:15:26 +03:00
Artem Baskal
a19523b258
- client: 2237 Update graph drawing library
...
Squashed commit of the following:
commit 980e9c2f37640ee204ce0365f6c3bcc74741cc7c
Merge: cb4cae82b 394fc5a9d
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Nov 16 14:52:26 2020 +0300
Merge branch 'master' into fix/2237
commit cb4cae82b5b605894d123d6442ea23b24cc90c12
Author: ArtemBaskal <asbaskal@miem.hse.ru>
Date: Thu Nov 12 12:07:49 2020 +0300
minor
commit 5c07dac48067b4ed201aeb59a44e8592ed2b0b67
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Nov 11 19:47:38 2020 +0300
minor
commit 53f60762e520427a080bdfcd94b08b9ed3a63ca4
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Nov 11 19:06:06 2020 +0300
Adapt mobile version
commit 7659ac733ce4606f6fadf30e0eaddbeefd6095d6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Nov 11 18:31:53 2020 +0300
Fix empty graph offset, return background area below graph
commit 45499adb20a90024dba4b0b4e44ad4f01a1782d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Nov 10 17:46:47 2020 +0300
- client: 2237 Update graph drawing library
2020-11-16 15:22:30 +03:00
Artem Baskal
06594bde8f
- client: Add link to 'update_failed' error toast
...
Close #2062
Squashed commit of the following:
commit a1a1d4fe74dd414f83477d972bc07062e2c890ab
Merge: 9535e109 84938c56
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 8 10:21:47 2020 +0300
Merge branch 'master' into fix/2062
commit 9535e10934c57c2592df234a030bad183c0086cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 7 13:59:57 2020 +0300
Fix translation
commit e6f912d1d2793fd008c22b4418681abcc54896d0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 7 12:03:45 2020 +0300
- client: Add link to 'update_failed' error toast
2020-09-08 13:18:19 +03:00
Artem Baskal
6b61429572
Pull request 743: + client: Query Logs Infinite Scroll
...
Merge in DNS/adguard-home from feature/infinite_scroll_query_logs to master
Squashed commit of the following:
commit 4407ef2e7c055066257da791fbd65e6b0a495729
Merge: 40b74522 0a4781be
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 16:20:23 2020 +0300
Merge branch 'master' into feature/infinite_scroll_query_logs
commit 40b745225112cf8d664220ed8f484b0aa16e997c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 15:46:27 2020 +0300
Remove dynamic translation of toasts
commit f08fa7b8c6a243f6b10e924aebccc183ce7814fd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 13:59:53 2020 +0300
Remove renderLimitIdx, update isEntireLog
commit 0f1b02616faaa5759c0a3f6d8257117fa22094d9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:11:14 2020 +0300
Rename variables
commit 0928570c689c1fa704af775382620d68893e7c1c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:06:50 2020 +0300
Make query logs short polling function more expressive
commit 9e773cbd6c287a1c799fa2680f3462508462ea7a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:06:19 2020 +0300
Fix Toast translation interface
commit f9c57033e5adc5788954cf086b2f114dd8938bcb
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 17:01:36 2020 +0300
Do not hide loader
commit b86ba48613437f5559a748ad9aa4cf79d15db082
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 16:56:34 2020 +0300
Add dynamic translation for all toasts
commit b9d1d9b447ca90a3c179e503fa5d4abd3516321e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 16:39:29 2020 +0300
Prevent getting query logs recursion if query is not changed
commit e25189749f7912648cca4503cfa8d0ad898c4bb6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 10:13:20 2020 +0300
Decrease page limit to 20
commit 8b248ac5276899de838abf2dc9a69e47599cfc12
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 18:47:12 2020 +0300
Return checkFilteredLogs
commit bf2d65c4a3dca0da6b15f632ae11042b7c8e2045
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 18:33:51 2020 +0300
Review changes
commit 01b5250f9d9136a1f334086d3e2f00d1a928b37b
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 15:29:59 2020 +0300
Remove checkFilteredLogs
commit 25b364c41e6a1489d930c8b3b39b1ab43723f29d
Merge: 1dc66034 2c666cbd
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 14:28:47 2020 +0300
Merge branch 'feature/infinite_scroll_query_logs' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/infinite_scroll_query_logs
commit 1dc6603421cde9847e792bfe77ff6546e53fbc2a
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 14:28:01 2020 +0300
disregard maxFileScanEntries only if offset is set
commit bad741ed7f1dccf6959d43d000b8c0150f526f9e
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 11:57:45 2020 +0300
Fix search behavior when limit is specified
commit 2c666cbdde465cf17434126830dd99ceedfc4cbc
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 18:50:28 2020 +0300
Hide table ref loader during data loading
commit 8b4f7fe642ef9e87a979813dcdbd7817d64c27f9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 18:43:24 2020 +0300
Repair search
commit 26fae1ae01a789999b8a2181d60b35663a20460a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 17:59:27 2020 +0300
Resetting initial render index, change loader position on search
commit e2c97ae1a288438267eef9aec71b979319674a71
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 16:02:03 2020 +0300
Change isScrolledIntoView
... and 32 more commits
2020-09-01 16:30:30 +03:00
Artem Baskal
1d35d73fc5
+ client: Refactor DHCP settings
2020-08-20 15:19:59 +03:00
Artem Baskal
97df19898f
Pull request #730 : + client: Add Hot Module Replacement
...
Merge in DNS/adguard-home from feature/hmr to master
Squashed commit of the following:
commit 952ed1955c2a7a32446d99489f137f02eb47c99e
Merge: 83484931 de92c852
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 13 11:02:10 2020 +0300
Merge branch 'master' into feature/hmr
commit 8348493105d7d63d8b0836a5c272df2b17a6b142
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Aug 5 15:07:31 2020 +0300
Remove empty prop types, remove Services empty container
commit b2fe4a30b79d91e482318ee5deea8e49c7038f7e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Aug 5 13:56:35 2020 +0300
Move constants
commit f8be4c18c35193ad77bf5e25f311ad834c1d6870
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Aug 5 13:19:02 2020 +0300
Fix Setup bug, update webpack.dev
commit 1d9cc4ddf8af2c979eb707a7f0fc06744eec186c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Aug 5 12:10:38 2020 +0300
Review changes
commit a1edb21358def21ed1808b081ffc2f0b6755e3da
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Aug 5 11:46:58 2020 +0300
Remove lazy loading, fix updated components
commit 0aa2cf55f8d4206ac9e2f99fc1b990ed8a9c7825
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Aug 4 20:32:19 2020 +0300
Refactor App component, add lazy loading
commit 3c2ba4772a91ff7b06641dba6c6bf3fdcd2fdf7f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Aug 4 17:12:41 2020 +0300
Simplify App hot loading boilerplate, setup lazy loading, update Header
commit 8df3221f315372b066f2ac0c9a1687f1677b8415
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Aug 4 15:16:06 2020 +0300
+ client: Add Hot Module Replacement
2020-08-13 11:15:45 +03:00
Ildar Kamalov
4743743b1f
Merge: - client: fix container padding
...
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix
2020-07-24 16:13:58 +03:00
Artem Baskal
da4a1ec23d
+client: "Drill down" to activity reports
...
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits
2020-07-13 16:06:56 +03:00
Artem Baskal
6b134469d4
- client: Clear input field when switching from logs page
...
Close #1523
Squashed commit of the following:
commit 9ae9b0e480c2ec6bd835faf4caccacd8c1fdfe9f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 3 17:56:34 2020 +0300
Setup babel and apply everywhere nullish coalescing and optional chaining operators
commit 0966063842a79078e1d61a54c271e18c9427b2b1
Merge: 42a54f2b 21dfb5ff
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 3 16:59:34 2020 +0300
Merge branch 'master' into fix/1523
commit 42a54f2ba0d8f5f4e4c04f16abc507b5d9009035
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 3 13:30:25 2020 +0300
Center mobile tooltip buttons
commit 9cdd501a863b596f1d903f8dd3c449ffbe4c1604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 3 13:21:37 2020 +0300
Add cross icon to clear input on click
commit 1308b93c42ffea2ffb7457c34aef96e5cdaccaf2
Merge: 265fec7c da546790
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jun 29 19:42:04 2020 +0300
Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home
commit 265fec7c72656b0c4738623cb470f1c14736230a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jun 29 19:41:37 2020 +0300
- client: Clear input field when switching from logs page
2020-07-03 19:17:58 +03:00
Andrey Meshkov
aa7b3c33d5
Fix #1810
...
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c
ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1d
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378d
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs
2020-06-18 22:53:02 +03:00
Artem Baskal
e39fe1b913
Merge: fix #1421
...
Full rework of the query log
Squashed commit of the following:
commit e8a72eb223551f17e637136713dae03accf8ab9e
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 00:31:53 2020 +0300
fix race in whois test
commit 801d28197f888fa21f83c9a0b49e3c9472c08513
Merge: 9d9787fd b1c951fb
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 00:28:13 2020 +0300
Merge branch 'master' into feature/1421
commit 9d9787fd79b17f76c7baed52c12ac462fd00a5e4
Merge: 4ce337ca 08e238ab
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 00:27:32 2020 +0300
Merge
commit 4ce337ca7aec163edf87a038bb25fb44e64f8613
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 00:22:49 2020 +0300
-(home): fix whois test
commit 08e238ab0e723b1e354f58245e9a8d5017b392c9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 00:13:41 2020 +0300
Add comments
commit 5f108065952bcc25dce1c2eee3f9401d2641a6e9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 17 23:47:50 2020 +0300
Make tooltip position absolute for touch
commit 4c30a583165e5d007d4b01b657de8751a7bd8c7b
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 17 20:39:44 2020 +0300
Prevent scroll hide for touch devices
commit 62da97931f5921613762614717c62c77ddb6b8db
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 17 20:06:24 2020 +0300
Review changes: ipad tooltip
commit 12dddcca8caca51c157b5d25dfa3ca03ba7f0c06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 17 16:59:16 2020 +0300
Add close tooltip event for ipad
commit 62191e41d5bf67317f9f1dc6c6af08cbabb4bf90
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 17 16:39:40 2020 +0300
Add success toast on logs refresh
commit 2ebdd6a8124269d737c8060c3247aaf35d85cb8b
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 17 16:01:37 2020 +0300
Fix pagination
commit 5820c92bacd93d05a3d66d42ee95f099e1c5d9e9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jun 17 11:31:15 2020 +0300
Revert "Render table in chunks"
This reverts commit cdfcd849ccddc1bc35591edac7904129431470c9.
commit cdfcd849ccddc1bc35591edac7904129431470c9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 16 18:42:18 2020 +0300
Render table in chunks
commit cc8c5e64274bf6e806e2e8a4bf305af745c3ed2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 16 17:35:24 2020 +0300
Add pagination button hover effect
commit f7e134091a1556784a5fea9d83c50353536126ef
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 16 16:28:00 2020 +0300
Make loader position absolute
commit a7b887b57d903f1f7ac967b861b5cc677728efc4
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 16 15:42:20 2020 +0300
Ignore clients find without params
commit ecb322fefd4a161d79f28d17fe27827ee91701e4
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 16 15:30:48 2020 +0300
Styles changes
commit 9323ce3938bf04e1290eade09201ba0790a250c0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 16 14:32:23 2020 +0300
Review styles changes
commit e0faa04ba3643f01b2ca99524cdd52b0731725c7
Merge: 98576823 15e71435
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jun 16 12:08:45 2020 +0300
Merge branch '1421-new-qlog-v2' into feature/1421
commit 9857682371e8d9a3a91933cfb58a26b3470675d9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jun 15 18:32:02 2020 +0300
Fix response cell
... and 88 more commits
2020-06-18 00:36:19 +03:00
Artem Baskal
72f253f62b
- client: Match client IP strictly: Merge pull request #620 in DNS/adguard-home from fix/1687 to master
...
Close #1687
Squashed commit of the following:
commit 5287da0b98d154d4243abdb4b9021006499c225f
Merge: c6b50c70 83b9b701
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri May 29 12:47:23 2020 +0300
Merge branch 'master' into fix/1687
commit c6b50c70a5089fcadfd2606b07b3b84769db2760
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri May 29 12:42:12 2020 +0300
minor
commit dab9fa9ee0502838b4e10aef93d037c2fb5bf41b
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu May 28 16:56:08 2020 +0300
Add support for exact matching of long and short ipv6 notations, add tests
commit e72e86cda81af2c5e54f93abb2890438fd3648b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu May 28 13:57:22 2020 +0300
Update helper, write tests
commit 92f4c34224ab7927b02edde829f2d9653a00a854
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed May 27 18:35:05 2020 +0300
Make variable names more expressive
commit 3d38f21281237e9cccbba26afc1ab641947c5dc0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed May 27 17:09:08 2020 +0300
Add ipv6 cidr support
commit 7db0a2fb18ccd96d8d1def73f12138e4f4e37f71
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 26 12:48:57 2020 +0300
Minor
commit 65e87f3899aab3417cac57bab0a8fa371cafd4ec
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 26 12:46:30 2020 +0300
Add breaks between helpers
commit 3f38bdfe7bc17e019bf048c79c9e8f1336b6f3d3
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu May 21 20:17:27 2020 +0300
- client: Match client IP strictly
2020-05-29 12:53:40 +03:00
Artem Baskal
6f3cd4e7eb
+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
...
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack
2020-05-22 17:06:05 +03:00
Andrey Meshkov
6503bab1aa
*: added cross-env to npm scripts
2020-04-15 15:41:48 +03:00
Ildar Kamalov
a5c2ad1b2f
Merge: - client: block/unblock client without requesting stats
...
Closes #896
Squashed commit of the following:
commit 66b781438aa668a16b19455c3e0dc5100417d869
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon Feb 3 12:59:25 2020 +0300
- client: block/unblock client without requesting stats
commit e70f62738d549e32339bae3d5e996a912b99c21d
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon Feb 3 12:22:13 2020 +0300
- client: get current access settings before set
commit 65c59d1d55f3255f33f917b61b6ab2c6c2e54271
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon Feb 3 12:21:12 2020 +0300
* client: mode svg-url-loader to devDependencies
2020-02-04 15:48:07 +03:00
Ildar Kamalov
ee5456cf8c
Revert remove locales from js bundle
2020-02-04 13:37:35 +03:00
Ildar Kamalov
d633e45a06
+ client: add eslint-import-resolver-webpack
2020-01-31 16:01:02 +03:00
Ildar Kamalov
4d55f51fee
+ client: remove locales from js bundle
2020-01-31 15:57:20 +03:00
Ildar Kamalov
67956597be
+ client: handle client tags
2020-01-28 14:08:28 +03:00
Ildar Kamalov
7b29c56791
+ client: use search params for querylog request
2019-10-15 12:28:49 +03:00
Ildar Kamalov
f04c028e38
+ client: handle filter change
2019-09-26 18:31:13 +03:00
Ildar Kamalov
a753ae86cc
+ client: handle logs configuration
2019-09-12 18:35:13 +03:00
Ildar Kamalov
6b2496d050
+ client: handle the new statistics format
2019-09-04 10:13:21 +03:00
Ildar Kamalov
92cebd5b31
+ client: handle blocked services
2019-08-05 14:12:22 +03:00
Ildar Kamalov
e95aae5744
+ client: handle DNS rewrites
2019-07-31 14:29:37 +03:00
Ildar Kamalov
33db419384
- client: npm audit fix
2019-04-23 11:41:53 +03:00
Ildar Kamalov
b1f707d18c
- client: load favicon from local server
...
Closes #625
2019-03-12 18:59:58 +03:00
Ildar Kamalov
8e7ceec1a1
Remove unused package
2019-02-20 16:10:32 +03:00
Ildar Kamalov
89446fccd5
Fixed npm audit vulnerabilities
2019-02-20 15:39:36 +03:00
Ildar Kamalov
c494e17df5
Update packages
2019-02-06 17:17:38 +03:00
Ildar Kamalov
dd21f497e3
Added initial layout for DHCP server config
2018-12-28 18:26:56 +03:00
Hoàng Rio
92fbbc8cc5
Tranlsate missing toast message
2018-11-06 09:51:00 +07:00
Hoàng Rio
21b8b233f8
Merge branch 'master' into i18n
2018-10-30 13:07:54 +07:00
Ildar Kamalov
9173b0ee7a
Move tiny-version-compare module to helpers
2018-10-29 14:38:01 +03:00
Hoàng Rio
4b821f0bd7
Add switch language button on footer
2018-10-29 10:26:19 +07:00
hoangnd
e1069f6bd1
Translate dashboard to Vietnamese with i18n
2018-10-25 14:28:52 +07:00
Andrey Meshkov
47a9c6555e
Merge pull request #72 in DNS/adguard-dns from feature/360 to master
...
* commit '35368619b0d7ed0fb838d749cd7b2f63ae9c9aa3':
Fix footer links
Add progress bar to the stats tables
Add new logo
Replace the main Statistics graph with 4 blocks instead
Clean static folder on build
2018-10-12 16:38:03 +03:00
Ildar Kamalov
599426a1f9
Clean static folder on build
2018-10-12 15:20:59 +03:00
Ildar Kamalov
33958c5a25
Remove unused module
2018-10-11 18:33:56 +03:00
Ildar Kamalov
43fcf4117d
Add update check
...
Closes #338
2018-09-21 15:20:41 +03:00
Ildar Kamalov
0e173d2f70
add progress bar and filters notifications
2018-09-19 18:58:55 +03:00
Ildar Kamalov
828bb40084
Show toast on failed request
2018-09-14 15:37:35 +03:00
Ildar Kamalov
6c70d8ca37
Add alert on failed requests
2018-09-12 12:58:55 +03:00
Konstantin Zamyakin
c4fefa10b0
Travis -- fix build on OSX, simplify travis and get rid of yarn
2018-08-31 18:11:45 +03:00