a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,225 Commits 3 Branches 0 Tags 192 MiB
Commit Graph

839 Commits

Author SHA1 Message Date
Ainar Garipov bf9b35b9c6 Pull request: client: upd manual upd link 
Closes #4208.

Squashed commit of the following:

commit 4ae27b5f7cd6b0f4ec0c9041d92c4d1ac00dd622
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Jan 31 18:34:18 2022 +0300

    client: upd manual upd link
 2022-01-31 18:40:21 +03:00
Ainar Garipov 2263adbbe0 Merge branch 'master' into 4162-fix-theme-color 2022-01-25 18:20:37 +03:00
Ainar Garipov f12eaf29a2 Pull request: client: upd i18n 
Updates #2643.

Squashed commit of the following:

commit bd6bc0aeaa1bd928ae39642691b913befbc0f396
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jan 25 14:04:10 2022 +0300

    client: upd i18n
 2022-01-25 14:08:41 +03:00
Eugene Burkov 41e8db4221 Pull request: client: upd i18n 
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit e3dfb6cd66813d45591f74c9cdddab8b61143db3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Jan 24 14:52:19 2022 +0300

    client: upd i18n
 2022-01-24 15:02:47 +03:00
Ildar Kamalov f7ff02f3b1 Pull request: 3971 fix client id error message 
Updates #3971

Squashed commit of the following:

commit f6b855a16daaec7bfca1e1653b4b9c4180c2d80e
Merge: 0cb31dbb 5ec4a4da
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Jan 20 18:19:20 2022 +0300

    Merge branch 'master' into 3971-client-id

commit 0cb31dbbea785fb5ba11a8efe2b6653aece7cd97
Author: Natalia Sokolova <n.sokolova@adguard.com>
Date:   Thu Jan 20 11:41:06 2022 +0300

    client/src/__locales/en.json edited online with Bitbucket

commit 7999f260d83adcb2fc8d5d5e40cb1934e0333873
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jan 19 15:58:18 2022 +0300

    client: fix client id error message
 2022-01-20 18:24:21 +03:00
Ildar Kamalov 2fdda8a22c Pull request: 4143 sort client ids 
Merge in DNS/adguard-home from 4143-clients-sort to master

Updates #4143.

Squashed commit of the following:

commit a4b547eb46a54bdfdc7d342fab5f8ecfa54f5d06
Merge: d369c11c d82b2902
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Jan 20 11:58:42 2022 +0300

    Merge branch 'master' into 4143-clients-sort

commit d369c11c69665510043f63e0283e1ca1b2974289
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jan 19 16:53:39 2022 +0300

    client: fix sort ip method

commit d767a1199c37ad9df7f3bc2d362d840b0226d836
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jan 19 16:23:23 2022 +0300

    client: sort client ids
 2022-01-20 12:23:59 +03:00
Agneev Mukherjee 15956f4511
Update login.html 2022-01-18 18:38:57 +05:30
Agneev Mukherjee 09d0ce4578
Update install.html 2022-01-18 18:38:37 +05:30
Agneev Mukherjee 9735a35123
Update index.html 2022-01-18 18:38:22 +05:30
Ainar Garipov 813a06d09a Pull request: home: show version in install api 
Closes #4026.

Squashed commit of the following:

commit bcd1315a10e819daee3aee323427d90a27860b4a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jan 18 14:57:49 2022 +0300

    openapi: fix example

commit b56e27c5ac1fc7c3f595057d77607479d72ec50a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jan 18 14:55:51 2022 +0300

    client: show version on install page

commit 95dfbfaa1235deef7b55e51457d11c677f6ef6b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jan 18 14:29:08 2022 +0300

    home: show version in install api
 2022-01-18 15:05:34 +03:00
Ainar Garipov a6ca824064 Pull request: client: upd i18n 
Updates #2643.

Squashed commit of the following:

commit bc3de579e00762bc2c4b62fb1f7ba73837c10bff
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 29 15:37:29 2021 +0300

    client: upd si-lk i18n again

commit 2cd5436b6e8c1918855aff58dd0958fe47b47e90
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 29 15:08:21 2021 +0300

    client: upd i18n
 2021-12-29 15:44:48 +03:00
