Ainar Garipov
2611534de0
Pull request 2182: AG-20945-rule-list-id
...
Squashed commit of the following:
commit 87bad8c1c202902f344ad75c7b767f03d5123a4a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 21 16:39:12 2024 +0300
all: imp lint, names, tests
commit 284f8c7cc0c26d443342ad3d39007152714c0799
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 21 15:37:54 2024 +0300
filtering: imp id handling
2024-03-21 18:45:34 +03:00
Ainar Garipov
332621f268
Pull request 2147: all: upd deps, go, scripts
...
Squashed commit of the following:
commit 425f1bd28074d22890629d06f43257e0353ce3d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Feb 8 20:15:58 2024 +0300
all: upd deps, go, scripts
2024-02-08 20:39:18 +03:00
Ainar Garipov
0920bb99fe
Pull request 2109: AG-20945-rule-list-filter
...
Squashed commit of the following:
commit 2da8c1754f349a9b7f8b629de8f0c892b9bae4dc
Merge: 5cea6a6a2 4fc6bf504
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 19 21:14:07 2023 +0300
Merge branch 'master' into AG-20945-rule-list-filter
commit 5cea6a6a2bed88f645828ab5b4e7de09f9bf91ec
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 19 17:53:21 2023 +0300
filtering/rulelist: imp docs, tests
commit f01434b37a3f0070d71eb0ae72ad8eb2f4922147
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 14 19:17:02 2023 +0300
filtering/rulelist: imp names
commit fe2bf68e6b99673b216b5c4ba867a5f4ed788d22
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 14 19:07:53 2023 +0300
all: go mod tidy
commit c7081d3486a78e8402dc8fe0223111a6fccdd19f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 14 19:03:33 2023 +0300
filtering/rulelist: add filter
2023-12-19 21:21:17 +03:00
Dimitry Kolyshev
f84ff2bd05
Pull request: AG-25263 dns config
...
Merge in DNS/adguard-home from AG-25263-dns-config to master
Squashed commit of the following:
commit 478b607526391af65de67d6d7f1d904198610cdf
Merge: b944d12fa 51340adb3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Sep 4 18:04:56 2023 +0400
Merge remote-tracking branch 'origin/master' into AG-25263-dns-config
commit b944d12fa812b05b9d9f22d2287425ca36630329
Merge: b474f712f 0182b9ec1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Sep 1 09:13:36 2023 +0400
Merge remote-tracking branch 'origin/master' into AG-25263-dns-config
# Conflicts:
# internal/dnsforward/dnsforward.go
commit b474f712f64daa1a7d7e32d89edc901d2f273c9a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Sep 1 09:11:17 2023 +0400
all: imp code
commit 635a316b8244f13d90a8fe2209f1673c0765aaa9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 16:18:25 2023 +0300
all: dnsfilter rm config embed
commit 5aa6212e89bc38e3d283b8d6b1a78726d10b3f3a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 12:45:01 2023 +0300
all: dnsfilter rm config embed
2023-09-04 17:18:43 +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
28cfde9212
Pull request 1966: 6050 upd urlfilter
...
Merge in DNS/adguard-home from upd-urlfilter to master
Updates #6050 .
Squashed commit of the following:
commit 80337ab02d616e25fa455e46c9535c088b5c5ea5
Merge: fb2cfd1a5 31f7aaecc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 16:50:49 2023 +0300
Merge branch 'master' into upd-urlfilter
commit fb2cfd1a5c94d92030fc8832615764f100d010e5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 16:22:43 2023 +0300
dnsforward: imp code, docs
commit 2900333bb85d4e064db9de27bd5bfe7c3ef00747
Merge: 977ed35e4 2bfc9fcb1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 18:06:05 2023 +0300
Merge branch 'master' into upd-urlfilter
commit 977ed35e4ed377f1031721d58e0fcb58de1e74ac
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 17:06:30 2023 +0300
all: log changes
commit 1228a0770485799bf50bbe68005dbb0ba9a96a9c
Merge: 78305eb2e 4b4036fa6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 16:51:42 2023 +0300
Merge branch 'master' into upd-urlfilter
commit 78305eb2ebc3854dd11ce35d6b4c7eecccd7cc78
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 22 15:55:05 2023 +0300
all: upd urlfilter
commit 63a29e18d5034e5f9433121ff7e7c45aebfa1f0f
Merge: 748c53430 762e5be97
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 21 20:12:49 2023 +0300
Merge branch 'master' into upd-urlfilter
commit 748c5343020b0c6d4d4f16eb3d30b875c0a94e0f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 21 20:07:44 2023 +0300
all: imp code, docs
commit 91975140f3305a6793e07142f7c9a75120a4ce8c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 17 16:16:19 2023 +0300
all: upd urlfilter
2023-08-23 16:58:24 +03:00
Ainar Garipov
7b92d53b84
Pull request 1910: new-rulelist-parser
...
Squashed commit of the following:
commit bac0da6818388d67840b8fe9b633ce0804964ed9
Merge: cb6759b63 f7dd83251
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jul 7 18:22:40 2023 +0300
Merge branch 'master' into new-rulelist-parser
commit cb6759b63546b35074ec0ae04769ddb5e83ebac1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jul 7 12:18:44 2023 +0300
all: upd tools
commit d28bf4cb42057b84e0c1325389db121a91f7c989
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 6 19:35:48 2023 +0300
all: upd chlog
commit 7df637b00331dff5810c3a76f4a7d2cee24148f1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 6 19:30:42 2023 +0300
rulelist: fix tabs
commit 0598d0d43504b246570e9ee76d79dff0d86413c5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 6 19:06:18 2023 +0300
all: add go-bench, go-fuzz; imp docs
commit a9ab7726048e216b13876a85991f3e3e8696a029
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 6 18:18:14 2023 +0300
filtering: add new parser
2023-07-07 18:27:33 +03:00
Dimitry Kolyshev
66345e855e
Pull request: filtering: fix filter delete
...
Merge in DNS/adguard-home from 5700-fix-filter-delete to master
Squashed commit of the following:
commit 51e5c82bf6c12b48b1c07622639216ecba21e115
Merge: b4f8abdf2 37e046acc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 17:05:23 2023 +0400
Merge remote-tracking branch 'origin/master' into 5700-fix-filter-delete
commit b4f8abdf2e9a8c94594cb0e3b00b37e0ed49578a
Merge: eac30a13f f40ef76c7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 16:55:58 2023 +0400
Merge remote-tracking branch 'origin/master' into 5700-fix-filter-delete
commit eac30a13fb30404b2e058d1889be566d359d5000
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 14:03:07 2023 +0400
filtering: imp code
commit 4e270789b83bdcff09d94ace46dd0b02d2c6893c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 14:02:04 2023 +0400
all: docs
commit b818468ae29f647bcc0f4e408d10c8469829da95
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Jun 22 13:18:12 2023 +0400
filtering: fix filter delete
2023-06-22 16:09:55 +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
0393e41096
Pull request: 1577: rewrite edit http api
...
Merge in DNS/adguard-home from 1577-rewrite-edit to master
Squashed commit of the following:
commit d03bee2a14337d169eea950b3df18a447c02b422
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 12 12:54:15 2023 +0300
filtering: imp tests
commit bd68320df6dc057d922d91551cd00c74ebfaad6c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 12 10:38:12 2023 +0300
filtering: rewrite http tests
commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 11 12:06:30 2023 +0300
filtering: rewrite http tests
commit 29080384dd8fa80d5286d2fac1a4429d712bbafa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 17:24:00 2023 +0300
filtering: imp code
commit 96c6b1c98debfae565c5e6254746959a4307744e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:56:32 2023 +0300
filtering: imp code
commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012
Merge: 5fa9e1c37 c77b2a0ce
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:37:19 2023 +0300
Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit
commit 5fa9e1c3714e107f893c03efa72227f3ed88691c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:35:19 2023 +0300
filtering: imp code
commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 13:06:43 2023 +0300
docs: rewrite http update
commit 0c67b040e80787b084c4669bb20db8d6d145fc1b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 13:04:31 2023 +0300
filtering: rewrite http update
2023-05-12 13:04:19 +03:00
Stanislav Chzhen
db52f7a3ac
Pull request 1841: AG-21462-safebrowsing-parental-http-tests
...
Merge in DNS/adguard-home from AG-21462-safebrowsing-parental-http-tests to master
Squashed commit of the following:
commit 22a83ebad08a27939a443530137a7c195f512ee4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 3 17:39:46 2023 +0300
filtering: fix test
commit c3ca8b4987245cdd552f6f09759804e716bcae80
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 3 16:43:35 2023 +0300
filtering: imp tests even more
commit 7643bfae350373b5b6dfb61b64e57da66c6ab952
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 3 16:17:42 2023 +0300
filtering: imp tests more
commit 399c05ee4d479a727b61378b7a07158a568d0181
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 3 14:45:41 2023 +0300
filtering: imp tests
commit f361df39e784ec9c5191666736a6c64b332928e8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue May 2 12:49:26 2023 +0300
filtering: add tests
2023-05-03 19:52:06 +03:00
Eugene Burkov
da9008aba3
Pull request 1790: 5624-fix-filter-add
...
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624 .
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly
2023-03-29 19:09:54 +03:00
Dimitry Kolyshev
df61741f60
Pull request: 1163 safesearch http api vol.3
...
Merge in DNS/adguard-home from 1163-safesearch-1-3 to master
Squashed commit of the following:
commit f26c5fb4f7a27dc61b10c28d6672d5307796784c
Merge: e7a1b885
143616ca
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 18:45:25 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
# Conflicts:
# CHANGELOG.md
commit e7a1b885d6
Merge: 01b73d76
eb5d8a49
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:55:23 2023 +0200
Merge branch '1163-safesearch-1-3' of ssh://bit.adguard.com:7999/dns/adguard-home into 1163-safesearch-1-3
commit 01b73d763c
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:52:02 2023 +0200
client: add safe search extended settings to clients
commit eb5d8a499a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 18:50:23 2023 +0700
all: docs
commit 2043a8fba7f664ef365ccc5abac14a85035eb4b7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:50 2023 +0700
all: docs
commit bb1d2f6c0252891ccac3d3727eb23288a24d4bda
Merge: 95f9fd3d c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:00 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 95f9fd3dd1e8abcdf1a156e81aff8e52f320f4c3
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 15:25:39 2023 +0200
client: move to new safe search api
commit ac823a911f0d6ab6f1813d11a0ca082d54cc9131
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:40:29 2023 +0700
all: docs
commit aaa287b125c7c7a775b821e0dd272199229a7538
Merge: 16fa7031 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:14 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 16fa7031ab2aec31139ace54ffa0155cde8e9135
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:03 2023 +0700
all: docs
commit 498f7d3cbb842eda218b0fd06fc3bb3601b81f80
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:59:47 2023 +0700
filtering: imp code
commit aab7b70e2355ba86577e5156c1d5569b21b4b358
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:40:18 2023 +0700
filtering: imp code
commit d2870a18ffdb1d293993487073912168d6b75a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 21:57:58 2023 +0700
filtering: imp code
commit 868f5d1ed29c3af702114079e7ffe46e136eb901
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:06:36 2023 +0700
all: imp docs
commit f6d70b06ed873684501ce17f647ccf07a85dd50b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:05:40 2023 +0700
filtering: imp code
commit 7cd9a37dde6262a8cf4f0f13f9946e011cc0e2cf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 14:56:51 2023 +0700
home: imp code
commit 84d8817512e47a517ed2880ffa9dde5ffda1d288
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 09:39:41 2023 +0700
all: safesearch http api
2023-03-23 15:25:58 +03:00
Ainar Garipov
9951d861d1
Pull request: 3972-hostlists-services
...
Updates #3972 .
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:42:38 2022 +0300
Merge branch 'master' into 3972-hostlists-services
commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Oct 27 14:41:42 2022 +0300
filtering: upd service list
commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 13:41:09 2022 +0300
client: remove todo
commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:54:45 2022 +0300
fix build
commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:40:33 2022 +0300
client: add titles with service names to the clients table
commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 12:36:59 2022 +0300
client: fix empty icons
commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Oct 27 11:55:48 2022 +0300
client: use all blocked services
commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:25:20 2022 +0300
all: fix json response
commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 19:09:44 2022 +0300
all: use hostslists registry for blocked svcs
2022-10-27 15:46:25 +03:00
Eugene Burkov
a149d816d9
Pull request: 4916 Editing filter
...
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916 .
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit
2022-10-21 20:14:43 +03:00
Ainar Garipov
c26ab190e7
Pull request: imp-json-resp
...
Merge in DNS/adguard-home from imp-json-resp to master
Squashed commit of the following:
commit 44532b6fa551815e5ea876e7320ce0a73c32b6fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 30 15:59:58 2022 +0300
all: imp json resp
2022-10-04 14:35:10 +03:00
Ainar Garipov
756b14a61d
Pull request: HOFTIX-csrf
...
Merge in DNS/adguard-home from HOFTIX-csrf to master
Squashed commit of the following:
commit 75ab27bf6c52b80ab4e7347d7c254fa659eac244
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 29 18:45:54 2022 +0300
all: imp cookie security; rm plain-text apis
2022-09-29 19:04:26 +03:00