Dimitry Kolyshev
|
5a195b441c
|
Pull request: log-yaml-conf
Updates #4897.
Squashed commit of the following:
commit 8a961157c9930bf4859ce2209e5016ce94987e12
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jul 5 10:13:24 2023 +0400
home: imp code
commit 509c07eed06311d773bc3e34b3ca28d9f14186fe
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 4 17:33:31 2023 +0400
all: fix
commit f032e28f98552f238721491c998fca2d7d4b9802
Merge: ee0113435 c46516475
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 4 17:31:29 2023 +0400
Merge remote-tracking branch 'origin/master' into log-yaml-conf
# Conflicts:
# CHANGELOG.md
commit ee011343512e82d4e21cb402759d0284523ba02a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 4 12:31:42 2023 +0400
all: changelog
commit 07f4c4a244b1b6200d3056cde5ebced6254084a7
Merge: 2042c0753 97af062f7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 4 12:25:21 2023 +0400
Merge remote-tracking branch 'origin/master' into log-yaml-conf
commit 2042c0753ec29de6045c3f1de6d075cb93d6ec27
Merge: a1d3a5130 8004b135b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jul 3 16:25:26 2023 +0400
Merge remote-tracking branch 'origin/master' into log-yaml-conf
commit a1d3a51307e80f9e509bd6f3bee1a7b17bf1ffe6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jun 30 11:11:32 2023 +0400
home: imp code
commit 2392a3b02620b8c38e88afb4d75988be85fe1338
Merge: 4224fbed7 39f5c50ac
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 16:46:47 2023 +0400
home: imp code
commit 4224fbed7113e94bee44d0ab0272e8302a8086f3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 16:39:35 2023 +0400
home: imp code
commit 5ce708cc50bed83e64f062e599fc8b6143d0d44d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 12:48:42 2023 +0400
all: docs
commit 4b6d898a888818410f59b843c3ca1a685aafec82
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 12:20:54 2023 +0400
home: imp code
commit 431b44eda71f488c747c3efa4da0a6c222b1cf06
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 12:03:17 2023 +0400
home: imp tests
commit 53a5c31060018c37953beb27d80c46f92bbe14af
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 17:40:49 2023 +0400
home: imp docs
commit bfa57d9f21e3326baafd3a52e91d54396d8e03fa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 15:49:40 2023 +0400
home: log conf
commit 49e06dca9dc2ceb2647b7e36dac145ccf78a6c3f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 15:41:02 2023 +0400
home: log conf
commit 9be432dea7cec8ae0c0d3ee1f73c58c76376d07e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 10:45:01 2023 +0400
home: log conf
|
2023-07-06 10:09:04 +03:00 |
Dimitry Kolyshev
|
39f5c50acd
|
Pull request: home: http conf
Updates #2860.
Squashed commit of the following:
commit 0d55a99d5c0b9f1d8c9497775dd69929e5091eaa
Merge: 73a203ac8 d4a4bda64
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 16:25:36 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 73a203ac8acf083fa289015e1f301d05bf320ea7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 16:21:48 2023 +0400
home: imp docs
commit a4819ace94bfe4427f70f1b8341c9babc9234740
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 29 11:45:30 2023 +0400
snap: imp script
commit b0913c7ac5c6c46d6a73790fd57d8c5f9d7ace75
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 17:34:03 2023 +0400
all: docs
commit 14820d6d56f958081d9f236277fd34f356bdab33
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 13:21:43 2023 +0400
home: imp tests
commit 9db800d3ce39c36da7959e37b4a46736f4217e5c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 13:17:34 2023 +0400
all: docs
commit 9174a0ae710da51d85b4e1b1af79eda6a61dd3a2
Merge: ca8c4ae95 d88181343
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 10:19:01 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
# Conflicts:
# CHANGELOG.md
# internal/home/upgrade.go
# internal/home/upgrade_test.go
commit ca8c4ae954ece25d78ef2f873bb3ba71fa4b8fa9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 10:07:15 2023 +0400
snap: imp script
commit d84473f8e07b2c6e65023613eb4032fd01951521
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jun 28 09:59:57 2023 +0400
snap: imp script
commit 8a0808e42ddbff7d9d3345d758f91b14bb4453be
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 15:03:53 2023 +0400
home: http conf
commit e8fbb89cc5748f9d8fa4be9e702756bd8b869de9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 14:59:37 2023 +0400
home: imp code
commit 46541aabc421118562d564675dfd7e594d2056aa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 12:36:14 2023 +0400
snap: bind port
commit cecda5fcfd8c473db42f235b4f586b2193086997
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 12:12:39 2023 +0400
docker: bind port
commit 8d8945b70366c6b018616a32421c77eb281a6ea1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 11:06:32 2023 +0400
home: imp code
commit ae5e8c1c4333d7b752c08605d80e41f55ee50e59
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jun 27 11:02:09 2023 +0400
home: imp code
commit c9ee460f37e32941b84ea5fa94d21b186d6dd82b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 17:11:10 2023 +0400
home: imp code
commit 44c72445112ef38d6ec9c25b197c119edd6c959f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 11:52:19 2023 +0400
all: docs
commit e3bf5faeb748f347b1202a496788739ff9219ed0
Merge: 38cc0f639 e7e638443
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 11:39:12 2023 +0400
Merge remote-tracking branch 'origin/master' into http-yaml-conf
commit 38cc0f6399040f1fa39d9da31ad6db65a6bdd4cc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 11:38:17 2023 +0400
snap: bind port
commit 3b9cb9e8cc89a67e55cecc7a2040c150f8675b4c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 26 11:25:03 2023 +0400
docker: bind port
... and 4 more commits
|
2023-06-29 15:29:52 +03:00 |
Stanislav Chzhen
|
d88181343c
|
Pull request 1883: 951-blocked-services-client-schedule
Updates #951.
Squashed commit of the following:
commit 94e4766932940a99c5265489bccb46d0ed6cec25
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 17:21:41 2023 +0300
chlog: upd docs
commit b4022c33860c258bf29650413f0c972b849a1758
Merge: cfa24ff01 e7e638443
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 16:33:20 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit cfa24ff0190b2bc12736700eeff815525fbaf5fe
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 15:04:10 2023 +0300
chlog: imp docs
commit dad27590d5eefde82758d58fc06a20c139492db8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 26 17:38:08 2023 +0300
home: imp err msg
commit 7d9ba98c4477000fc2e0f06c3462fe9cd0c65293
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 26 16:58:00 2023 +0300
all: add tests
commit 8e952fc4e3b3d433b29efe47c88d6b7806e99ff8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 16:36:10 2023 +0300
schedule: add todo
commit 723573a98d5b930334a5fa125eb12593f4a2430d
Merge: 2151ab2a6 e54fc9b1e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 11:40:03 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit 2151ab2a627b9833ba6cce9621f72b29d326da75
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 11:37:49 2023 +0300
all: add tests
commit 81ab341db3e4053f09b181d8111c0da197bdac05
Merge: aa7ae41a8 66345e855
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 22 17:59:01 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit aa7ae41a868045fe24e390b25f15551fd8821529
Merge: 304389a48 06d465b0d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 17:10:11 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit 304389a487f728e8ced293ea811a4e0026a37f0d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 17:05:31 2023 +0300
home: imp err msg
commit 29cfc7ae2a0bbd5ec3205eae3f6f810519787f26
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 20:42:59 2023 +0300
all: imp err handling
commit 8543868eef6442fd30131d9567b66222999101e9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 18:21:50 2023 +0300
all: upd chlog
commit c5b614d45e5cf25c30c52343f48139fb34c77539
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 14:37:47 2023 +0300
all: add blocked services schedule
|
2023-06-27 18:03:07 +03:00 |
Stanislav Chzhen
|
d3ada9881a
|
Pull request 1854: 951-blocked-services-schedule
Merge in DNS/adguard-home from 951-blocked-services-schedule to master
Squashed commit of the following:
commit 0f0770292f8aa9dc0dddc05edefacf6655f329b8
Merge: 2705fbcfb 7309a5335
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 15:00:56 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 2705fbcfba57392bcc0fa9b6e1f1dfdce9796963
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 14:56:01 2023 +0300
schedule: imp field alignment
commit ff8fa040558e97192a5a2c91c1d5722c67d88b3d
Merge: f99936f36 9fda7bfd3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 11:49:15 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit f99936f36be3453b50d772ce10bfdc1ad14879c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 19:14:06 2023 +0300
schedule: add tests
commit 8436c2c5675d5cc22a3554ded2ce4a49eeeefc91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 20:10:03 2023 +0300
schedule: imp code
commit 850a3d93e659e0584bd449cf5af3f13b36be9e62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:57:23 2023 +0300
schedule: imp tests
commit d54c42b782a4a806d2f35abbea1826ba6394a64c
Merge: 21dfa51ea 156c199bb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:12:03 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule
commit 21dfa51ea7441c655ac39f2cbceeaa598d364bff
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 18:02:47 2023 +0300
all: add todo
commit d0d4532c8911fb6365f6af66ceb72a70b158b77d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 18:54:44 2023 +0300
all: upd chlog
commit dc1d55fa23c0ec8e7f7b7cd25d3d0cbf3e51e236
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 17:34:28 2023 +0300
all: add tests
commit 601775307c2b23fa9d6cf2aa271793e8fd5f1797
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 7 13:20:00 2023 +0300
all: add schedule pkg
commit e0bcad0193a559a89f5f5052f5a985fa730d23be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 13:03:04 2023 +0300
filtering: add test case
commit da7a7c20c84151ff83414cb5d576a91740a1be7e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 31 15:31:48 2023 +0300
filtering: imp code
commit 9845a11cdae25eafe39a50f8cdc408fefe1fd746
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:46:24 2023 +0300
filtering: add type check
commit f4bcea8ad90d584ceff236ccce4f246e391e0e33
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 17:37:25 2023 +0300
all: imp code
commit 9de3a0f37eb65d0db2431c27dd4d69136c1485a7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 15:20:33 2023 +0300
filtering: imp err msg
commit 1befab59cf2a12a3bc8296066ce1115dff5a8843
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon May 29 14:31:14 2023 +0300
filtering: imp tests
commit 09506f924f363f1563009cec0c44ad40d08b8ddd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 18:44:12 2023 +0300
filtering: add tests
commit 36c42f523fcfe7fa6dca5f6f13e6c79f491c1ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri May 26 17:57:01 2023 +0300
all: fix typos
commit 69399cd3ea17691ff0848baf43ff09b18b82114c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 18:50:51 2023 +0300
all: upd chlog
... and 2 more commits
|
2023-06-14 15:08:57 +03:00 |
Dimitry Kolyshev
|
c77b2a0ce5
|
Pull request: home: imp code
Merge in DNS/adguard-home from home-imp-code to master
Squashed commit of the following:
commit 459297e189c55393bf0340dd51ec9608d3475e55
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 11:42:34 2023 +0300
home: imp code
commit ab38e1e80fed7b24fe57d4afdc57b70608f65d73
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 11:01:23 2023 +0300
all: lint script
commit 7df68b128bf32172ef2e3bf7116f4f72a97baa2b
Merge: bcb482714 db52f7a3a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 10:59:40 2023 +0300
Merge remote-tracking branch 'origin/master' into home-imp-code
commit bcb482714780da882e69c261be08511ea4f36f3b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:48:27 2023 +0300
all: lint script
commit 1c017f27715202ec1f40881f069a96f11f9822e8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:45:25 2023 +0300
all: lint script
commit ee3d427a7d6ee7e377e67c5eb99eebc7fb1e6acc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:44:53 2023 +0300
home: imp code
commit bc50430469123415216e60e178bd8e30fc229300
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:12:10 2023 +0300
home: imp code
commit fc07e416aeab2612e68cf0e3f933aaed95931115
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 11:42:32 2023 +0300
aghos: service precheck
commit a68480fd9c4cd6f3c89210bee6917c53074f7a82
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 11:07:05 2023 +0300
home: imp code
commit 61b743a340ac1564c48212452c7a9acd1808d352
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 17:17:21 2023 +0300
all: lint script
commit c6fe620510c4af5b65456e90cb3424831334e004
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 17:16:37 2023 +0300
home: imp code
commit 4b2fb47ea9c932054ccc72b1fd1d11793c93e39c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 16:55:44 2023 +0300
home: imp code
commit 63df3e2ab58482920a074cfd5f4188e49a0f8448
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 16:25:38 2023 +0300
home: imp code
commit c7f1502f976482c2891e0c64426218b549585e83
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 15:54:30 2023 +0300
home: imp code
commit c64cdaf1c82495bb70d9cdcaf7be9eeee9a7c773
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:35:04 2023 +0300
home: imp code
commit a50436e040b3a064ef51d5f936b879fe8de72d41
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:24:02 2023 +0300
home: imp code
commit 2b66464f472df732ea27cbbe5ac5c673a13bc14b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:11:53 2023 +0300
home: imp code
commit 713ce2963c210887faa0a06e41e01e4ebbf96894
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:10:54 2023 +0300
home: imp code
|
2023-05-10 16:30:03 +03:00 |
Ainar Garipov
|
0bc3ef89ea
|
Pull request 1781: 5627-fix-migration
Updates #5627.
Squashed commit of the following:
commit 018ead11959efeaace5312b5990ad82b6fa1f72d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 12:48:25 2023 +0300
home: fix more
commit 4bc57a07412bfb7fb7e6c88c14037c567c94d373
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 12:32:57 2023 +0300
home: fix st |