Ainar Garipov 39c4999d2d Pull request: client: imp en i18n 
Merge in DNS/adguard-home from en-i18n-safe-browsing to master

Squashed commit of the following:

commit dd32a58c3761818a10386b4a1d9e6871da59c71e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 22 17:31:35 2021 +0300

    client: imp en i18n
 2021-12-22 18:14:28 +03:00
Andrey Meshkov 7ee8142b38 Pull request: revise vetted lists, fix #2644 
Merge in DNS/adguard-home from 2644-reviselists to master

Squashed commit of the following:

commit 162985aed01742ec19db2f5ba4c642d005cd905f
Merge: c7e7f701 72db0149
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 16:44:39 2021 +0300

    Merge branch 'master' into 2644-reviselists

commit c7e7f701abd4fbbb4c8eec9b068f895b7ecf69da
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 16:39:29 2021 +0300

    revise vetted lists, fix #2644
 2021-12-15 16:51:03 +03:00
Andrey Meshkov 72db014905 Pull request: added companiesdb script, fix #2793 
Merge in DNS/adguard-home from 2793-whotracksme to master

Squashed commit of the following:

commit eff9de98b389ba087eb529c12e3ec916842aa8c3
Merge: bf9bc6a4 49eb62ae
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 16:38:53 2021 +0300

    Merge branch 'master' into 2793-whotracksme

commit bf9bc6a4f5c1d7e4b6265f1c33bd532ec5b58cc7
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 16:04:57 2021 +0300

    scripts: fix review comments

commit 5a035cabc1a75a3c750a4a7a36af38ad9f33959b
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Dec 15 15:47:41 2021 +0300

    added companiesdb script, fix #2793
 2021-12-15 16:44:28 +03:00
Ainar Garipov 49eb62aeb5 Pull request: client: upd i18n 
Merge in DNS/adguard-home from 2643-upd-i18n to master

Squashed commit of the following:

commit 2efafe2b4c5e88b527375aa1f98d92ddd04efaed
Merge: 7a9a2f3a ed5f8271
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 15 14:45:28 2021 +0300

    Merge branch 'master' into 2643-upd-i18n

commit 7a9a2f3af3a44f66e46c2131d28e07a8204cd3bb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 15 14:41:03 2021 +0300

    client: upd i18n
 2021-12-15 14:55:56 +03:00
Ainar Garipov a396865869 Pull request: all: do not redirect to https if not necessary 
Merge in DNS/adguard-home from 3558-https-redirect to master

Squashed commit of the following:

commit f656563c0b0db6275748de28bc890dcf85b0e398
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 10 20:44:00 2021 +0300

    all: do not redirect to https if not necessary
 2021-12-13 13:48:08 +03:00
Eugene Burkov 434032f8e3 Pull request: 3772 cache upstreams 
Merge in DNS/adguard-home from 3772-cache-upstreams to master

Updates #3772.

Squashed commit of the following:

commit 809e874fe8847fdbd7f8a7221f18393509f41339
Merge: 5774798c 2d328ea8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 7 17:15:59 2021 +0300

    Merge branch 'master' into 3772-cache-upstreams

commit 5774798ce1897bf292be49410794ce06cd084f93
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Dec 7 16:48:38 2021 +0300

    client: fix formatting

commit 4b4bb668c762c9b4d47cf40a007f34fe47a6e260
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Dec 7 16:47:18 2021 +0300

    client: remove comment

commit a2a9f904a6ab52194bb811a2a83967660a25f2cc
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Dec 7 16:45:31 2021 +0300

    client: handle cached upstream

commit a56804c4910da838cb10c8ef0af2a525e9722b1c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 26 15:33:43 2021 +0300

    querylog: rm todo

commit 16c0a62ad2dfc7fcb5a6adbc868b296b7840fd27
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 26 15:31:53 2021 +0300

    all: revise log of changes

commit 9f4b793205f17b6e85d74e83126093ed09eb24e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Nov 25 17:23:42 2021 +0300

    WIP

commit 7fbc6d596295570d2c61c3e507160f65c9adccb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Nov 25 17:03:42 2021 +0300

    all: imp upstream info in querylog
 2021-12-07 17:43:51 +03:00
Ainar Garipov b92b5fb46a Pull request: client: imp ru i18n 
Merge in DNS/adguard-home from imp-ru-i18n to master

