docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> test: /\.module\.p?css$/,
<mask> use: [
<mask> {
<mask> loader: MiniCssExtractPlugin.loader,
<mask> options: {
<mask> esModules: true,
<mask> }
<mask> },
<mask> {
<mask> loader: 'css-loader',
<mask> options: {
<mask> modules: true,
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove options: {
esModules: true,
}
</s> add </s> remove interface AdminInterfaceProps {
</s> add interface RadioProps { </s> remove const { properties: sProps, required } = this.schemas[sName];
</s> add const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
} </s> add const devHost = process.env.DEV_HOST </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove export const reactFormater = (data: (JSX.Element | string)[]) => {
if (data.every((d) => typeof d === 'string')) {
return data.join('');
}
return React.Children.toArray(data);
};
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/webpack/webpack.config.prod.js |
keep keep keep add keep keep keep keep keep | <mask> import React, { FC } from 'react';
<mask> import { Layout } from 'antd';
<mask> import { Formik, FormikHelpers } from 'formik';
<mask> import { observer } from 'mobx-react-lite';
<mask>
<mask> import { IInitialConfigurationBeta } from 'Entities/InitialConfigurationBeta';
<mask> import Icons from 'Common/ui/Icons';
<mask> import {
<mask> DEFAULT_DNS_ADDRESS,
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> add import { DHCP_LINK } from 'Consts/common';
import { danger, externalLink, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install'; </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/Install.tsx |
keep keep keep keep replace keep keep keep keep keep | <mask> import { Formik, FormikHelpers } from 'formik';
<mask> import { observer } from 'mobx-react-lite';
<mask>
<mask> import { IInitialConfigurationBeta } from 'Entities/InitialConfigurationBeta';
<mask> import Icons from 'Lib/theme/Icons';
<mask> import {
<mask> DEFAULT_DNS_ADDRESS,
<mask> DEFAULT_DNS_PORT,
<mask> DEFAULT_IP_ADDRESS,
<mask> DEFAULT_IP_PORT,
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add import cn from 'classnames'; </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> add import { DHCP_LINK } from 'Consts/common';
import { danger, externalLink, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/Install.tsx |
keep keep keep keep replace replace keep keep keep keep keep | <mask> });
<mask>
<mask> const Install: FC = () => {
<mask> return (
<mask> <Layout className={theme.install.layout}>
<mask> <Content className={theme.install.container}>
<mask> <InstallForm />
<mask> </Content>
<mask> <Icons/>
<mask> </Layout>
<mask> );
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const dhcp = (e: string) => (
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a>
);
</s> add </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); </s> remove this.intl = this.intl.updateTranslator(lang);
</s> add this.intl = translate.createReactTranslator<any>(i18n(this.currentLang), React);
};
toggleSidebar = () => {
this.sidebarOpen = !this.sidebarOpen; </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/Install.tsx |
keep keep keep add keep keep keep keep keep | <mask> import { Tabs, Grid } from 'antd';
<mask> import cn from 'classnames';
<mask> import { FormikHelpers } from 'formik';
<mask>
<mask> import Store from 'Store/installStore';
<mask> import theme from 'Lib/theme';
<mask>
<mask> import { FormValues } from '../../Install';
<mask> import StepButtons from '../StepButtons';
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> add import cn from 'classnames'; </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; </s> add import { Store as InstallStore } from 'Store/installStore'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
keep keep keep keep replace replace keep keep keep keep keep | <mask> import { FormikHelpers } from 'formik';
<mask>
<mask> import Store from 'Store/installStore';
<mask> import theme from 'Lib/theme';
<mask> import { danger, p } from 'Common/formating';
<mask> import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
<mask>
<mask> import { FormValues } from '../../Install';
<mask> import StepButtons from '../StepButtons';
<mask>
<mask> const { useBreakpoint } = Grid;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add import { DHCP_LINK } from 'Consts/common';
import { danger, externalLink, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install'; </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> add import cn from 'classnames'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; </s> add import { Store as InstallStore } from 'Store/installStore'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> const { ui: { intl }, install: { addresses } } = useContext(Store);
<mask> const screens = useBreakpoint();
<mask> const tabsPosition = screens.md ? 'left' : 'top';
<mask>
<mask> const dhcp = (e: string) => (
<mask> <a
<mask> href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
<mask> target="_blank"
<mask> rel="noopener noreferrer"
<mask> className={theme.link.link}
<mask> >
<mask> {e}
<mask> </a>
<mask> );
<mask>
<mask> const allIps = addresses?.interfaces.reduce<string[]>((all, data) => {
<mask> const { ipAddresses } = data;
<mask> if (ipAddresses) {
<mask> all.push(...ipAddresses);
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
w.writeLine(`return Object.entries(this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`}).reduce<Record<string, ${isClass ? 'I' : ''}${pType}>>((prev, [key, value]) => {`);
if (isClass) {
w.writeLine(` prev[key] = value.serialize();`);
} else {
w.writeLine(' prev[key] = value;')
}
w.writeLine(' return prev;');
w.writeLine('}, {})');
return;
} | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
keep keep keep keep replace keep keep keep keep keep | <mask> ))}
<mask> </div>
<mask> </div>
<mask> <div className={cn(theme.install.text, theme.install.text_base)}>
<mask> {intl.getMessage('install_configure_dhcp', { dhcp })}
<mask> </div>
<mask> <StepButtons
<mask> setFieldValue={setFieldValue}
<mask> currentStep={4}
<mask> values={values}
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const dhcp = (e: string) => (
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a>
);
</s> add </s> remove options: {
esModules: true,
}
</s> add </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> add client_id: client_id, </s> add &.gray {
color: var(--gray900);
&:hover,
&:focus {
color: var(--gray700);
}
&:active {
color: var(--gray700);
}
} | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
keep keep keep keep replace keep keep keep keep keep | <mask> import s from './Radio.module.pcss';
<mask>
<mask> const { Group } = Radio;
<mask>
<mask> interface AdminInterfaceProps {
<mask> options: {
<mask> label: string;
<mask> desc?: string;
<mask> value: string | number;
<mask> }[];
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> remove const RadioComponent: FC<AdminInterfaceProps> = observer(({
</s> add const RadioComponent: FC<RadioProps> = observer(({ </s> remove lastUpdated: string;
</s> add last_updated: string; </s> add name?: string; </s> add http_port: number; </s> remove username?: string;
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/common/controls/Radio/Radio.tsx |
keep keep keep keep replace keep keep keep keep keep | <mask> onSelect: (value: string | number) => void;
<mask> value: string | number;
<mask> }
<mask>
<mask> const RadioComponent: FC<AdminInterfaceProps> = observer(({
<mask> options, onSelect, value,
<mask> }) => {
<mask> if (options.length === 0) {
<mask> return null;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add static async dhcpInterfaces(): Promise<INetInterfaces | Error> {
return await fetch(`/control/dhcp/interfaces`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.json();
} else {
return new Error(String(res.status));
}
})
}
</s> remove interface AdminInterfaceProps {
</s> add interface RadioProps { </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; </s> remove readonly _key: string | undefined;
get key(): string | undefined {
return this._key;
}
</s> add readonly data: Record<string, string>; </s> remove export const reactFormater = (data: (JSX.Element | string)[]) => {
if (data.every((d) => typeof d === 'string')) {
return data.join('');
}
return React.Children.toArray(data);
};
</s> add </s> remove readonly _username: string | undefined;
</s> add readonly _password: string | undefined; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/common/controls/Radio/Radio.tsx |
keep keep replace keep keep keep keep keep | <mask> import React, { FC } from 'react';
<mask> import cn from 'classnames';
<mask> import { IconType } from 'Lib/theme/Icons';
<mask>
<mask> import s from './Icon.module.pcss';
<mask>
<mask> interface IconProps {
<mask> icon: IconType;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add import cn from 'classnames'; </s> add import { DHCP_LINK } from 'Consts/common';
import { danger, externalLink, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install'; </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> remove import React from 'react';
</s> add </s> add import Login from './stores/Login';
import Dashboard from './stores/Dasnboard';
import System from './stores/System';
import GeneralSettings from './stores/GeneralSettings'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/common/ui/Icon/Icon.tsx |
keep keep keep keep replace | <mask> );
<mask> };
<mask>
<mask> export default Icon;
<mask> export { IconType } from 'Lib/theme/Icons';
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> remove import T from './Translator';
import { Locale } from './locales';
</s> add import { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES } from './locales'; </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); </s> add import { Store as InstallStore } from 'Store/installStore'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/common/ui/Icon/Icon.tsx |
keep keep add keep keep keep | <mask> @text-color: #000;
<mask> @link-hover-color: #4d995f;
<mask> @link-active-color: #4d995f;
<mask>
<mask> @font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
<mask> @font-size-base: 14px;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove --black: #000000;
</s> add --black: #131313; </s> add --text-selection: #e7efff;
--header-height: 48px; </s> remove font-size: 14px;
</s> add font-size: 16px; </s> add .code {
padding: 3px 5px;
font-size: 14px;
font-family: var(--font-family-monospace);
background-color: var(--gray300);
border-radius: 2px;
}
</s> remove ]
</s> add ],
"useDefineForClassFields": true </s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/ant/ant-overrides.less |
add keep keep keep | <mask> import './Radio.pcss';
<mask>
<mask> const insertStyles = true;
<mask> export default insertStyles;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import T from './Translator';
import { Locale } from './locales';
</s> add import { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES } from './locales'; </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); </s> remove rootStore: Store;
</s> add rootStore: Store | InstallStore; </s> remove const cl = openApi ? openApi.components.schemas[temp[temp.length - 1]] : {};
</s> add const cl = openApi ? openApi.components.schemas[type] : {};
if (cl.$ref) {
const link = schemaParamParser(cl, openApi);
link.shift();
return [type, ...link] as any;
} </s> add import { Store as InstallStore } from 'Store/installStore'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/ant/index.ts |
add keep keep keep keep | <mask> import qs from 'qs';
<mask> import Client, { IClient } from 'Entities/Client';
<mask> import ClientDelete, { IClientDelete } from 'Entities/ClientDelete';
<mask> import ClientUpdate, { IClientUpdate } from 'Entities/ClientUpdate';
<mask> import Clients, { IClients } from 'Entities/Clients';
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add import cn from 'classnames'; </s> add import { DHCP_LINK } from 'Consts/common';
import { danger, externalLink, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install'; </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/clients.ts |
keep keep keep add keep keep keep keep keep keep | <mask> import DhcpConfig, { IDhcpConfig } from 'Entities/DhcpConfig';
<mask> import DhcpSearchResult, { IDhcpSearchResult } from 'Entities/DhcpSearchResult';
<mask> import DhcpStaticLease, { IDhcpStaticLease } from 'Entities/DhcpStaticLease';
<mask> import DhcpStatus, { IDhcpStatus } from 'Entities/DhcpStatus';
<mask>
<mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export default class DhcpApi {
<mask> static async checkActiveDhcp(): Promise<IDhcpSearchResult | Error> {
<mask> return await fetch(`/control/dhcp/find_active_dhcp`, {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> add [key: string]: string; </s> add [key: string]: IClientFindSubEntry; </s> remove username?: string;
</s> add </s> remove key?: string;
</s> add [key: string]: string; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/dhcp.ts |
keep add keep keep keep keep keep | <mask> }
<mask>
<mask> static async dhcpRemoveStaticLease(dhcpstaticlease: IDhcpStaticLease): Promise<number | string[] | Error> {
<mask> const haveError: string[] = [];
<mask> const dhcpstaticleaseValid = new DhcpStaticLease(dhcpstaticlease);
<mask> haveError.push(...dhcpstaticleaseValid.validate());
<mask> if (haveError.length > 0) {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove static async mobileConfigDoT(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> add client_id: client_id, </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const RadioComponent: FC<AdminInterfaceProps> = observer(({
</s> add const RadioComponent: FC<RadioProps> = observer(({ | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/dhcp.ts |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export default class MobileconfigApi {
<mask> static async mobileConfigDoH(host?: string): Promise<number | Error> {
<mask> const queryParams = {
<mask> host: host,
<mask> }
<mask> return await fetch(`/control/apple/doh.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
<mask> method: 'GET',
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove static async mobileConfigDoT(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { </s> add client_id: client_id, </s> remove username?: string;
</s> add </s> add [key: string]: IClientFindSubEntry; </s> add [key: string]: string; </s> remove key?: string;
</s> add [key: string]: string; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/mobileconfig.ts |
keep add keep keep keep keep keep keep | <mask> const queryParams = {
<mask> host: host,
<mask> }
<mask> return await fetch(`/control/apple/doh.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
<mask> method: 'GET',
<mask> }).then(async (res) => {
<mask> if (res.status === 200) {
<mask> return res.status;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add client_id: client_id, </s> remove static async mobileConfigDoT(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> add static async dhcpInterfaces(): Promise<INetInterfaces | Error> {
return await fetch(`/control/dhcp/interfaces`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.json();
} else {
return new Error(String(res.status));
}
})
}
</s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove if (typeof props.domain_or_ip === 'number') {
this._domain_or_ip = props.domain_or_ip;
}
</s> add this.numberData = Object.entries(props).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/mobileconfig.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> })
<mask> }
<mask>
<mask> static async mobileConfigDoT(host?: string): Promise<number | Error> {
<mask> const queryParams = {
<mask> host: host,
<mask> }
<mask> return await fetch(`/control/apple/dot.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
<mask> method: 'GET',
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add client_id: client_id, </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> add client_id: client_id, </s> add static async dhcpInterfaces(): Promise<INetInterfaces | Error> {
return await fetch(`/control/dhcp/interfaces`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.json();
} else {
return new Error(String(res.status));
}
})
}
</s> add import NetInterfaces, { INetInterfaces } from 'Entities/NetInterfaces'; </s> remove const RadioComponent: FC<AdminInterfaceProps> = observer(({
</s> add const RadioComponent: FC<RadioProps> = observer(({ | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/mobileconfig.ts |
keep keep keep add keep keep keep keep keep keep | <mask>
<mask> static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> {
<mask> const queryParams = {
<mask> host: host,
<mask> }
<mask> return await fetch(`/control/apple/dot.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
<mask> method: 'GET',
<mask> }).then(async (res) => {
<mask> if (res.status === 200) {
<mask> return res.status;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove static async mobileConfigDoT(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { </s> add client_id: client_id, </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> add static async dhcpInterfaces(): Promise<INetInterfaces | Error> {
return await fetch(`/control/dhcp/interfaces`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.json();
} else {
return new Error(String(res.status));
}
})
}
</s> add import NetInterfaces, { INetInterfaces } from 'Entities/NetInterfaces'; </s> remove static dnsAddressValidate(dnsAddress: string): boolean {
return typeof dnsAddress === 'string' && !!dnsAddress.trim();
</s> add static dnsAddressesValidate(dnsAddresses: string[]): boolean {
return dnsAddresses.reduce<boolean>((result, p) => result && (typeof p === 'string' && !!p.trim()), true); | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/mobileconfig.ts |
replace keep keep keep keep keep | <mask> import NetInterface, { INetInterface } from './NetInterface';
<mask>
<mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export interface IAddressesInfo {
<mask> dns_port: number;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> remove dns_address: string;
</s> add dns_addresses: string[]; </s> add [key: string]: IClientFindSubEntry; </s> add [key: string]: string; </s> add [key: string]: number | undefined; </s> remove username?: string;
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export interface IAddressesInfo {
<mask> dns_port: number;
<mask> interfaces: { [key: string]: INetInterface };
<mask> web_port: number;
<mask> }
<mask>
<mask> export default class AddressesInfo {
<mask> readonly _dns_port: number;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; </s> add [key: string]: number | undefined; </s> add [key: string]: IClientFindSubEntry; </s> add [key: string]: string; </s> remove key?: string;
</s> add [key: string]: string; </s> remove dns_address: string;
</s> add dns_addresses: string[]; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
keep keep keep replace keep keep keep keep keep keep keep keep replace replace | <mask> return typeof dnsPort === 'number';
<mask> }
<mask>
<mask> readonly _interfaces: { [key: string]: NetInterface };
<mask>
<mask> /** */
<mask> get interfaces(): { [key: string]: NetInterface } {
<mask> return this._interfaces;
<mask> }
<mask>
<mask> readonly _interfaces: { [key: string]: NetInterface };
<mask>
<mask> /** */
<mask> get interfaces(): { [key: string]: NetInterface } {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> add [key: string]: IClientFindSubEntry; </s> add [key: string]: string; </s> remove key?: string;
</s> add [key: string]: string; </s> remove * Description: undefined
</s> add * Description: Flags could be any combination of the following values, divided by the "|" character: "up", "broadcast", "loopback", "pointtopoint" and "multicast".
* | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> constructor(props: IAddressesInfo) {
<mask> this._dns_port = props.dns_port;
<mask> this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
<mask> return { ...prev, [key]: new NetInterface(props.interfaces[key])};
<mask> },{})
<mask> this._web_port = props.web_port;
<mask> }
<mask>
<mask> serialize(): IAddressesInfo {
<mask> const data: IAddressesInfo = {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove interfaces: Object.keys(this._interfaces).reduce<Record<string, any>>((prev, key) => ({ ...prev, [key]: this._interfaces[key].serialize() }), {}),
</s> add interfaces: this._interfaces.serialize(), </s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove if (typeof props.domain_or_ip === 'number') {
this._domain_or_ip = props.domain_or_ip;
}
</s> add this.numberData = Object.entries(props).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> serialize(): IAddressesInfo {
<mask> const data: IAddressesInfo = {
<mask> dns_port: this._dns_port,
<mask> interfaces: Object.keys(this._interfaces).reduce<Record<string, any>>((prev, key) => ({ ...prev, [key]: this._interfaces[key].serialize() }), {}),
<mask> web_port: this._web_port,
<mask> };
<mask> return data;
<mask> }
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
return { ...prev, [key]: new NetInterface(props.interfaces[key])};
},{})
</s> add this._interfaces = new NetInterfaces(props.interfaces); </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> add interfaces: this._interfaces.validate().length === 0, </s> remove dns_address: this._dns_address,
</s> add dns_addresses: this._dns_addresses, </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
keep keep add keep keep keep keep | <mask> const validate = {
<mask> dns_port: typeof this._dns_port === 'number',
<mask> web_port: typeof this._web_port === 'number',
<mask> };
<mask> const isError: string[] = [];
<mask> Object.keys(validate).forEach((key) => {
<mask> if (!(validate as any)[key]) {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> safesearch_enabled?: boolean;
<mask> upstreams?: string[];
<mask> use_global_blocked_services?: boolean;
<mask> use_global_settings?: boolean;
<mask> whois_info?: IWhoisInfo[];
<mask> }
<mask>
<mask> export default class ClientFindSubEntry {
<mask> readonly _blocked_services: string[] | undefined;
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add disabled: boolean; </s> add http_port: number; </s> remove querylog_enabled: boolean;
</s> add </s> remove rulesCount: number;
</s> add rules_count: number; </s> remove dns_address: string;
</s> add dns_addresses: string[]; </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
| https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
keep keep replace keep keep keep keep keep keep keep replace keep | <mask> }
<mask>
<mask> readonly _whois_info: WhoisInfo[] | undefined;
<mask>
<mask> get whoisInfo(): WhoisInfo[] | undefined {
<mask> return this._whois_info;
<mask> }
<mask>
<mask> readonly _whois_info: WhoisInfo[] | undefined;
<mask>
<mask> get whoisInfo(): WhoisInfo[] | undefined {
<mask> return this._whois_info;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove readonly _username: string | undefined;
</s> add readonly _password: string | undefined; </s> remove get password(): string | undefined {
return this._password;
</s> add get name(): string | undefined {
return this._name; </s> add readonly _client_id: string | undefined;
/**
* Description: The client ID, if provided in DOH, DOQ, or DOT.
*
* Example: cli123
*/
get clientId(): string | undefined {
return this._client_id;
}
</s> remove readonly _password: string | undefined;
</s> add readonly _name: string | undefined; </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> if (typeof props.use_global_settings === 'boolean') {
<mask> this._use_global_settings = props.use_global_settings;
<mask> }
<mask> if (props.whois_info) {
<mask> this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
<mask> }
<mask> }
<mask>
<mask> serialize(): IClientFindSubEntry {
<mask> const data: IClientFindSubEntry = {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove data.whois_info = this._whois_info.map((p) => p.serialize());
</s> add data.whois_info = this._whois_info.serialize(); </s> remove if (typeof props.username === 'string') {
this._username = props.username.trim();
}
</s> add </s> add this._disabled = props.disabled; </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> add if (typeof props.name === 'string') {
this._name = props.name.trim();
} </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> if (typeof this._use_global_settings !== 'undefined') {
<mask> data.use_global_settings = this._use_global_settings;
<mask> }
<mask> if (typeof this._whois_info !== 'undefined') {
<mask> data.whois_info = this._whois_info.map((p) => p.serialize());
<mask> }
<mask> return data;
<mask> }
<mask>
<mask> validate(): string[] {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove if (typeof this._username !== 'undefined') {
data.username = this._username;
}
</s> add </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> add disabled: this._disabled, </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> safesearch_enabled: !this._safesearch_enabled ? true : typeof this._safesearch_enabled === 'boolean',
<mask> use_global_blocked_services: !this._use_global_blocked_services ? true : typeof this._use_global_blocked_services === 'boolean',
<mask> blocked_services: !this._blocked_services ? true : this._blocked_services.reduce((result, p) => result && typeof p === 'string', true),
<mask> upstreams: !this._upstreams ? true : this._upstreams.reduce((result, p) => result && typeof p === 'string', true),
<mask> whois_info: !this._whois_info ? true : this._whois_info.reduce((result, p) => result && p.validate().length === 0, true),
<mask> disallowed: !this._disallowed ? true : typeof this._disallowed === 'boolean',
<mask> disallowed_rule: !this._disallowed_rule ? true : typeof this._disallowed_rule === 'string' && !this._disallowed_rule ? true : this._disallowed_rule,
<mask> };
<mask> const isError: string[] = [];
<mask> Object.keys(validate).forEach((key) => {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add client_id: !this._client_id ? true : typeof this._client_id === 'string' && !this._client_id ? true : this._client_id, </s> remove dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
</s> add dns_addresses: this._dns_addresses.reduce((result, p) => result && typeof p === 'string', true), </s> add http_port: this._http_port >= 1 && this._http_port <= 65535, </s> add disabled: typeof this._disabled === 'boolean', </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
keep keep add keep keep keep keep | <mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export interface IClientsFindEntry {
<mask> }
<mask>
<mask> export default class ClientsFindEntry {
<mask> readonly data: Record<string, ClientFindSubEntry>;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add [key: string]: string; </s> remove username?: string;
</s> add </s> remove key?: string;
</s> add [key: string]: string; </s> add [key: string]: number | undefined; </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
keep keep add keep keep keep keep keep | <mask> }
<mask>
<mask> export default class ClientsFindEntry {
<mask> constructor(props: IClientsFindEntry) {
<mask> this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
<mask> prev[key] = new ClientFindSubEntry(value!);
<mask> return prev;
<mask> }, {})
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {}) </s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> add readonly data: Record<string, string>;
</s> add readonly numberData: Record<string, number>;
</s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
keep add keep keep keep keep keep | <mask>
<mask> constructor(props: IClientsFindEntry) {
<mask> }
<mask>
<mask> serialize(): IClientsFindEntry {
<mask> return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
<mask> prev[key] = value.serialize();
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> add readonly data: Record<string, ClientFindSubEntry>;
</s> remove if (typeof props.domain_or_ip === 'number') {
this._domain_or_ip = props.domain_or_ip;
}
</s> add this.numberData = Object.entries(props).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
keep keep replace replace replace keep keep keep replace replace replace replace replace replace replace replace replace | <mask>
<mask> serialize(): IClientsFindEntry {
<mask> const data: IClientsFindEntry = {
<mask> };
<mask> return data;
<mask> }
<mask>
<mask> validate(): string[] {
<mask> const validate = {
<mask> };
<mask> const isError: string[] = [];
<mask> Object.keys(validate).forEach((key) => {
<mask> if (!(validate as any)[key]) {
<mask> isError.push(key);
<mask> }
<mask> });
<mask> return isError;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> add interfaces: this._interfaces.validate().length === 0, </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
keep keep keep keep replace keep keep keep | <mask> });
<mask> return isError;
<mask> }
<mask>
<mask> update(props: Partial<IClientsFindEntry>): ClientsFindEntry {
<mask> return new ClientsFindEntry({ ...this.serialize(), ...props });
<mask> }
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove update(props: Partial<IWhoisInfo>): WhoisInfo {
</s> add update(props: IWhoisInfo): WhoisInfo { </s> remove update(props: Partial<IUpstreamsConfigResponse>): UpstreamsConfigResponse {
</s> add update(props: IUpstreamsConfigResponse): UpstreamsConfigResponse { </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove type: `Partial<I${sName}>`,
</s> add type: additionalPropsOnly ? `I${sName}` : `Partial<I${sName}>`, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> readonly _found: string | undefined;
<mask>
<mask> /**
<mask> * Description: yes|no|error
<mask> * Example: no
<mask> */
<mask> get found(): string | undefined {
<mask> return this._found;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove * Description: yes|no|error
</s> add * Description: The result of determining static IP address.
* </s> remove * Description: undefined
</s> add * Description: The client's IP address.
* </s> remove * Description: Time units (hours | days)
</s> add * Description: Time units </s> add readonly _client_id: string | undefined;
/**
* Description: The client ID, if provided in DOH, DOQ, or DOT.
*
* Example: cli123
*/
get clientId(): string | undefined {
return this._client_id;
}
</s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/DhcpSearchResultOtherServer.ts |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> readonly _static: string | undefined;
<mask>
<mask> /**
<mask> * Description: yes|no|error
<mask> * Example: yes
<mask> */
<mask> get static(): string | undefined {
<mask> return this._static;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove * Description: yes|no|error
</s> add * Description: The result of searching the other DHCP server.
* </s> remove * Description: undefined
</s> add * Description: The client's IP address.
* </s> remove * Description: Time units (hours | days)
</s> add * Description: Time units </s> add readonly _client_id: string | undefined;
/**
* Description: The client ID, if provided in DOH, DOQ, or DOT.
*
* Example: cli123
*/
get clientId(): string | undefined {
return this._client_id;
}
</s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/DhcpSearchResultStaticIP.ts |
keep keep keep keep replace keep replace keep keep keep | <mask> // All changes will be overwrited on commit.
<mask> export interface IFilter {
<mask> enabled: boolean;
<mask> id: number;
<mask> lastUpdated: string;
<mask> name: string;
<mask> rulesCount: number;
<mask> url: string;
<mask> }
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove dns_address: string;
</s> add dns_addresses: string[]; </s> add name?: string; </s> remove username?: string;
</s> add </s> remove key?: string;
</s> add [key: string]: string; </s> add [key: string]: string; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Filter.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> static idValidate(id: number): boolean {
<mask> return typeof id === 'number';
<mask> }
<mask>
<mask> readonly _lastUpdated: string;
<mask>
<mask> /**
<mask> * Description: undefined
<mask> * Example: 2018-10-30T12:18:57+03:00
<mask> */
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove return this._rulesCount;
</s> add return this._rules_count; </s> remove return this._lastUpdated;
</s> add return this._last_updated; </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _rulesCount: number;
</s> add readonly _rules_count: number; </s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; </s> remove get dnsAddress(): string {
return this._dns_address;
</s> add get dnsAddresses(): string[] {
return this._dns_addresses; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Filter.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> * Description: undefined
<mask> * Example: 2018-10-30T12:18:57+03:00
<mask> */
<mask> get lastUpdated(): string {
<mask> return this._lastUpdated;
<mask> }
<mask>
<mask> static lastUpdatedValidate(lastUpdated: string): boolean {
<mask> return typeof lastUpdated === 'string' && !!lastUpdated.trim();
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove get dnsAddress(): string {
return this._dns_address;
</s> add get dnsAddresses(): string[] {
return this._dns_addresses; </s> remove readonly _rulesCount: number;
</s> add readonly _rules_count: number; </s> remove readonly _lastUpdated: string;
</s> add readonly _last_updated: string; </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove return this._rulesCount;
</s> add return this._rules_count; </s> remove * Description: yes|no|error
</s> add * Description: The result of determining static IP address.
* | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Filter.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> static nameValidate(name: string): boolean {
<mask> return typeof name === 'string' && !!name.trim();
<mask> }
<mask>
<mask> readonly _rulesCount: number;
<mask>
<mask> /**
<mask> * Description: undefined
<mask> * Example: 5912
<mask> */
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove get dnsAddress(): string {
return this._dns_address;
</s> add get dnsAddresses(): string[] {
return this._dns_addresses; </s> remove return this._lastUpdated;
</s> add return this._last_updated; </s> remove return this._rulesCount;
</s> add return this._rules_count; </s> remove readonly _lastUpdated: string;
</s> add readonly _last_updated: string; </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Filter.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> * Description: undefined
<mask> * Example: 5912
<mask> */
<mask> get rulesCount(): number {
<mask> return this._rulesCount;
<mask> }
<mask>
<mask> static rulesCountValidate(rulesCount: number): boolean {
<mask> return typeof rulesCount === 'number';
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove readonly _lastUpdated: string;
</s> add readonly _last_updated: string; </s> remove readonly _rulesCount: number;
</s> add readonly _rules_count: number; </s> remove return this._lastUpdated;
</s> add return this._last_updated; </s> remove get dnsAddress(): string {
return this._dns_address;
</s> add get dnsAddresses(): string[] {
return this._dns_addresses; </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Filter.ts |
keep keep replace keep replace | <mask> this._enabled = props.enabled;
<mask> this._id = props.id;
<mask> this._lastUpdated = props.lastUpdated.trim();
<mask> this._name = props.name.trim();
<mask> this._rulesCount = props.rulesCount;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', </s> add if (typeof props.name === 'string') {
this._name = props.name.trim();
} </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> add this._http_port = props.http_port; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Filter.ts |
keep keep keep keep replace keep replace keep keep | <mask> serialize(): IFilter {
<mask> const data: IFilter = {
<mask> enabled: this._enabled,
<mask> id: this._id,
<mask> lastUpdated: this._lastUpdated,
<mask> name: this._name,
<mask> rulesCount: this._rulesCount,
<mask> url: this._url,
<mask> };
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove lastUpdated: string;
</s> add last_updated: string; </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> remove rulesCount: number;
</s> add rules_count: number; </s> remove this._rulesCount = props.rulesCount;
</s> add this._rules_count = props.rules_count; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Filter.ts |
keep keep keep keep replace keep replace | <mask> validate(): string[] {
<mask> const validate = {
<mask> enabled: typeof this._enabled === 'boolean',
<mask> id: typeof this._id === 'number',
<mask> lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
<mask> name: typeof this._name === 'string' && !this._name ? true : this._name,
<mask> rulesCount: typeof this._rulesCount === 'number',
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, </s> add disabled: typeof this._disabled === 'boolean', </s> add client_id: !this._client_id ? true : typeof this._client_id === 'string' && !this._client_id ? true : this._client_id, </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> remove dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
</s> add dns_addresses: this._dns_addresses.reduce((result, p) => result && typeof p === 'string', true), | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Filter.ts |
keep add keep keep keep keep keep | <mask> // All changes will be overwrited on commit.
<mask> export interface ILogin {
<mask> password?: string;
<mask> }
<mask>
<mask> export default class Login {
<mask> readonly _name: string | undefined;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove username?: string;
</s> add </s> remove key?: string;
</s> add [key: string]: string; </s> add [key: string]: number | undefined; </s> add [key: string]: string; </s> add [key: string]: IClientFindSubEntry; </s> remove lastUpdated: string;
</s> add last_updated: string; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep replace keep keep keep replace | <mask> password?: string;
<mask> username?: string;
<mask> }
<mask>
<mask> export default class Login {
<mask> readonly _password: string | undefined;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add name?: string; </s> remove get password(): string | undefined {
return this._password;
</s> add get name(): string | undefined {
return this._name; </s> add disabled: boolean; </s> remove readonly _key: string | undefined;
get key(): string | undefined {
return this._key;
}
</s> add readonly data: Record<string, string>; </s> remove key?: string;
</s> add [key: string]: string; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep keep keep keep replace replace keep keep replace keep keep | <mask> export default class Login {
<mask> readonly _password: string | undefined;
<mask>
<mask> /** */
<mask> get password(): string | undefined {
<mask> return this._password;
<mask> }
<mask>
<mask> readonly _username: string | undefined;
<mask>
<mask> /** */
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove readonly _password: string | undefined;
</s> add readonly _name: string | undefined; </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; </s> add readonly _client_id: string | undefined;
/**
* Description: The client ID, if provided in DOH, DOQ, or DOT.
*
* Example: cli123
*/
get clientId(): string | undefined {
return this._client_id;
}
</s> remove * Description: undefined
</s> add * Description: The client's IP address.
* </s> remove * Description: Time units (hours | days)
</s> add * Description: Time units | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> readonly _username: string | undefined;
<mask>
<mask> /** */
<mask> get username(): string | undefined {
<mask> return this._username;
<mask> }
<mask>
<mask> constructor(props: ILogin) {
<mask> if (typeof props.password === 'string') {
<mask> this._password = props.password.trim();
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove readonly _username: string | undefined;
</s> add readonly _password: string | undefined; </s> add if (typeof props.name === 'string') {
this._name = props.name.trim();
} </s> remove if (typeof props.username === 'string') {
this._username = props.username.trim();
}
</s> add </s> remove get password(): string | undefined {
return this._password;
</s> add get name(): string | undefined {
return this._name; </s> remove readonly _key: string | undefined;
get key(): string | undefined {
return this._key;
}
</s> add readonly data: Record<string, string>; </s> remove readonly _password: string | undefined;
</s> add readonly _name: string | undefined; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep add keep keep keep keep keep keep | <mask>
<mask> constructor(props: ILogin) {
<mask> if (typeof props.password === 'string') {
<mask> this._password = props.password.trim();
<mask> }
<mask> }
<mask>
<mask> serialize(): ILogin {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove if (typeof props.username === 'string') {
this._username = props.username.trim();
}
</s> add </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> add if (typeof props.client_id === 'string') {
this._client_id = props.client_id.trim();
} </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> add this._disabled = props.disabled; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> constructor(props: ILogin) {
<mask> if (typeof props.password === 'string') {
<mask> this._password = props.password.trim();
<mask> }
<mask> if (typeof props.username === 'string') {
<mask> this._username = props.username.trim();
<mask> }
<mask> }
<mask>
<mask> serialize(): ILogin {
<mask> const data: ILogin = {
<mask> };
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add if (typeof props.name === 'string') {
this._name = props.name.trim();
} </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; </s> add if (typeof props.client_id === 'string') {
this._client_id = props.client_id.trim();
} </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> add this._disabled = props.disabled; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep keep add keep keep keep keep keep keep | <mask> serialize(): ILogin {
<mask> const data: ILogin = {
<mask> };
<mask> if (typeof this._password !== 'undefined') {
<mask> data.password = this._password;
<mask> }
<mask> return data;
<mask> }
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove if (typeof this._username !== 'undefined') {
data.username = this._username;
}
</s> add </s> remove if (typeof props.username === 'string') {
this._username = props.username.trim();
}
</s> add </s> add if (typeof props.name === 'string') {
this._name = props.name.trim();
} </s> add disabled: this._disabled, </s> remove data.whois_info = this._whois_info.map((p) => p.serialize());
</s> add data.whois_info = this._whois_info.serialize(); </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> };
<mask> if (typeof this._password !== 'undefined') {
<mask> data.password = this._password;
<mask> }
<mask> if (typeof this._username !== 'undefined') {
<mask> data.username = this._username;
<mask> }
<mask> return data;
<mask> }
<mask>
<mask> validate(): string[] {
<mask> const validate = {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> remove data.whois_info = this._whois_info.map((p) => p.serialize());
</s> add data.whois_info = this._whois_info.serialize(); </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} </s> add disabled: this._disabled, </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> validate(): string[] {
<mask> const validate = {
<mask> username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
<mask> password: !this._password ? true : typeof this._password === 'string' && !this._password ? true : this._password,
<mask> };
<mask> const isError: string[] = [];
<mask> Object.keys(validate).forEach((key) => {
<mask> if (!(validate as any)[key]) {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> add disabled: typeof this._disabled === 'boolean', </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove whois_info: !this._whois_info ? true : this._whois_info.reduce((result, p) => result && p.validate().length === 0, true),
</s> add whois_info: !this._whois_info ? true : this._whois_info.validate().length === 0, </s> add client_id: !this._client_id ? true : typeof this._client_id === 'string' && !this._client_id ? true : this._client_id, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Login.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> export default class NetInterface {
<mask> readonly _flags: string;
<mask>
<mask> /**
<mask> * Description: undefined
<mask> * Example: up|broadcast|multicast
<mask> */
<mask> get flags(): string {
<mask> return this._flags;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove * Description: undefined
</s> add * Description: The client's IP address.
* </s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; </s> remove * Description: yes|no|error
</s> add * Description: The result of determining static IP address.
* </s> remove * Description: Time units (hours | days)
</s> add * Description: Time units </s> remove * Description: yes|no|error
</s> add * Description: The result of searching the other DHCP server.
* </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
| https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/NetInterface.ts |
keep keep add keep keep keep keep keep | <mask> answer?: IDnsAnswer[];
<mask> answer_dnssec?: boolean;
<mask> client?: string;
<mask> client_proto?: any;
<mask> elapsedMs?: string;
<mask> filterId?: number;
<mask> original_answer?: IDnsAnswer[];
<mask> question?: IDnsQuestion;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove rulesCount: number;
</s> add rules_count: number; </s> remove querylog_enabled: boolean;
</s> add </s> add http_port: number; </s> remove lastUpdated: string;
</s> add last_updated: string; </s> remove dns_address: string;
</s> add dns_addresses: string[]; </s> add disabled: boolean; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/QueryLogItem.ts |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> readonly _client: string | undefined;
<mask>
<mask> /**
<mask> * Description: undefined
<mask> * Example: 192.168.0.1
<mask> */
<mask> get client(): string | undefined {
<mask> return this._client;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add readonly _client_id: string | undefined;
/**
* Description: The client ID, if provided in DOH, DOQ, or DOT.
*
* Example: cli123
*/
get clientId(): string | undefined {
return this._client_id;
}
</s> remove * Description: Time units (hours | days)
</s> add * Description: Time units </s> remove * Description: yes|no|error
</s> add * Description: The result of determining static IP address.
* </s> remove * Description: yes|no|error
</s> add * Description: The result of searching the other DHCP server.
* </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/QueryLogItem.ts |
keep keep keep add keep keep keep keep keep | <mask> get client(): string | undefined {
<mask> return this._client;
<mask> }
<mask>
<mask> readonly _client_proto: any | undefined;
<mask>
<mask> get clientProto(): any | undefined {
<mask> return this._client_proto;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove * Description: undefined
</s> add * Description: The client's IP address.
* </s> remove readonly _username: string | undefined;
</s> add readonly _password: string | undefined; </s> remove get password(): string | undefined {
return this._password;
</s> add get name(): string | undefined {
return this._name; </s> remove readonly _whois_info: WhoisInfo[] | undefined;
</s> add readonly _whois_info: WhoisInfo | undefined; </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; </s> remove readonly _password: string | undefined;
</s> add readonly _name: string | undefined; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/QueryLogItem.ts |
keep keep add keep keep keep keep | <mask> if (typeof props.client === 'string') {
<mask> this._client = props.client.trim();
<mask> }
<mask> if (props.client_proto) {
<mask> this._client_proto = props.client_proto;
<mask> }
<mask> if (typeof props.elapsedMs === 'string') {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add if (typeof props.name === 'string') {
this._name = props.name.trim();
} </s> remove if (typeof props.username === 'string') {
this._username = props.username.trim();
}
</s> add </s> add this._disabled = props.disabled; </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove readonly _key: string | undefined;
get key(): string | undefined {
return this._key;
}
</s> add readonly data: Record<string, string>; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/QueryLogItem.ts |
keep keep keep add keep keep keep keep keep keep | <mask> }
<mask> if (typeof this._client !== 'undefined') {
<mask> data.client = this._client;
<mask> }
<mask> if (typeof this._client_proto !== 'undefined') {
<mask> data.client_proto = this._client_proto;
<mask> }
<mask> if (typeof this._elapsedMs !== 'undefined') {
<mask> data.elapsedMs = this._elapsedMs;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove if (typeof this._username !== 'undefined') {
data.username = this._username;
}
</s> add </s> remove data.whois_info = this._whois_info.map((p) => p.serialize());
</s> add data.whois_info = this._whois_info.serialize(); </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> add disabled: this._disabled, </s> add if (typeof props.client_id === 'string') {
this._client_id = props.client_id.trim();
} </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/QueryLogItem.ts |
keep add keep keep keep keep keep | <mask> answer_dnssec: !this._answer_dnssec ? true : typeof this._answer_dnssec === 'boolean',
<mask> client: !this._client ? true : typeof this._client === 'string' && !this._client ? true : this._client,
<mask> elapsedMs: !this._elapsedMs ? true : typeof this._elapsedMs === 'string' && !this._elapsedMs ? true : this._elapsedMs,
<mask> question: !this._question ? true : this._question.validate().length === 0,
<mask> filterId: !this._filterId ? true : typeof this._filterId === 'number',
<mask> rule: !this._rule ? true : typeof this._rule === 'string' && !this._rule ? true : this._rule,
<mask> rules: !this._rules ? true : this._rules.reduce((result, p) => result && p.validate().length === 0, true),
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove whois_info: !this._whois_info ? true : this._whois_info.reduce((result, p) => result && p.validate().length === 0, true),
</s> add whois_info: !this._whois_info ? true : this._whois_info.validate().length === 0, </s> add disabled: typeof this._disabled === 'boolean', </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/QueryLogItem.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export interface IServerStatus {
<mask> dhcp_available?: boolean;
<mask> dns_address: string;
<mask> dns_port: number;
<mask> language: string;
<mask> protection_enabled: boolean;
<mask> querylog_enabled: boolean;
<mask> running: boolean;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add http_port: number; </s> remove username?: string;
</s> add </s> add [key: string]: string; </s> remove key?: string;
</s> add [key: string]: string; </s> remove querylog_enabled: boolean;
</s> add </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep add keep keep keep keep keep | <mask> export interface IServerStatus {
<mask> dhcp_available?: boolean;
<mask> dns_addresses: string[];
<mask> dns_port: number;
<mask> language: string;
<mask> protection_enabled: boolean;
<mask> running: boolean;
<mask> version: string;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove dns_address: string;
</s> add dns_addresses: string[]; </s> remove querylog_enabled: boolean;
</s> add </s> remove rulesCount: number;
</s> add rules_count: number; </s> add http_port: this._http_port, </s> remove lastUpdated: string;
</s> add last_updated: string; </s> remove dns_address: this._dns_address,
</s> add dns_addresses: this._dns_addresses, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> dns_address: string;
<mask> dns_port: number;
<mask> language: string;
<mask> protection_enabled: boolean;
<mask> querylog_enabled: boolean;
<mask> running: boolean;
<mask> version: string;
<mask> }
<mask>
<mask> export default class ServerStatus {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add http_port: number; </s> remove dns_address: string;
</s> add dns_addresses: string[]; </s> remove rulesCount: number;
</s> add rules_count: number; </s> add disabled: boolean; </s> remove lastUpdated: string;
</s> add last_updated: string; </s> remove querylog_enabled: this._querylog_enabled,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> get dhcpAvailable(): boolean | undefined {
<mask> return this._dhcp_available;
<mask> }
<mask>
<mask> readonly _dns_address: string;
<mask>
<mask> /**
<mask> * Description: undefined
<mask> * Example: 127.0.0.1
<mask> */
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove get dnsAddress(): string {
return this._dns_address;
</s> add get dnsAddresses(): string[] {
return this._dns_addresses; </s> remove * Description: undefined
</s> add * Description: The client's IP address.
* </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _lastUpdated: string;
</s> add readonly _last_updated: string; </s> remove * Description: Time units (hours | days)
</s> add * Description: Time units </s> remove * Description: yes|no|error
</s> add * Description: The result of determining static IP address.
* | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace replace keep keep replace replace keep keep keep keep | <mask> /**
<mask> * Description: undefined
<mask> * Example: 127.0.0.1
<mask> */
<mask> get dnsAddress(): string {
<mask> return this._dns_address;
<mask> }
<mask>
<mask> static dnsAddressValidate(dnsAddress: string): boolean {
<mask> return typeof dnsAddress === 'string' && !!dnsAddress.trim();
<mask> }
<mask>
<mask> readonly _dns_port: number;
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove readonly _rulesCount: number;
</s> add readonly _rules_count: number; </s> remove return this._lastUpdated;
</s> add return this._last_updated; </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; </s> remove readonly _lastUpdated: string;
</s> add readonly _last_updated: string; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> static protectionEnabledValidate(protectionEnabled: boolean): boolean {
<mask> return typeof protectionEnabled === 'boolean';
<mask> }
<mask>
<mask> readonly _querylog_enabled: boolean;
<mask>
<mask> get querylogEnabled(): boolean {
<mask> return this._querylog_enabled;
<mask> }
<mask>
<mask> static querylogEnabledValidate(querylogEnabled: boolean): boolean {
<mask> return typeof querylogEnabled === 'boolean';
<mask> }
<mask>
<mask> readonly _running: boolean;
<mask>
<mask> get running(): boolean {
<mask> return this._running;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove static dnsAddressValidate(dnsAddress: string): boolean {
return typeof dnsAddress === 'string' && !!dnsAddress.trim();
</s> add static dnsAddressesValidate(dnsAddresses: string[]): boolean {
return dnsAddresses.reduce<boolean>((result, p) => result && (typeof p === 'string' && !!p.trim()), true); </s> remove readonly _interfaces: { [key: string]: NetInterface };
</s> add readonly _interfaces: NetInterfaces; </s> remove return this._rulesCount;
</s> add return this._rules_count; </s> remove get dnsAddress(): string {
return this._dns_address;
</s> add get dnsAddresses(): string[] {
return this._dns_addresses; </s> remove return this._lastUpdated;
</s> add return this._last_updated; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> constructor(props: IServerStatus) {
<mask> if (typeof props.dhcp_available === 'boolean') {
<mask> this._dhcp_available = props.dhcp_available;
<mask> }
<mask> this._dns_address = props.dns_address.trim();
<mask> this._dns_port = props.dns_port;
<mask> this._language = props.language.trim();
<mask> this._protection_enabled = props.protection_enabled;
<mask> this._querylog_enabled = props.querylog_enabled;
<mask> this._running = props.running;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove this._querylog_enabled = props.querylog_enabled;
</s> add </s> add this._http_port = props.http_port; </s> add this._disabled = props.disabled; </s> remove this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
return { ...prev, [key]: new NetInterface(props.interfaces[key])};
},{})
</s> add this._interfaces = new NetInterfaces(props.interfaces); </s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); </s> remove dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
</s> add dns_addresses: this._dns_addresses.reduce((result, p) => result && typeof p === 'string', true), | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep add keep keep keep keep keep | <mask> this._dhcp_available = props.dhcp_available;
<mask> }
<mask> this._dns_addresses = props.dns_addresses;
<mask> this._dns_port = props.dns_port;
<mask> this._language = props.language.trim();
<mask> this._protection_enabled = props.protection_enabled;
<mask> this._running = props.running;
<mask> this._version = props.version.trim();
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove this._dns_address = props.dns_address.trim();
</s> add this._dns_addresses = props.dns_addresses; </s> remove this._querylog_enabled = props.querylog_enabled;
</s> add </s> remove this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
return { ...prev, [key]: new NetInterface(props.interfaces[key])};
},{})
</s> add this._interfaces = new NetInterfaces(props.interfaces); </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> add http_port: this._http_port >= 1 && this._http_port <= 65535, </s> remove this.intl = this.intl.updateTranslator(lang);
</s> add this.intl = translate.createReactTranslator<any>(i18n(this.currentLang), React);
};
toggleSidebar = () => {
this.sidebarOpen = !this.sidebarOpen; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> this._dns_address = props.dns_address.trim();
<mask> this._dns_port = props.dns_port;
<mask> this._language = props.language.trim();
<mask> this._protection_enabled = props.protection_enabled;
<mask> this._querylog_enabled = props.querylog_enabled;
<mask> this._running = props.running;
<mask> this._version = props.version.trim();
<mask> }
<mask>
<mask> serialize(): IServerStatus {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove this._dns_address = props.dns_address.trim();
</s> add this._dns_addresses = props.dns_addresses; </s> add this._http_port = props.http_port; </s> remove this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
return { ...prev, [key]: new NetInterface(props.interfaces[key])};
},{})
</s> add this._interfaces = new NetInterfaces(props.interfaces); </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> remove dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
</s> add dns_addresses: this._dns_addresses.reduce((result, p) => result && typeof p === 'string', true), </s> remove this._rulesCount = props.rulesCount;
</s> add this._rules_count = props.rules_count; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> serialize(): IServerStatus {
<mask> const data: IServerStatus = {
<mask> dns_address: this._dns_address,
<mask> dns_port: this._dns_port,
<mask> language: this._language,
<mask> protection_enabled: this._protection_enabled,
<mask> querylog_enabled: this._querylog_enabled,
<mask> running: this._running,
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove querylog_enabled: this._querylog_enabled,
</s> add </s> add http_port: this._http_port, </s> remove dns_address: string;
</s> add dns_addresses: string[]; </s> add http_port: number; </s> remove querylog_enabled: boolean;
</s> add </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep add keep keep keep keep | <mask> const data: IServerStatus = {
<mask> dns_addresses: this._dns_addresses,
<mask> dns_port: this._dns_port,
<mask> language: this._language,
<mask> protection_enabled: this._protection_enabled,
<mask> running: this._running,
<mask> version: this._version,
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove dns_address: this._dns_address,
</s> add dns_addresses: this._dns_addresses, </s> remove querylog_enabled: this._querylog_enabled,
</s> add </s> add http_port: number; </s> remove querylog_enabled: boolean;
</s> add </s> remove dns_address: string;
</s> add dns_addresses: string[]; </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> dns_address: this._dns_address,
<mask> dns_port: this._dns_port,
<mask> language: this._language,
<mask> protection_enabled: this._protection_enabled,
<mask> querylog_enabled: this._querylog_enabled,
<mask> running: this._running,
<mask> version: this._version,
<mask> };
<mask> if (typeof this._dhcp_available !== 'undefined') {
<mask> data.dhcp_available = this._dhcp_available;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove dns_address: this._dns_address,
</s> add dns_addresses: this._dns_addresses, </s> add http_port: this._http_port, </s> remove querylog_enabled: boolean;
</s> add </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} </s> add http_port: number; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> validate(): string[] {
<mask> const validate = {
<mask> dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
<mask> dns_port: this._dns_port >= 1 && this._dns_port <= 65535,
<mask> protection_enabled: typeof this._protection_enabled === 'boolean',
<mask> dhcp_available: !this._dhcp_available ? true : typeof this._dhcp_available === 'boolean',
<mask> querylog_enabled: typeof this._querylog_enabled === 'boolean',
<mask> running: typeof this._running === 'boolean',
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> add http_port: this._http_port >= 1 && this._http_port <= 65535, </s> add disabled: typeof this._disabled === 'boolean', </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> remove whois_info: !this._whois_info ? true : this._whois_info.reduce((result, p) => result && p.validate().length === 0, true),
</s> add whois_info: !this._whois_info ? true : this._whois_info.validate().length === 0, </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep add keep keep keep keep | <mask> validate(): string[] {
<mask> const validate = {
<mask> dns_addresses: this._dns_addresses.reduce((result, p) => result && typeof p === 'string', true),
<mask> dns_port: this._dns_port >= 1 && this._dns_port <= 65535,
<mask> protection_enabled: typeof this._protection_enabled === 'boolean',
<mask> dhcp_available: !this._dhcp_available ? true : typeof this._dhcp_available === 'boolean',
<mask> running: typeof this._running === 'boolean',
<mask> version: typeof this._version === 'string' && !this._version ? true : this._version,
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
</s> add dns_addresses: this._dns_addresses.reduce((result, p) => result && typeof p === 'string', true), </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> remove whois_info: !this._whois_info ? true : this._whois_info.reduce((result, p) => result && p.validate().length === 0, true),
</s> add whois_info: !this._whois_info ? true : this._whois_info.validate().length === 0, </s> add disabled: typeof this._disabled === 'boolean', </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> add client_id: !this._client_id ? true : typeof this._client_id === 'string' && !this._client_id ? true : this._client_id, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
<mask> dns_port: this._dns_port >= 1 && this._dns_port <= 65535,
<mask> protection_enabled: typeof this._protection_enabled === 'boolean',
<mask> dhcp_available: !this._dhcp_available ? true : typeof this._dhcp_available === 'boolean',
<mask> querylog_enabled: typeof this._querylog_enabled === 'boolean',
<mask> running: typeof this._running === 'boolean',
<mask> version: typeof this._version === 'string' && !this._version ? true : this._version,
<mask> language: typeof this._language === 'string' && !this._language ? true : this._language,
<mask> };
<mask> const isError: string[] = [];
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
</s> add dns_addresses: this._dns_addresses.reduce((result, p) => result && typeof p === 'string', true), </s> add http_port: this._http_port >= 1 && this._http_port <= 65535, </s> add disabled: typeof this._disabled === 'boolean', </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> remove whois_info: !this._whois_info ? true : this._whois_info.reduce((result, p) => result && p.validate().length === 0, true),
</s> add whois_info: !this._whois_info ? true : this._whois_info.validate().length === 0, </s> add client_id: !this._client_id ? true : typeof this._client_id === 'string' && !this._client_id ? true : this._client_id, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ServerStatus.ts |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> readonly _time_units: string | undefined;
<mask>
<mask> /**
<mask> * Description: Time units (hours | days)
<mask> * Example: hours
<mask> */
<mask> get timeUnits(): string | undefined {
<mask> return this._time_units;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove * Description: undefined
</s> add * Description: The client's IP address.
* </s> remove * Description: yes|no|error
</s> add * Description: The result of determining static IP address.
* </s> remove * Description: yes|no|error
</s> add * Description: The result of searching the other DHCP server.
* </s> add readonly _client_id: string | undefined;
/**
* Description: The client ID, if provided in DOH, DOQ, or DOT.
*
* Example: cli123
*/
get clientId(): string | undefined {
return this._client_id;
}
</s> add readonly _disabled: boolean;
/** */
get disabled(): boolean {
return this._disabled;
}
static disabledValidate(disabled: boolean): boolean {
return typeof disabled === 'boolean';
}
</s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/Stats.ts |
keep keep keep add keep keep keep keep keep | <mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export interface ITopArrayEntry {
<mask> domain_or_ip?: number;
<mask> }
<mask>
<mask> export default class TopArrayEntry {
<mask> readonly _domain_or_ip: number | undefined;
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove username?: string;
</s> add </s> remove key?: string;
</s> add [key: string]: string; </s> add [key: string]: string; </s> add [key: string]: IClientFindSubEntry; </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/TopArrayEntry.ts |
keep add keep keep keep keep keep keep | <mask> }
<mask>
<mask> constructor(props: ITopArrayEntry) {
<mask> this.numberData = Object.entries(props).reduce<Record<string, number>>((prev, [key, value]) => {
<mask> prev[key] = value!;
<mask> return prev;
<mask> }, {})
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove if (typeof props.domain_or_ip === 'number') {
this._domain_or_ip = props.domain_or_ip;
}
</s> add this.numberData = Object.entries(props).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> add this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {}) </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> add readonly data: Record<string, ClientFindSubEntry>;
</s> add readonly data: Record<string, string>;
| https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/TopArrayEntry.ts |
keep keep replace replace replace keep keep keep replace replace replace replace replace replace | <mask>
<mask> constructor(props: ITopArrayEntry) {
<mask> if (typeof props.domain_or_ip === 'number') {
<mask> this._domain_or_ip = props.domain_or_ip;
<mask> }
<mask> }
<mask>
<mask> serialize(): ITopArrayEntry {
<mask> const data: ITopArrayEntry = {
<mask> };
<mask> if (typeof this._domain_or_ip !== 'undefined') {
<mask> data.domain_or_ip = this._domain_or_ip;
<mask> }
<mask> return data;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> remove if (typeof this._username !== 'undefined') {
data.username = this._username;
}
</s> add </s> add disabled: this._disabled, </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} </s> remove data.whois_info = this._whois_info.map((p) => p.serialize());
</s> add data.whois_info = this._whois_info.serialize(); | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/TopArrayEntry.ts |
keep keep add keep keep keep keep keep | <mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export interface IUpstreamsConfigResponse {
<mask> }
<mask>
<mask> export default class UpstreamsConfigResponse {
<mask> readonly data: Record<string, string>;
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add [key: string]: IClientFindSubEntry; </s> remove username?: string;
</s> add </s> remove key?: string;
</s> add [key: string]: string; </s> add [key: string]: number | undefined; </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/UpstreamsConfigResponse.ts |
keep add keep keep keep keep | <mask>
<mask> export default class UpstreamsConfigResponse {
<mask> constructor(props: IUpstreamsConfigResponse) {
<mask> this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
<mask> prev[key] = value!;
<mask> return prev;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> add readonly data: Record<string, ClientFindSubEntry>;
</s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> add this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {}) </s> add readonly numberData: Record<string, number>;
</s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/UpstreamsConfigResponse.ts |
keep keep add keep keep keep keep keep | <mask> readonly data: Record<string, string>;
<mask>
<mask> constructor(props: IUpstreamsConfigResponse) {
<mask> }
<mask>
<mask> serialize(): IUpstreamsConfigResponse {
<mask> return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
<mask> prev[key] = value;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> add readonly data: Record<string, string>;
</s> add this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> add readonly data: Record<string, ClientFindSubEntry>;
| https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/UpstreamsConfigResponse.ts |
keep keep keep replace replace replace keep keep keep replace replace replace replace replace replace replace replace replace keep | <mask> }
<mask>
<mask> serialize(): IUpstreamsConfigResponse {
<mask> const data: IUpstreamsConfigResponse = {
<mask> };
<mask> return data;
<mask> }
<mask>
<mask> validate(): string[] {
<mask> const validate = {
<mask> };
<mask> const isError: string[] = [];
<mask> Object.keys(validate).forEach((key) => {
<mask> if (!(validate as any)[key]) {
<mask> isError.push(key);
<mask> }
<mask> });
<mask> return isError;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> add interfaces: this._interfaces.validate().length === 0, </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/UpstreamsConfigResponse.ts |
keep keep keep keep replace keep keep keep | <mask> });
<mask> return isError;
<mask> }
<mask>
<mask> update(props: Partial<IUpstreamsConfigResponse>): UpstreamsConfigResponse {
<mask> return new UpstreamsConfigResponse({ ...this.serialize(), ...props });
<mask> }
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove update(props: Partial<IWhoisInfo>): WhoisInfo {
</s> add update(props: IWhoisInfo): WhoisInfo { </s> remove update(props: Partial<IClientsFindEntry>): ClientsFindEntry {
</s> add update(props: IClientsFindEntry): ClientsFindEntry { </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove type: `Partial<I${sName}>`,
</s> add type: additionalPropsOnly ? `I${sName}` : `Partial<I${sName}>`, | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/UpstreamsConfigResponse.ts |
keep add keep keep keep keep keep | <mask> announcement_url?: string;
<mask> can_autoupdate?: boolean;
<mask> new_version?: string;
<mask> }
<mask>
<mask> export default class VersionInfo {
<mask> readonly _announcement: string | undefined;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove readonly _password: string | undefined;
</s> add readonly _name: string | undefined; </s> add name?: string; </s> remove rulesCount: number;
</s> add rules_count: number; </s> remove querylog_enabled: boolean;
</s> add </s> remove readonly _key: string | undefined;
get key(): string | undefined {
return this._key;
}
</s> add readonly data: Record<string, string>; </s> remove username?: string;
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/VersionInfo.ts |
keep add keep keep keep keep keep keep | <mask> }
<mask>
<mask> readonly _new_version: string | undefined;
<mask>
<mask> /**
<mask> * Description: undefined
<mask> * Example: v0.9
<mask> */
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove * Description: undefined
</s> add * Description: The client's IP address.
* </s> remove * Description: Time units (hours | days)
</s> add * Description: Time units </s> remove * Description: yes|no|error
</s> add * Description: The result of determining static IP address.
* </s> remove * Description: yes|no|error
</s> add * Description: The result of searching the other DHCP server.
* </s> add readonly _client_id: string | undefined;
/**
* Description: The client ID, if provided in DOH, DOQ, or DOT.
*
* Example: cli123
*/
get clientId(): string | undefined {
return this._client_id;
}
</s> remove readonly _dns_address: string;
</s> add readonly _dns_addresses: string[]; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/VersionInfo.ts |
keep keep keep add keep keep keep keep | <mask> }
<mask> if (typeof props.can_autoupdate === 'boolean') {
<mask> this._can_autoupdate = props.can_autoupdate;
<mask> }
<mask> if (typeof props.new_version === 'string') {
<mask> this._new_version = props.new_version.trim();
<mask> }
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add if (typeof props.client_id === 'string') {
this._client_id = props.client_id.trim();
} </s> add if (typeof props.name === 'string') {
this._name = props.name.trim();
} </s> remove if (typeof props.username === 'string') {
this._username = props.username.trim();
}
</s> add </s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/VersionInfo.ts |
keep keep add keep keep keep keep keep keep | <mask>
<mask> serialize(): IVersionInfo {
<mask> const data: IVersionInfo = {
<mask> };
<mask> if (typeof this._announcement !== 'undefined') {
<mask> data.announcement = this._announcement;
<mask> }
<mask> if (typeof this._announcement_url !== 'undefined') {
<mask> data.announcement_url = this._announcement_url;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} </s> remove if (typeof this._username !== 'undefined') {
data.username = this._username;
}
</s> add </s> remove data.whois_info = this._whois_info.map((p) => p.serialize());
</s> add data.whois_info = this._whois_info.serialize(); </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/VersionInfo.ts |
keep add keep keep keep keep | <mask> validate(): string[] {
<mask> const validate = {
<mask> new_version: !this._new_version ? true : typeof this._new_version === 'string' && !this._new_version ? true : this._new_version,
<mask> announcement: !this._announcement ? true : typeof this._announcement === 'string' && !this._announcement ? true : this._announcement,
<mask> announcement_url: !this._announcement_url ? true : typeof this._announcement_url === 'string' && !this._announcement_url ? true : this._announcement_url,
<mask> can_autoupdate: !this._can_autoupdate ? true : typeof this._can_autoupdate === 'boolean',
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add client_id: !this._client_id ? true : typeof this._client_id === 'string' && !this._client_id ? true : this._client_id, </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> remove whois_info: !this._whois_info ? true : this._whois_info.reduce((result, p) => result && p.validate().length === 0, true),
</s> add whois_info: !this._whois_info ? true : this._whois_info.validate().length === 0, </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/VersionInfo.ts |
keep keep keep replace keep keep keep replace replace replace replace replace keep keep keep | <mask> // This file was autogenerated. Please do not change.
<mask> // All changes will be overwrited on commit.
<mask> export interface IWhoisInfo {
<mask> key?: string;
<mask> }
<mask>
<mask> export default class WhoisInfo {
<mask> readonly _key: string | undefined;
<mask>
<mask> get key(): string | undefined {
<mask> return this._key;
<mask> }
<mask>
<mask> constructor(props: IWhoisInfo) {
<mask> if (typeof props.key === 'string') {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove username?: string;
</s> add </s> add [key: string]: number | undefined; </s> add [key: string]: string; </s> add [key: string]: IClientFindSubEntry; </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/WhoisInfo.ts |
keep keep keep keep replace replace replace keep keep keep replace replace replace replace replace replace keep keep | <mask> return this._key;
<mask> }
<mask>
<mask> constructor(props: IWhoisInfo) {
<mask> if (typeof props.key === 'string') {
<mask> this._key = props.key.trim();
<mask> }
<mask> }
<mask>
<mask> serialize(): IWhoisInfo {
<mask> const data: IWhoisInfo = {
<mask> };
<mask> if (typeof this._key !== 'undefined') {
<mask> data.key = this._key;
<mask> }
<mask> return data;
<mask> }
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove readonly _key: string | undefined;
get key(): string | undefined {
return this._key;
}
</s> add readonly data: Record<string, string>; </s> add if (typeof this._name !== 'undefined') {
data.name = this._name;
} </s> remove if (typeof props.username === 'string') {
this._username = props.username.trim();
}
</s> add </s> remove if (typeof this._username !== 'undefined') {
data.username = this._username;
}
</s> add </s> add if (typeof this._client_id !== 'undefined') {
data.client_id = this._client_id;
} | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/WhoisInfo.ts |
keep replace replace replace replace replace replace replace replace replace replace keep keep replace keep | <mask> validate(): string[] {
<mask> const validate = {
<mask> key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
<mask> };
<mask> const isError: string[] = [];
<mask> Object.keys(validate).forEach((key) => {
<mask> if (!(validate as any)[key]) {
<mask> isError.push(key);
<mask> }
<mask> });
<mask> return isError;
<mask> }
<mask>
<mask> update(props: Partial<IWhoisInfo>): WhoisInfo {
<mask> return new WhoisInfo({ ...this.serialize(), ...props });
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/WhoisInfo.ts |
replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> .layout {
<mask> min-height: 100vh;
<mask> background-color: var(--gray100);
<mask>
<mask> @media (--m-viewport) {
<mask> background-image: url('../../assets/img/install.png');
<mask> background-position: center 20px;
<mask> background-repeat: no-repeat;
<mask> background-size: 100%;
<mask> }
<mask> }
<mask>
<mask> .container {
<mask> width: 100%;
<mask> max-width: 432px;
<mask> margin: 0 auto;
<mask> padding: 24px 16px 40px;
<mask>
<mask> @media (--m-viewport) {
<mask> padding: 40px 16px;
<mask> }
<mask> }
<mask>
<mask> .title,
<mask> .subtitle,
<mask> .text {
<mask> color: var(--gray900);
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add .code {
padding: 3px 5px;
font-size: 14px;
font-family: var(--font-family-monospace);
background-color: var(--gray300);
border-radius: 2px;
}
</s> add &.gray {
color: var(--gray900);
&:hover,
&:focus {
color: var(--gray700);
}
&:active {
color: var(--gray700);
}
} </s> remove font-size: 14px;
</s> add font-size: 16px; </s> add ::selection {
background: var(--text-selection);
color: var(--black);
}
</s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/theme/Install.module.pcss |
keep keep add keep | <mask> &:active {
<mask> color: var(--green400);
<mask> }
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add ::selection {
background: var(--text-selection);
color: var(--black);
}
</s> add .code {
padding: 3px 5px;
font-size: 14px;
font-family: var(--font-family-monospace);
background-color: var(--gray300);
border-radius: 2px;
}
</s> remove .layout {
min-height: 100vh;
background-color: var(--gray100);
@media (--m-viewport) {
background-image: url('../../assets/img/install.png');
background-position: center 20px;
background-repeat: no-repeat;
background-size: 100%;
}
}
.container {
width: 100%;
max-width: 432px;
margin: 0 auto;
padding: 24px 16px 40px;
@media (--m-viewport) {
padding: 40px 16px;
}
}
</s> add </s> remove font-size: 14px;
</s> add font-size: 16px; </s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/theme/Link.module.pcss |
keep keep keep add keep keep keep keep keep keep | <mask> .regular {
<mask> font-weight: 400;
<mask> }
<mask>
<mask> .danger {
<mask> text-transform: uppercase;
<mask> color: var(--red400);
<mask> font-weight: bold;
<mask> }
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add &.gray {
color: var(--gray900);
&:hover,
&:focus {
color: var(--gray700);
}
&:active {
color: var(--gray700);
}
} </s> add ::selection {
background: var(--text-selection);
color: var(--black);
}
</s> remove .layout {
min-height: 100vh;
background-color: var(--gray100);
@media (--m-viewport) {
background-image: url('../../assets/img/install.png');
background-position: center 20px;
background-repeat: no-repeat;
background-size: 100%;
}
}
.container {
width: 100%;
max-width: 432px;
margin: 0 auto;
padding: 24px 16px 40px;
@media (--m-viewport) {
padding: 40px 16px;
}
}
</s> add </s> remove font-size: 14px;
</s> add font-size: 16px; </s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/theme/Text.module.pcss |
keep add keep keep keep keep keep | <mask> import install from './Install.module.pcss';
<mask> import link from './Link.module.pcss';
<mask>
<mask> const theme = {
<mask> form,
<mask> chartColors: colors,
<mask> text,
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add chartColors: colors, </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> add import { DHCP_LINK } from 'Consts/common';
import { danger, externalLink, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install'; </s> remove import { TYPES, toCamel, schemaParamParser } from './utils';
</s> add import { TYPES, toCamel, schemaParamParser, uncapitalize } from './utils'; </s> add import cn from 'classnames'; </s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/theme/index.ts |
keep add keep keep keep keep keep | <mask> const theme = {
<mask> form,
<mask> text,
<mask> install,
<mask> link,
<mask> content,
<mask> };
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add content, </s> add import content from './Content.module.pcss';
import { colors } from './colors'; </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> add const uncapitalize = (s: string) => {
return s[0].toLowerCase() + s.slice(1);
}; </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/theme/index.ts |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.