Dimitry Kolyshev
|
9c48e96939
|
Pull request: 1333-protection-pause vol.1
Merge in DNS/adguard-home from 1333-protection-pause-1 to master
Squashed commit of the following:
commit 5ff98385bc5ff66e214d80782eb4dc41e344aa38
Merge: 97f94a54 0bc3ef89
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 24 19:08:21 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
commit 97f94a5498ac221f88f2f7dfef4b255f4945329e
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Fri Mar 24 13:03:20 2023 +0200
Fix protection timer bugs
commit 1cc61af1996bd803f3fa638cb9e2388470072bf0
Merge: 5a144ea3 235ce458
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 22:27:47 2023 +0700
Merge remote-tracking branch 'origin/1333-protection-pause-1' into 1333-protection-pause-1
commit 5a144ea3a48c3d0d5e57dd14232ab7a8e77a8c1e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 22:25:08 2023 +0700
dnsforward: imp code
commit 235ce458a62b3152f36e32580ed0226a56580ec6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 23 17:35:06 2023 +0300
dnsforward: imp locks
commit 0ea3a0a176b810a2b3f0b307aa406fe1670c9219
Merge: 52f66810 df61741f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 19:30:41 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# openapi/CHANGELOG.md
commit 52f668109673286a50909c042e6352cd803e8eed
Merge: 9a7eb7b3 306c1983
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 11:23:50 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# internal/dnsforward/http.go
commit 9a7eb7b3ab2b5f6ad321aa3245d33839c3aa6fbd
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Wed Mar 22 06:56:55 2023 +0200
Review fix
commit 5612d51252ba91842bd6811baec1c91136bb3bf2
Merge: c0a918a5 c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Mar 21 22:00:39 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# client/src/__locales/en.json
commit c0a918a518ad9b37041aed159d215516258bc987
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Mar 21 12:13:18 2023 +0200
Review fix
commit 34faa61cc1e6210a612e7a2f4895a1504df37680
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Mar 21 10:43:37 2023 +0200
Fix props to new api
commit 158e582373863495f0e0ca177d7b365cc66ad671
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Mon Mar 20 18:44:34 2023 +0200
Review fix
commit 9e8b8c3778b8e1dfad0d39e44f70886dfd3aeb9a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:31:28 2023 +0700
all: docs
commit 761a203f53b535ca235cfe62f289bd0e02b90be2
Merge: d0b07231 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:26:13 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
commit d0b07231b6f29b534930f1fcfc82b4934c295ff8
Merge: ea448760 a2053526
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 13:00:52 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
# client/src/components/App/index.css
# internal/dnsforward/config.go
commit ea4487608a9c81d25f155ff63fee7c9dcf21f448
Merge: dfd0f33f a556ce8f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Feb 21 11:54:27 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
commit dfd0f33fb474d497cbc9237ee466276728eea397
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Feb 21 11:51:40 2023 +0700
all: docs
commit d36df96fba8c6d923faef85c198b6bd0743b7ee8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Feb 20 12:41:49 2023 +0700
all: safesearch
commit 60f2ceec563221337f34bb60baa96aa2b2429c40
Merge: 7c514427 6f6ced33
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Feb 20 12:30:42 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
commit 7c514427e77c5b09d8e148c78220a71046e68cd1
Merge: 0fa4ff99 4d295a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Feb 16 11:55:21 2023 +0700
Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1
# Conflicts:
# CHANGELOG.md
... and 26 more commits
|
2023-03-24 15:11:47 +03:00 |
|
Arseny Lisin
|
46382e8825
|
Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <a.lisin@adguard.com>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs
|
2023-02-01 11:45:22 +03:00 |
|
Artem Baskal
|
7d2c7a61f1
|
- client: Use the same tooltip style everywhere
Close #1866
Squashed commit of the following:
commit 3347832caa33b01a0155b212987f02dc4824ab08
Merge: 7766502d d794b11e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 17 15:12:45 2020 +0300
Merge branch 'master' into fix/1866
commit 7766502d4a904ad0a4d240481f7eabf0e25cfb62
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 17 12:16:59 2020 +0300
Fix icon color classes
commit 90191bf74b5eb1855c733c226f7acb4e906c7ad9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 17 11:46:22 2020 +0300
Use logs icons, use pointer cursor, fix review markup formatting
commit 0ba50fcd956101f5054ce38c2329df3e8abdfcd2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 16 18:05:30 2020 +0300
Use help cursor on tooltips
commit bf4e14afe69f874d29be73d8cd4cfbe240ca0304
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 16 17:41:47 2020 +0300
Use tooltip in logs, rename tooltip classes
commit 00568fdc8e8484c5bae67c51ee8189a3a558e219
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 16 17:01:49 2020 +0300
- client: Use the same tooltip style everywhere
|
2020-07-17 15:24:39 +03:00 |
|
Ildar Kamalov
|
cf53653cfa
|
+ client: split settings page into several pages
|
2019-06-03 15:44:29 +03:00 |
|