Squashed commit of the following:

commit e45e1fa4027f01c73c428b35679cac901d02e307
Merge: 33a9e1e3 4f50519b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 29 20:38:35 2021 +0300

    Merge branch 'master' into imp-ru-i18n

commit 33a9e1e3de08de4779d3ca46404157388be12365
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 29 19:27:37 2021 +0300

    client: imp more

commit 80eb407dad469155a21ff8f2d898d7fc86799ded
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 29 19:19:52 2021 +0300

    client: imp ru i18n
 2021-11-29 20:53:04 +03:00
Eugene Burkov 4f50519b9f Pull request: 3846 filter lists ids 
Merge in DNS/adguard-home from 3846-list-ids to master

Closes #3846.

Squashed commit of the following:

commit 02a12fc27bc5d3cf1a17fd43c6f05e2c389bd71d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Nov 26 16:58:13 2021 +0300

    client: fix name

commit 6220570e6e9c968f0d3fa9d02c12099ce66aaaad
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Nov 26 16:46:54 2021 +0300

    client: handle special filter ids

commit dcdeb2d7f4500aab6ce5ffe642bdaacf291f5951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 26 15:52:06 2021 +0300

    all: mv constants, imp config

commit 8ceb4a2b351e595929d8b2af564c6d0267afa230
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 26 15:04:36 2021 +0300

    all: fix custom list id, log changes

commit acb8b456e7f41a556da34cf10647eecee058beec
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Nov 25 20:04:37 2021 +0300

    all: rm global ctx, add const flt ids
 2021-11-26 18:25:43 +03:00
Ildar Kamalov 936a7057fd Pull request: 3824 fix DHCP empty form validation 
Closes #3824

Squashed commit of the following:

commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Nov 24 12:21:23 2021 +0300

    Merge branch 'master' into 3824-empty-values

commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 23 19:06:44 2021 +0300

    Merge branch 'master' into 3824-empty-values

commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 23 19:04:06 2021 +0300

    all: use new consts

commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 23 18:58:03 2021 +0300

    client: get status on reset

commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 23 18:31:59 2021 +0300

    dhcpd: fix reset defaults

commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 23 17:33:22 2021 +0300

    client: fix DHCP empty form validation
 2021-11-24 13:57:50 +03:00
Eugene Burkov 51f11d2f8e Pull request: 3846 hosts querylog 
Merge in DNS/adguard-home from 3846-hosts-querylog to master

Updates #3846.

Squashed commit of the following:

commit 722e96628b1ccca1a5b5a716b8bcb1da2aefcc3b
Merge: a20ad71e ed868fa4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 23 17:52:08 2021 +0300

    Merge branch 'master' into 3846-hosts-querylog

commit a20ad71e723dbfa3483c3bdf9e4c8fd15c8b0e3c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 23 17:28:12 2021 +0300

    client: fix variable name

commit 7013bff05d6cff75c6c25a38d614db8b4b2f0b87
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 23 17:03:26 2021 +0300

    client: fix missing import

commit 8e4a0fb047b4d39ab44a285f59420573d7ba5eec
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 23 16:56:50 2021 +0300

    client: handle system host filter id

commit abbbf662d2f3ea3f5d3569a9c45418e356adbf3c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Nov 22 13:54:52 2021 +0300

    all: imp code

commit c2df63e46e75f84f70a610d18deccbeee672ebda
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Nov 22 12:50:51 2021 +0300

    querylog: rm unused test data

commit 8a1d47d266254fd4aedd4c61c7ea9e48168ea375
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Nov 22 02:52:50 2021 +0300

    aghnet: final imps

commit ade3acb4bebc8bdd755e56f314cdf19bc9375557
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 19 15:48:40 2021 +0300

    all: add hosts container rule list support
 2021-11-23 18:01:48 +03:00
Ainar Garipov ed868fa46a Pull request: client: upd i18n 
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 7d9aa25a5ec3e9779abda442fd68d057e7e5842e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Nov 23 14:04:17 2021 +0300

    client: upd i18n
 2021-11-23 14:21:02 +03:00
Ainar Garipov 4f257a1cfc Pull request: client: add fi, uk locales 
Merge in DNS/adguard-home from add-fi-uk to master

Squashed commit of the following:

commit eb293912036ddb4f209827f3e3f87e849c402c6c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 15 14:26:35 2021 +0300

    client: fix locale selection

commit 077b7ede31dd6ec0a154d38b32d40a3dd39ba383
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 15 14:10:55 2021 +0300

    client: add fi, uk locales
 2021-11-15 14:35:46 +03:00
Ainar Garipov b0b2eb3741 Pull request: client: imp en locale 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit cc5dfc8f7cdfdc8b530e284f38b851ad316d765a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 8 18:25:08 2021 +0300

    client: imp en locale
 2021-11-08 18:35:49 +03:00
Ainar Garipov c0b14b4811 Pull request: client: upd i18n 
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit f52a8ab20389f094211039f14bd6f934042c68e1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Nov 3 13:58:40 2021 +0300

    client: upd i18n
 2021-11-03 14:05:06 +03:00
Dmitry Seregin b1e28a74d1 Pull request: 3767 removed dhcp leases validators 
Merge in DNS/adguard-home from 3767-remove-dhcp-leases-validators to master

Squashed commit of the following:

commit 30511ecbb1ebbc913d3c3490b80b284fcc857e6c
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Tue Nov 2 19:20:06 2021 +0300

    3767: removed dhcp leases validators
 2021-11-02 20:12:11 +03:00
Eugene Burkov 7d9a1a2f30 client: fix json 2021-10-21 14:36:02 +03:00
Eugene Burkov 8388b3d5bc Merge branch 'master' into 3745-cleanup-lists 2021-10-21 14:30:18 +03:00
Dmitry Seregin d7aafa7dc6 Pull request #1329: 3529 validate dhcpv4 
Merge in DNS/adguard-home from 3529-validate-dhcpv4 to master

Squashed commit of the following:

commit 2f2455aa13a41398cd2846f31be96da9d34ba95d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Tue Oct 19 19:18:12 2021 +0300

    dhcpv4: better test && fix changelog

commit ec4ff9180e8390fb739b3be0fc76fd2c715fe691
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 19:08:44 2021 +0300

    dhcpv4: better tests

commit e0e2f27b7a063ed84af170b16c3f87636cb738d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 18:55:47 2021 +0300

    dhcpv4: better tests

commit 73e1d08e1265e336ee6339d5021f90883fe3e395
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 18:47:21 2021 +0300

    dhcpv4: better tests

commit f636fc316123f26b6e2930afb4b22c18024ec93d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 18:47:07 2021 +0300

    all: updated golibs

commit 86dd107a1d483ac24bd8c26422324eb8b9c3d086
Merge: 51aaf6d9 b296fa22
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 17:18:17 2021 +0300

    Merge branch 'master' into 3529-validate-dhcpv4

commit 51aaf6d9eb5fbe2b4304254dc6782305a19c53fa
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 17:18:02 2021 +0300

    dhcpv4: better changelog

commit 720b896bb595c57fab6d376f88c8a4b1d131db40
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 17:14:25 2021 +0300

    dhcpv4: better tests

commit 1098beffca8d5feb2ec104d26419210962c9a97d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 12:08:26 2021 +0300

    dhcp: changelog

commit d1f6c89d68657431fb261658133c67e9e3135c1c
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 12:03:06 2021 +0300

    dhcpv4: fixed tests

commit 8b6713468fc04321c5238300df90bbb2d67ee679
Merge: 9991e9cb 3fa38fb4
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 11:57:57 2021 +0300

    Merge branch 'master' into 3529-validate-dhcpv4

commit 9991e9cbee7dc87d8fa1d7e86e6cc7e09ab6938c
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 11:55:40 2021 +0300

    dhcpv4: added tests

commit 5798a80de6c060365c1c647326d46cc13ccf28cb
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Mon Oct 18 11:46:03 2021 +0300

    dhcpv4: validate subnet mask and ip range
 2021-10-19 19:28:18 +03:00
bruvv 49d67a70b6
Cleaned up the list 
Since SPAM404 is not maintained anymore and is a huge full spam list now of it's own (https://github.com/Spam404/lists/pull/18) it is save to remove it I would say.
Also removed X since it is also unmaintained
Added Netherlands blocking list
 2021-10-18 10:04:24 +02:00
Ildar Kamalov 3fa38fb420 Pull request: 3684 validate client id in the mobileconfig form 
Closes #3684

Squashed commit of the following:

commit 78e9862f7a06262f91c28d6ddcc10512560eedae
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 15 14:39:36 2021 +0300

    fix build

commit 3ed4ee69590f238396dd3aab2b62f110baa6d681
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 15 13:39:12 2021 +0300

    client: validate client id in the mobileconfig form
 2021-10-15 15:01:50 +03:00
Ainar Garipov 2b635bf689 Pull request: client: upd i18n 
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 5c9b2c73bacfe64915d5deef1c18cb14fcfcf303
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Oct 12 13:40:45 2021 +0300

    client: upd i18n
 2021-10-12 13:58:51 +03:00
Ildar Kamalov e178cb631f Pull request: client: fix statistics table layout 
Squashed commit of the following:

commit 02834e6b7b42793e31fd01cadf0af6da875d556b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Sep 29 16:47:14 2021 +0300

    client: nowrap

commit b45162a0f20b035c36ceb75cbc2485fa49012628
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Sep 29 16:28:05 2021 +0300

    fix: stats table layout
 2021-09-29 17:25:22 +03:00
Ainar Garipov b735c8167c Pull request: client: upd i18n 
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit d286164e32eb793de7bff441cc4513ecdb4fe458
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Sep 29 13:57:41 2021 +0300

    client: upd i18n
 2021-09-29 14:11:05 +03:00
Ainar Garipov b1242ee93f Pull request: client: fix wording abt auth 
Updates #3619.

Squashed commit of the following:

commit 9eecd4ef235b8dce747dab3feec325b1f84f8f3d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 21 16:52:27 2021 +0300

    client: fix wording abt auth
 2021-09-21 17:01:42 +03:00
Ainar Garipov eeb99db973 Pull request: client: upd i18n 
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 96ab70982c2f605a4f793a720451725a6c0e6c86
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 14 15:49:06 2021 +0300

    client: fix de i18n typography

commit d7ef3efa09814b8c8b3a9fdce891c137fea6583b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 14 15:16:15 2021 +0300

    client: upd i18n
 2021-09-14 16:01:52 +03:00
Dmitry Seregin 8fdd789474 Pull request: 3419 client allowlist collision 
Updates #3419.

Squashed commit of the following:

commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 17:31:16 2021 +0300

    added link to github issue

commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 17:29:52 2021 +0300

    Merge branch 'master' into 3419-client-allowlist-collision

commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 16:28:11 2021 +0300

    fix en

commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 15:49:12 2021 +0300

    added missing space

commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Fri Sep 10 15:43:55 2021 +0300

    fixes after review

commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Thu Sep 9 14:17:19 2021 +0300

    fixes

commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Wed Sep 8 15:04:30 2021 +0300

    return empty line to locale file

commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date:   Wed Sep 8 13:57:51 2021 +0300

    all: fix collisions in access lists && expand block/unblock client
 2021-09-10 17:57:09 +03:00
Ainar Garipov eeda06f9b0 Pull request: 3564 9gag 
Updates #3564.

Squashed commit of the following:

commit dafb26d9c0a85f30fb06627411f653e160d38cc8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Sep 8 12:13:43 2021 +0300

    client: fix 9gag spelling

commit a6aa44853061839e427836fe2daf69605cc90d33
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Sep 8 12:07:59 2021 +0300

    all: chlog

commit d46b17c079584946b857b63296a11acd6d524346
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Sep 8 12:01:41 2021 +0300

    filtering: fix 9gag blocked service
 2021-09-08 12:24:12 +03:00
Ainar Garipov bb4cd312c2 Pull request: client: upd i18n 
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit 59dadec4fe47ffb752ba13d597ad0dba35a17d93
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 31 13:22:53 2021 +0300

    client: fix ru locale

commit 38268c97dbf728c367ac280224ee6dcfef90c19a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 31 13:16:36 2021 +0300

    client: upd i18n
 2021-08-31 13:28:27 +03:00
Ildar Kamalov 595441603f Pull request: 3312: set search input from query params 
Closes #3312.

Squashed commit of the following:

commit b3070b623b6539b98922897042d3bd19ce15bf9c
Merge: 74e683da d1de47b6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Aug 27 19:34:08 2021 +0300

    Merge branch 'master' into 3312-search-input

commit 74e683da9f8a01f9e16cfc519c9b3106796712d1
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Aug 27 18:25:28 2021 +0300

    client: set search input from query params
 2021-08-27 19:38:29 +03:00
Ildar Kamalov e5c73877c8 Pull request: 3403 use checkbox to disable statistics 
Closes #3403

Squashed commit of the following:

commit 25eaa0a70cb5ac7de51c456d2f611522f334846c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Aug 27 15:42:29 2021 +0300

    fix enabling stats

commit 1e2897651a84cf32ae01a79b8a61aeb5aa9f6405
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 18:46:21 2021 +0300

    client: use checkbox to disable statistics
 2021-08-27 16:08:29 +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 756c70644d Pull request: client: imp en locale 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 04192f2eb3dda1059da442dd29c7d3b46cc4c538
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Aug 26 15:39:16 2021 +0300

    client: imp en locale
 2021-08-26 16:02:23 +03:00
Ainar Garipov f8fe4b310f Pull request: client: upd i18n 
Merge in DNS/adguard-home from upd-i18n to master

Squashed commit of the following:

commit e85d6eef7fca0eb61dd83d83069a637a71c66547
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 17 15:15:45 2021 +0300

    client: upd i18n
 2021-08-17 15:20:48 +03:00
Ildar Kamalov 91c1c9e61d Pull request #1273: 3438 make highlighted inputs resizable 
Merge in DNS/adguard-home from 3438-inputs-height to master

Squashed commit of the following:

commit a049febdc8490505d665c0939c01a14da997f861
Merge: 7035339b 42b2c3ab
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 17:36:58 2021 +0300

    Merge branch 'master' into 3438-inputs-height

commit 7035339b26fa205a844e79713179c7b623c90ce0
Merge: 20ef34c4 784bc318
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 17:28:06 2021 +0300

    Merge branch 'master' into 3438-inputs-height

commit 20ef34c4a6078658c444e310800923b8b3f74c1c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 13:41:46 2021 +0300

    client: remove unused

commit f2ace4ef452bbdc4b955e510aa07d1c93ec79ee4
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 13:30:58 2021 +0300

    client: make highlighted inputs resizable
 2021-08-16 17:57:06 +03:00
Ildar Kamalov 42b2c3ab85 Pull request: 3201 use backslash to escape quotes in the client name 
Closes #3201

Squashed commit of the following:

commit 43d2b967a4d13ff4556b2d9a7d6281b2a8be0895
Merge: 36eeb1bc 784bc318
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 17:29:06 2021 +0300

    Merge branch 'master' into 3201-escape-quotes

commit 36eeb1bc9862181a1cc3108300c6a12a9d913057
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 15:56:15 2021 +0300

    client: multiple escape

commit e7c19ddb1a5041447d9612783415ba21fcad802e
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 12:04:43 2021 +0300

    client: use backslash to escape quotes in the client name
 2021-08-16 17:36:44 +03:00
Ildar Kamalov 8e667d3cc4 Pull request: 3395 fix table scroll styles 
Closes #3395

Squashed commit of the following:

commit 63fd4593977cd2ac6595344f681df499dc62abb1
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 16 11:58:26 2021 +0300

    client: fix table scroll styles
 2021-08-16 13:34:44 +03:00
Ainar Garipov 00f2927663 Pull request: client: imp en i18n 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit ad7de346cddd14502e7144c9b689f610357158fd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Aug 11 13:34:47 2021 +0300

    client: imp en i18n
 2021-08-11 14:20:02 +03:00
Ainar Garipov 133a1c57b1 Pull request: client: fix en i18n 
Merge in DNS/adguard-home from fix-i18n to master

Squashed commit of the following:

commit 6cc5b9548cd1b429cfcba13c37b3cbfed9ae6514
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 9 14:21:06 2021 +0300

    client: fix en i18n
 2021-08-09 14:38:31 +03:00
Ainar Garipov 89b3af128a Pull request: client: imp en i18n 
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 5340d2ccfecbf756694594d125e10c1890a7155a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Aug 6 15:28:37 2021 +0300

    client: imp en i18n
 2021-08-06 15:40:30 +03:00