docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
"copyright": "Copyright",
"homepage": "Pagina iniziale", | <mask> "on": "ATTIVO",
<mask> "off": "DISATTIVATO",
<mask> "report_an_issue": "Segnala un problema",
<mask> "privacy_policy": "Politica sulla privacy",
<mask> "enable_protection": "Abilita protezione",
<mask> "enabled_protection": "Protezione abilitata",
</s> + client: add link to the new article about hosts blocklists syntax </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de <0> opgegeven reguliere expressie </0>",
</s> add "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ea7bb0ae62c5da09414f926ed3cf1b4522fe85a | client/src/__locales/it.json |
"blocked_by": "Bloccato dai Filtri", | <mask> "disabled_protection": "Protezione disabilitata",
<mask> "refresh_statics": "Aggiorna statistiche",
<mask> "dns_query": "Query DNS",
<mask> "stats_malware_phishing": "Malware/phishing bloccati",
<mask> "stats_adult": "Siti per adulti bloccati",
<mask> "stats_query_domain": "Domini maggiormente richiesti",
<mask> "for_last_24_hours": "nelle ultime 24 ore",
<mask> "for_last_days": "per gli ultimi {{value}} giorni",
</s> + client: add link to the new article about hosts blocklists syntax </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de <0> opgegeven reguliere expressie </0>",
</s> add "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ea7bb0ae62c5da09414f926ed3cf1b4522fe85a | client/src/__locales/it.json |
"client_table_header": "Client", | <mask> "type_table_header": "Tipo",
<mask> "response_table_header": "Risposta",
<mask> "empty_response_status": "Vuoto",
<mask> "show_all_filter_type": "Mostra tutti",
<mask> "show_filtered_type": "Mostra filtrati",
<mask> "no_logs_found": "Nessun log trovato",
<mask> "refresh_btn": "Aggiorna",
</s> + client: add link to the new article about hosts blocklists syntax </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de <0> opgegeven reguliere expressie </0>",
</s> add "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ea7bb0ae62c5da09414f926ed3cf1b4522fe85a | client/src/__locales/it.json |
"query_log_response_status": "Status: {{value}}", | <mask> "rows_table_footer_text": "righe",
<mask> "updated_custom_filtering_toast": "Le regole dei filtri personalizzate sono state aggiornate",
<mask> "rule_removed_from_custom_filtering_toast": "Regola rimossa dalle regole dei filtri personalizzate",
<mask> "rule_added_to_custom_filtering_toast": "Regola aggiunta alle regole dei filtri personalizzate",
<mask> "source_label": "Fonte",
<mask> "found_in_known_domain_db": "Trovato nel database dei domini conosciuti.",
<mask> "category_label": "Categoria",
<mask> "rule_label": "Regola",
<mask> "filter_label": "Filtro",
<mask> "unknown_filter": "Filtro sconosciuto {{filterId}}",
</s> + client: add link to the new article about hosts blocklists syntax </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de <0> opgegeven reguliere expressie </0>",
</s> add "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ea7bb0ae62c5da09414f926ed3cf1b4522fe85a | client/src/__locales/it.json |
"table_client": "Client", | <mask> "settings_global": "Globale",
<mask> "settings_custom": "Personalizzato",
<mask> "table_name": "Nome",
<mask> "save_btn": "Salva",
<mask> "client_add": "Aggiungi Client",
<mask> "client_new": "Nuovo Client",
<mask> "client_edit": "Modifica Client",
<mask> "client_identifier": "Identificatore",
</s> + client: add link to the new article about hosts blocklists syntax </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de <0> opgegeven reguliere expressie </0>",
</s> add "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ea7bb0ae62c5da09414f926ed3cf1b4522fe85a | client/src/__locales/it.json |
"client_deleted": "Client \"{{key}}\" eliminato correttamente",
"client_added": "Client \"{{key}}\" aggiunto correttamente",
"client_updated": "Client \"{{key}}\" aggiornato correttamente", | <mask> "form_enter_ip": "Inserisci IP",
<mask> "form_enter_mac": "Inserisci MAC",
<mask> "form_client_name": "Inserisci nome client",
<mask> "client_global_settings": "Usa le impostazioni globali",
<mask> "clients_not_found": "Nessun client trovato",
<mask> "client_confirm_delete": "Sei sicuro di voler eliminare il client \"{{key}}\"?",
<mask> "filter_confirm_delete": "Sei sicuro di voler cancellare questo filtro?",
<mask> "auto_clients_title": "Clienti (tempo di esecuzione)",
<mask> "auto_clients_desc": "Dati dei clienti che utilizzano AdGuard Home, ma che non sono salvati nella configurazione",
<mask> "access_title": "Impostazioni di accesso",
</s> + client: add link to the new article about hosts blocklists syntax | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ea7bb0ae62c5da09414f926ed3cf1b4522fe85a | client/src/__locales/it.json |
"client_confirm_delete": "Sei sicuro di voler eliminare il client \"{{key}}\"?", | <mask> "client_added": "Client \"{{key}}\" aggiunto correttamente",
<mask> "client_updated": "Client \"{{key}}\" aggiornato correttamente",
<mask> "clients_not_found": "Nessun client trovato",
<mask> "filter_confirm_delete": "Sei sicuro di voler cancellare questo filtro?",
<mask> "auto_clients_title": "Clienti (tempo di esecuzione)",
<mask> "auto_clients_desc": "Dati dei clienti che utilizzano AdGuard Home, ma che non sono salvati nella configurazione",
<mask> "access_title": "Impostazioni di accesso",
<mask> "access_desc": "Qui puoi configurare le regole d'accesso per il server DNS di AdGuard Home.",
</s> + client: add link to the new article about hosts blocklists syntax </s> remove "example_regex_meaning": "blokir akses ke domain yang cocok dengan <0>ekspresi reguler yang ditentukan</0>",
</s> add "example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ea7bb0ae62c5da09414f926ed3cf1b4522fe85a | client/src/__locales/it.json |
"example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie", | <mask> "example_meaning_host_block": "AdGuard Home zal nu het adres 127.0.0.1 voor het domein example.org retourneren (maar niet de subdomeinen).",
<mask> "example_comment": "! Hier komt een opmerking",
<mask> "example_comment_meaning": "zomaar een opmerking",
<mask> "example_comment_hash": "# Nog een opmerking",
<mask> "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de <0> opgegeven reguliere expressie </0>",
<mask> "example_upstream_regular": "standaard DNS (over UDP)",
<mask> "example_upstream_dot": "versleutelde<a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
<mask> "example_upstream_doh": "versleutelde<a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
<mask> "example_upstream_sdns": "je kunt <a href='https://dnscrypt.info/stamps/' target='_blank'>DNS Stamps</a> voor <a href='https://dnscrypt.info/' target='_blank'>DNSCrypt</a> of <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a> resolvers",
<mask> "example_upstream_tcp": "standaard DNS (over TCP)",
</s> + client: add link to the new article about hosts blocklists syntax </s> remove "example_regex_meaning": "blokir akses ke domain yang cocok dengan <0>ekspresi reguler yang ditentukan</0>",
</s> add "example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan", </s> remove "example_regex_meaning": "block access to the domains matching the <0>specified regular expression</0>",
</s> add "example_regex_meaning": "block access to the domains matching the specified regular expression", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9ea7bb0ae62c5da09414f926ed3cf1b4522fe85a | client/src/__locales/nl.json |
import theme from 'Lib/theme'; | <mask> import { notifyError } from 'Common/ui';
<mask> import InstallStore from 'Store/stores/Install';
<mask>
<mask> import AdminInterface from './components/AdminInterface';
<mask> import Auth from './components/Auth';
<mask> import DnsServer from './components/DnsServer';
<mask> import Stepper from './components/Stepper';
<mask> import Welcome from './components/Welcome';
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import s from './Install.module.pcss';
</s> add </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; </s> remove import cn from 'classnames';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add </s> remove import s from './AdminInterface.module.pcss';
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/Install.tsx |
<mask> import Stepper from './components/Stepper';
<mask> import Welcome from './components/Welcome';
<mask> import ConfigureDevices from './components/ConfigureDevices';
<mask>
<mask> import s from './Install.module.pcss';
<mask>
<mask> const { Content } = Layout;
<mask>
<mask> export type FormValues = IInitialConfigurationBeta & { step: number };
<mask>
<mask> const InstallForm: FC = observer(() => {
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import theme from 'Lib/theme';
</s> add </s> remove import s from './ConfigureDevices.module.pcss';
</s> add </s> remove 'mainLogo' |
</s> add 'logo' | </s> remove import s from './AdminInterface.module.pcss';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/Install.tsx | |
<form noValidate onSubmit={handleSubmit}> | <mask> initialValues={initialValues}
<mask> onSubmit={onNext}
<mask> >
<mask> {({ values, handleSubmit, setFieldValue }) => (
<mask> <form noValidate className={s.content} onSubmit={handleSubmit}>
<mask> <Stepper currentStep={values.step} />
<mask> {values.step === 0 && (
<mask> <Welcome onNext={() => setFieldValue('step', 1)}/>
<mask> )}
<mask> {values.step === 1 && (
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <Steps progressDot current={currentStep} className={s.stepper}>
<Step/>
<Step/>
<Step/>
<Step/>
<Step/>
</Steps>
</s> add <div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> </s> remove <div className={theme.typography.subtext}>
</s> add <div className={s.desc}> </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove className={cn(s.button, s.inGroup)}
</s> add className={theme.install.button} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/Install.tsx |
<Layout className={theme.install.layout}>
<Content className={theme.install.container}> | <mask> });
<mask>
<mask> const Install: FC = () => {
<mask> return (
<mask> <Layout className={s.layout}>
<mask> <Content className={s.container}>
<mask> <InstallForm />
<mask> </Content>
<mask> <Icons/>
<mask> </Layout>
<mask> );
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove 'mainLogo' |
</s> add 'logo' | </s> remove <Steps progressDot current={currentStep} className={s.stepper}>
<Step/>
<Step/>
<Step/>
<Step/>
<Step/>
</Steps>
</s> add <div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> </s> remove </div>
</s> add </> </s> remove </div>
</s> add </> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/Install.tsx |
<mask> import { chechNetworkType, NETWORK_TYPE } from 'Helpers/installHelpers';
<mask> import theme from 'Lib/theme';
<mask> import Store from 'Store/installStore';
<mask>
<mask> import s from './AdminInterface.module.pcss';
<mask> import { FormValues } from '../../Install';
<mask> import StepButtons from '../StepButtons';
<mask>
<mask> enum NETWORK_OPTIONS {
<mask> ALL = 'all',
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import s from './DnsServer.module.pcss';
</s> add </s> remove import s from './ConfigureDevices.module.pcss';
</s> add </s> remove import s from './StepButtons.module.pcss';
</s> add </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx | |
<div className={theme.install.options}> | <mask> setFieldValue('web.ip', value);
<mask> };
<mask>
<mask> const getManualBlock = () => (
<mask> <div className={s.manualOptions}>
<mask> {addresses?.interfaces.map((a) => {
<mask> let name = '';
<mask> const type = chechNetworkType(a.name);
<mask> switch (type) {
<mask> case NETWORK_TYPE.ETHERNET:
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={s.manualOptions}>
</s> add <div className={theme.install.options}> </s> remove 'mainLogo' |
</s> add 'logo' | </s> remove import s from './Install.module.pcss';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
<div className={theme.install.name}>
{name} | <mask> break;
<mask> }
<mask> return (
<mask> <div key={a.name}>
<mask> <div>
<mask> <div className={s.name}>
<mask> {name}
<mask> </div>
<mask> {a.ipAddresses?.map((addrIp) => (
<mask> <div key={addrIp} className={s.manualOption}>
<mask> <div className={theme.typography.subtext}>
<mask> http://{addrIp}
<mask> </div>
<mask> <Switch
<mask> checked={values.web.ip.includes(addrIp)}
<mask> onChange={() => {
<mask> const temp = new Set(ip);
<mask> if (temp.has(addrIp)) {
<mask> temp.delete(addrIp);
<mask> } else {
<mask> temp.add(addrIp);
<mask> }
<mask> setFieldValue('web.ip', Array.from(temp.values()));
<mask> }}/>
<mask> </div>
<mask> ))}
<mask> </div>
<mask> </div>
<mask> );
<mask> })}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
<div className={s.name}>
{name}
</div>
{a.ipAddresses?.map((addrIp) => (
<div key={addrIp} className={s.manualOption}>
<div className={theme.typography.subtext}>
{addrIp}
</div>
<Switch
checked={values.dns.ip.includes(addrIp)}
onChange={() => {
const temp = new Set(ip);
if (temp.has(addrIp)) {
temp.delete(addrIp);
} else {
temp.add(addrIp);
}
setFieldValue('dns.ip', Array.from(temp.values()));
}}/>
</div>
))}
</s> add <div className={theme.install.name}>
{name} </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
<>
<div className={theme.install.title}> | <mask> </div>
<mask> );
<mask>
<mask> return (
<mask> <div className={s.content}>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_admin_interface_title')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_admin_interface_title_decs')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={theme.typography.title}>
</s> add <div className={theme.install.title}> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
<div className={cn(theme.install.text, theme.install.text_block)}> | <mask> <div className={s.content}>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_admin_interface_title')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_admin_interface_title_decs')}
<mask> </div>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_admin_interface_where_interface')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={s.content}>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
<div className={theme.install.subtitle}> | <mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_admin_interface_title_decs')}
<mask> </div>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_admin_interface_where_interface')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_admin_interface_where_interface_desc')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={s.content}>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> </div>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_admin_interface_where_interface')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_admin_interface_where_interface_desc')}
<mask> </div>
<mask> <Radio
<mask> value={radioValue}
<mask> onSelect={onSelectRadio}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
<div className={theme.install.subtitle}> | <mask> },
<mask> ]}
<mask> />
<mask> { radioValue !== NETWORK_OPTIONS.ALL && getManualBlock()}
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_admin_interface_port')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_admin_interface_port_desc')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> { radioValue !== NETWORK_OPTIONS.ALL && getManualBlock()}
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_admin_interface_port')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_admin_interface_port_desc')}
<mask> </div>
<mask> <Input
<mask> label={`${intl.getMessage('port')}:`}
<mask> placeholder={intl.getMessage('port')}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
</> | <mask> setFieldValue={setFieldValue}
<mask> currentStep={1}
<mask> values={values}
<mask> />
<mask> </div>
<mask> );
<mask> });
<mask>
<mask> export default AdminInterface;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove </div>
</s> add </> </s> remove </div>
</s> add </> </s> remove <Button
size="large"
type="primary"
className={s.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</s> add <div className={theme.install.actions}>
<Button
size="large"
type="primary"
className={theme.install.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</> </s> remove <Layout className={s.layout}>
<Content className={s.container}>
</s> add <Layout className={theme.install.layout}>
<Content className={theme.install.container}> </s> remove <Steps progressDot current={currentStep} className={s.stepper}>
<Step/>
<Step/>
<Step/>
<Step/>
<Step/>
</Steps>
</s> add <div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/AdminInterface/AdminInterface.tsx |
<>
<div className={theme.install.title}> | <mask> }) => {
<mask> const { ui: { intl } } = useContext(Store);
<mask>
<mask> return (
<mask> <div>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_auth_title')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_auth_description')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove <div className={s.content}>
<div className={s.iconContainer}>
<Icon icon="mainLogo" className={s.icon} />
</div>
<div className={theme.typography.title}>
</s> add <>
<Icon icon="logo" className={theme.install.logo} />
<div className={theme.install.title}> </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Auth/Auth.tsx |
<div className={cn(theme.install.text, theme.install.text_block)}> | <mask> <div>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_auth_title')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_auth_description')}
<mask> </div>
<mask> <Input
<mask> placeholder={intl.getMessage('login')}
<mask> type="username"
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={theme.typography.title}>
</s> add <div className={theme.install.title}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Auth/Auth.tsx |
</> | <mask> setFieldValue={setFieldValue}
<mask> currentStep={2}
<mask> values={values}
<mask> />
<mask> </div>
<mask> );
<mask> });
<mask>
<mask> export default Auth;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove </div>
</s> add </> </s> remove </div>
</s> add </> </s> remove <Button
size="large"
type="primary"
className={s.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</s> add <div className={theme.install.actions}>
<Button
size="large"
type="primary"
className={theme.install.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</> </s> remove <Layout className={s.layout}>
<Content className={s.container}>
</s> add <Layout className={theme.install.layout}>
<Content className={theme.install.container}> </s> remove <Steps progressDot current={currentStep} className={s.stepper}>
<Step/>
<Step/>
<Step/>
<Step/>
<Step/>
</Steps>
</s> add <div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Auth/Auth.tsx |
import { Tabs, Grid } from 'antd'; | <mask> import React, { FC, useContext } from 'react';
<mask> import { Tabs } 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';
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import cn from 'classnames';
</s> add </s> remove import { Steps } from 'antd';
</s> add import cn from 'classnames'; </s> remove import theme from 'Lib/theme';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<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> import s from './ConfigureDevices.module.pcss';
<mask>
<mask> const { TabPane } = Tabs;
<mask>
<mask> interface ConfigureDevicesProps {
<mask> values: FormValues;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import s from './StepButtons.module.pcss';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add </s> remove import s from './AdminInterface.module.pcss';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx | |
const { useBreakpoint } = Grid; | <mask> import { FormValues } from '../../Install';
<mask> import StepButtons from '../StepButtons';
<mask>
<mask> const { TabPane } = Tabs;
<mask>
<mask> interface ConfigureDevicesProps {
<mask> values: FormValues;
<mask> setFieldValue: FormikHelpers<FormValues>['setFieldValue'];
<mask> }
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import s from './ConfigureDevices.module.pcss';
</s> add </s> remove import s from './StepButtons.module.pcss';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add </s> remove import s from './AdminInterface.module.pcss';
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
const screens = useBreakpoint();
const tabsPosition = screens.md ? 'left' : 'top'; | <mask> const ConfigureDevices: FC<ConfigureDevicesProps> = ({
<mask> values, setFieldValue,
<mask> }) => {
<mask> const { ui: { intl }, install: { addresses } } = useContext(Store);
<mask>
<mask> const dhcp = (e: string) => (
<mask> <a
<mask> href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={s.content}>
<div className={s.iconContainer}>
<Icon icon="mainLogo" className={s.icon} />
</div>
<div className={theme.typography.title}>
</s> add <>
<Icon icon="logo" className={theme.install.logo} />
<div className={theme.install.title}> </s> remove const { Step } = Steps;
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | <mask> }) => {
<mask> const { ui: { intl }, install: { addresses } } = useContext(Store);
<mask>
<mask> const dhcp = (e: string) => (
<mask> // TODO: link to dhcp
<mask> <a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
<mask> );
<mask>
<mask> const allIps = addresses?.interfaces.reduce<string[]>((all, data) => {
<mask> const { ipAddresses } = data;
<mask> if (ipAddresses) {
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={s.content}>
<div className={s.iconContainer}>
<Icon icon="mainLogo" className={s.icon} />
</div>
<div className={theme.typography.title}>
</s> add <>
<Icon icon="logo" className={theme.install.logo} />
<div className={theme.install.title}> </s> remove <span className={theme.typography.danger}>
</s> add <span className={theme.text.danger}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<>
<div className={theme.install.title}> | <mask> const selectedDnsIps = dnsIp.length === 1 && dnsIp[0] === DEFAULT_IP_ADDRESS
<mask> ? allIps : dnsIp;
<mask>
<mask> return (
<mask> <div>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_configure_title')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_configure_danger_notice', { danger })}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <form noValidate className={s.content} onSubmit={handleSubmit}>
</s> add <form noValidate onSubmit={handleSubmit}> </s> remove <Steps progressDot current={currentStep} className={s.stepper}>
<Step/>
<Step/>
<Step/>
<Step/>
<Step/>
</Steps>
</s> add <div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div className={cn(theme.install.text, theme.install.text_block)}> | <mask> <div>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_configure_title')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_configure_danger_notice', { danger })}
<mask> </div>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_configure_how_to_title')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={theme.typography.title}>
</s> add <div className={theme.install.title}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_configure_danger_notice', { danger })}
<mask> </div>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_configure_how_to_title')}
<mask> </div>
<mask> <Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<mask> <TabPane tab="Router" key="1">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_configure_router', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="Windows" key="2">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Windows' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="Macos" key="3">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="macOS" key="3">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Linux' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="iOs" key="6">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="iOS" key="6">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Windows' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> {intl.getMessage('install_configure_router', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="Windows" key="2">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_configure_windows', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="Macos" key="3">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <TabPane tab="Macos" key="3">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="macOS" key="3">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Linux' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="iOs" key="6">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="iOS" key="6">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<TabPane tab="macOS" key="3">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_configure_windows', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="Macos" key="3">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_configure_macos', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="Linux" key="4">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Windows' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Linux' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="iOs" key="6">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="iOS" key="6">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Linux' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> {intl.getMessage('install_configure_macos', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="Linux" key="4">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {/* TODO: add linux setup */}
<mask> {intl.getMessage('install_configure_router', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="Android" key="5">
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <TabPane tab="Macos" key="3">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="macOS" key="3">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Windows' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="iOs" key="6">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="iOS" key="6">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> {intl.getMessage('install_configure_router', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="Android" key="5">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_configure_android', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="iOs" key="6">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <TabPane tab="iOs" key="6">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="iOS" key="6">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Linux' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Windows' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="Macos" key="3">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="macOS" key="3">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<TabPane tab="iOS" key="6">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_configure_android', { p })}
<mask> </div>
<mask> </TabPane>
<mask> <TabPane tab="iOs" key="6">
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_configure_ios', { p })}
<mask> </div>
<mask> </TabPane>
<mask> </Tabs>
<mask>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="Macos" key="3">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="macOS" key="3">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Windows' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Linux' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div className={theme.install.subtitle}> | <mask> </div>
<mask> </TabPane>
<mask> </Tabs>
<mask>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_configure_adresses')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> <p>
<mask> {intl.getMessage('install_admin_interface_title')}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
<p>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="iOs" key="6">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="iOS" key="6">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove <TabPane tab="Macos" key="3">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="macOS" key="3">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div className={cn(theme.install.text, theme.install.text_block)}>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_configure_adresses')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> <p>
<mask> {intl.getMessage('install_admin_interface_title')}
<mask> </p>
<mask> <p>
<mask> {selectedWebIps?.map((ip) => (
<mask> <div key={ip}>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<div>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> <p>
<mask> {intl.getMessage('install_admin_interface_title')}
<mask> </p>
<mask> <p>
<mask> {selectedWebIps?.map((ip) => (
<mask> <div key={ip}>
<mask> {ip}{values.web.port !== DEFAULT_IP_PORT && `:${values.web.port}`}
<mask> </div>
<mask> ))}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
<p>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<div>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div key={ip} className={theme.install.ip}> | <mask> {intl.getMessage('install_admin_interface_title')}
<mask> </p>
<mask> <p>
<mask> {selectedWebIps?.map((ip) => (
<mask> <div key={ip}>
<mask> {ip}{values.web.port !== DEFAULT_IP_PORT && `:${values.web.port}`}
<mask> </div>
<mask> ))}
<mask> </p>
<mask> <p>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<div>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
<p>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> <div key={ip}>
<mask> {ip}{values.web.port !== DEFAULT_IP_PORT && `:${values.web.port}`}
<mask> </div>
<mask> ))}
<mask> </p>
<mask> <p>
<mask> {intl.getMessage('install_dns_server_title')}
<mask> </p>
<mask> <div>
<mask> {selectedDnsIps?.map((ip) => (
<mask> <div key={ip}>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove </p>
<div>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
<p>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> ))}
<mask> </p>
<mask> <p>
<mask> {intl.getMessage('install_dns_server_title')}
<mask> </p>
<mask> <div>
<mask> {selectedDnsIps?.map((ip) => (
<mask> <div key={ip}>
<mask> {ip}{values.dns.port !== DEFAULT_DNS_PORT && `:${values.dns.port}`}
<mask> </div>
<mask> ))}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
<p>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div key={ip} className={theme.install.ip}> | <mask> {intl.getMessage('install_dns_server_title')}
<mask> </p>
<mask> <div>
<mask> {selectedDnsIps?.map((ip) => (
<mask> <div key={ip}>
<mask> {ip}{values.dns.port !== DEFAULT_DNS_PORT && `:${values.dns.port}`}
<mask> </div>
<mask> ))}
<mask> </div>
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove </p>
<div>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subtext}>
</s> add <div className={s.desc}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> </div>
<mask> ))}
<mask> </div>
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_configure_dhcp', { dhcp })}
<mask> </div>
<mask> <StepButtons
<mask> setFieldValue={setFieldValue}
<mask> currentStep={4}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove </div>
</s> add </> </s> remove <TabPane tab="Macos" key="3">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="macOS" key="3">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Windows' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <TabPane tab="iOs" key="6">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <TabPane tab="iOS" key="6">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
</> | <mask> setFieldValue={setFieldValue}
<mask> currentStep={4}
<mask> values={values}
<mask> />
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> export default ConfigureDevices;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove </div>
</s> add </> </s> remove </div>
</s> add </> </s> remove <Steps progressDot current={currentStep} className={s.stepper}>
<Step/>
<Step/>
<Step/>
<Step/>
<Step/>
</Steps>
</s> add <div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
<mask> import { chechNetworkType, NETWORK_TYPE } from 'Helpers/installHelpers';
<mask> import theme from 'Lib/theme';
<mask> import Store from 'Store/installStore';
<mask>
<mask> import s from './DnsServer.module.pcss';
<mask> import { FormValues } from '../../Install';
<mask> import StepButtons from '../StepButtons';
<mask>
<mask> enum NETWORK_OPTIONS {
<mask> ALL = 'all',
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import s from './AdminInterface.module.pcss';
</s> add </s> remove import s from './ConfigureDevices.module.pcss';
</s> add </s> remove import s from './StepButtons.module.pcss';
</s> add </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx | |
<div className={theme.install.options}> | <mask> setFieldValue('dns.ip', value);
<mask> };
<mask>
<mask> const getManualBlock = () => (
<mask> <div className={s.manualOptions}>
<mask> {addresses?.interfaces.map((a) => {
<mask> let name = '';
<mask> const type = chechNetworkType(a.name);
<mask> switch (type) {
<mask> case NETWORK_TYPE.ETHERNET:
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={s.manualOptions}>
</s> add <div className={theme.install.options}> </s> remove 'mainLogo' |
</s> add 'logo' | </s> remove import s from './Install.module.pcss';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx |
<div className={theme.install.name}>
{name} | <mask> break;
<mask> }
<mask> return (
<mask> <div key={a.name}>
<mask> <div>
<mask> <div className={s.name}>
<mask> {name}
<mask> </div>
<mask> {a.ipAddresses?.map((addrIp) => (
<mask> <div key={addrIp} className={s.manualOption}>
<mask> <div className={theme.typography.subtext}>
<mask> {addrIp}
<mask> </div>
<mask> <Switch
<mask> checked={values.dns.ip.includes(addrIp)}
<mask> onChange={() => {
<mask> const temp = new Set(ip);
<mask> if (temp.has(addrIp)) {
<mask> temp.delete(addrIp);
<mask> } else {
<mask> temp.add(addrIp);
<mask> }
<mask> setFieldValue('dns.ip', Array.from(temp.values()));
<mask> }}/>
<mask> </div>
<mask> ))}
<mask> </div>
<mask> </div>
<mask> );
<mask> })}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
<div className={s.name}>
{name}
</div>
{a.ipAddresses?.map((addrIp) => (
<div key={addrIp} className={s.manualOption}>
<div className={theme.typography.subtext}>
http://{addrIp}
</div>
<Switch
checked={values.web.ip.includes(addrIp)}
onChange={() => {
const temp = new Set(ip);
if (temp.has(addrIp)) {
temp.delete(addrIp);
} else {
temp.add(addrIp);
}
setFieldValue('web.ip', Array.from(temp.values()));
}}/>
</div>
))}
</s> add <div className={theme.install.name}>
{name} </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx |
<div className={theme.install.title}> | <mask> );
<mask>
<mask> return (
<mask> <div>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_dns_server_title')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_dns_server_desc')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={s.content}>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx |
<div className={cn(theme.install.text, theme.install.text_block)}> | <mask> <div>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_dns_server_title')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_dns_server_desc')}
<mask> </div>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_dns_server_network_interfaces')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={theme.typography.title}>
</s> add <div className={theme.install.title}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx |
<div className={theme.install.subtitle}> | <mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_block)}>
<mask> {intl.getMessage('install_dns_server_desc')}
<mask> </div>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_dns_server_network_interfaces')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_dns_server_network_interfaces_desc')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={theme.typography.title}>
</s> add <div className={theme.install.title}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx |
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> </div>
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_dns_server_network_interfaces')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_dns_server_network_interfaces_desc')}
<mask> </div>
<mask> <Radio
<mask> value={radioValue}
<mask> onSelect={onSelectRadio}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_block)}>
</s> add <div className={cn(theme.install.text, theme.install.text_block)}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx |
<div className={theme.install.subtitle}> | <mask> },
<mask> ]}
<mask> />
<mask> { radioValue !== NETWORK_OPTIONS.ALL && getManualBlock()}
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_dns_server_port')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_dns_server_port_desc')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx |
<div className={cn(theme.install.text, theme.install.text_base)}> | <mask> { radioValue !== NETWORK_OPTIONS.ALL && getManualBlock()}
<mask> <div className={theme.typography.subTitle}>
<mask> {intl.getMessage('install_dns_server_port')}
<mask> </div>
<mask> <div className={cn(theme.typography.text, theme.typography.text_base)}>
<mask> {intl.getMessage('install_dns_server_port_desc')}
<mask> </div>
<mask> <Input
<mask> label={`${intl.getMessage('port')}:`}
<mask> placeholder={intl.getMessage('port')}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove <div className={theme.typography.subTitle}>
</s> add <div className={theme.install.subtitle}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div className={theme.typography.subTitle}>
{intl.getMessage('install_configure_how_to_title')}
</div>
<Tabs defaultActiveKey="1" tabPosition="left" className={s.tabs}>
<TabPane tab="Router" key="1">
<div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
<TabPane tab={intl.getMessage('router')} key="1">
<div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/DnsServer/DnsServer.tsx |
<mask> import React, { FC, useContext } from 'react';
<mask> import { Button } from 'antd';
<mask> import cn from 'classnames';
<mask> import { observer } from 'mobx-react-lite';
<mask> import { FormikHelpers } from 'formik';
<mask>
<mask> import Store from 'Store/installStore';
<mask>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; </s> remove import { Steps } from 'antd';
</s> add import cn from 'classnames'; </s> remove import theme from 'Lib/theme';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/StepButtons/StepButtons.tsx | |
import theme from 'Lib/theme'; | <mask> import { FormikHelpers } from 'formik';
<mask>
<mask> import Store from 'Store/installStore';
<mask>
<mask> import { FormValues } from '../../Install';
<mask>
<mask> interface StepButtonsProps {
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import s from './StepButtons.module.pcss';
</s> add </s> remove import cn from 'classnames';
</s> add </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; </s> remove import s from './AdminInterface.module.pcss';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/StepButtons/StepButtons.tsx |
<mask>
<mask> import Store from 'Store/installStore';
<mask>
<mask> import { FormValues } from '../../Install';
<mask> import s from './StepButtons.module.pcss';
<mask>
<mask> interface StepButtonsProps {
<mask> setFieldValue: FormikHelpers<FormValues>['setFieldValue'];
<mask> currentStep: number;
<mask> values: FormValues;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import s from './ConfigureDevices.module.pcss';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add </s> remove import s from './AdminInterface.module.pcss';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/StepButtons/StepButtons.tsx | |
<div className={theme.install.actions}> | <mask> currentStep,
<mask> }) => {
<mask> const { ui: { intl } } = useContext(Store);
<mask> return (
<mask> <div>
<mask> <Button
<mask> size="large"
<mask> type="ghost"
<mask> className={cn(s.button, s.inGroup)}
<mask> onClick={() => setFieldValue('step', currentStep - 1)}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove className={cn(s.button, s.inGroup)}
</s> add className={theme.install.button} </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove <div className={s.content}>
<div className={s.iconContainer}>
<Icon icon="mainLogo" className={s.icon} />
</div>
<div className={theme.typography.title}>
</s> add <>
<Icon icon="logo" className={theme.install.logo} />
<div className={theme.install.title}> </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/StepButtons/StepButtons.tsx |
className={theme.install.button} | <mask> <div>
<mask> <Button
<mask> size="large"
<mask> type="ghost"
<mask> className={cn(s.button, s.inGroup)}
<mask> onClick={() => setFieldValue('step', currentStep - 1)}
<mask> >
<mask> {intl.getMessage('back')}
<mask> </Button>
<mask> <Button
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove <Button
size="large"
type="primary"
className={s.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</s> add <div className={theme.install.actions}>
<Button
size="large"
type="primary"
className={theme.install.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</> </s> remove className={cn(s.button)}
</s> add className={theme.install.button} </s> remove <div className={theme.typography.text}>
</s> add <div className={theme.install.text}> </s> remove <form noValidate className={s.content} onSubmit={handleSubmit}>
</s> add <form noValidate onSubmit={handleSubmit}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/StepButtons/StepButtons.tsx |
className={theme.install.button} | <mask> <Button
<mask> size="large"
<mask> type="primary"
<mask> htmlType="submit"
<mask> className={cn(s.button)}
<mask> >
<mask> {intl.getMessage('next')}
<mask> </Button>
<mask> </div>
<mask> );
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <Button
size="large"
type="primary"
className={s.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</s> add <div className={theme.install.actions}>
<Button
size="large"
type="primary"
className={theme.install.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</> </s> remove className={cn(s.button, s.inGroup)}
</s> add className={theme.install.button} </s> remove <div className={theme.typography.text}>
</s> add <div className={theme.install.text}> </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/StepButtons/StepButtons.tsx |
import cn from 'classnames'; | <mask> import React, { FC } from 'react';
<mask> import { Steps } from 'antd';
<mask>
<mask> import s from './Stepper.module.pcss';
<mask>
<mask> interface StepperProps {
<mask> currentStep: number;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import theme from 'Lib/theme';
</s> add </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; </s> remove import s from './StepButtons.module.pcss';
</s> add </s> remove import cn from 'classnames';
</s> add | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Stepper/Stepper.tsx |
interface StepProps {
active: boolean;
current: boolean;
}
const Step: FC<StepProps> = ({ active, current }) => {
return (
<div className={cn(s.wrap, { [s.active]: active, [s.current]: current })}>
<div className={s.circle} />
</div>
);
};
| <mask> import s from './Stepper.module.pcss';
<mask>
<mask> interface StepperProps {
<mask> currentStep: number;
<mask> }
<mask>
<mask> const Stepper: FC<StepperProps> = ({ currentStep }) => {
<mask> return (
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove const { Step } = Steps;
</s> add </s> remove import { Steps } from 'antd';
</s> add import cn from 'classnames'; </s> remove import s from './StepButtons.module.pcss';
</s> add </s> remove <Steps progressDot current={currentStep} className={s.stepper}>
<Step/>
<Step/>
<Step/>
<Step/>
<Step/>
</Steps>
</s> add <div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> </s> remove import s from './Welcome.module.pcss';
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Stepper/Stepper.tsx |
<mask> interface StepperProps {
<mask> currentStep: number;
<mask> }
<mask>
<mask> const { Step } = Steps;
<mask>
<mask> const Stepper: FC<StepperProps> = ({ currentStep }) => {
<mask> return (
<mask> <Steps progressDot current={currentStep} className={s.stepper}>
<mask> <Step/>
<mask> <Step/>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <Steps progressDot current={currentStep} className={s.stepper}>
<Step/>
<Step/>
<Step/>
<Step/>
<Step/>
</Steps>
</s> add <div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> </s> remove import { Steps } from 'antd';
</s> add import cn from 'classnames'; </s> remove <div>
</s> add <div className={theme.install.actions}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Stepper/Stepper.tsx | |
<div className={s.stepper}>
<Step current={currentStep === 0} active={currentStep >= 0} />
<Step current={currentStep === 1} active={currentStep >= 1} />
<Step current={currentStep === 2} active={currentStep >= 2} />
<Step current={currentStep === 3} active={currentStep >= 3} />
<Step current={currentStep === 4} active={currentStep >= 4} />
</div> | <mask> const { Step } = Steps;
<mask>
<mask> const Stepper: FC<StepperProps> = ({ currentStep }) => {
<mask> return (
<mask> <Steps progressDot current={currentStep} className={s.stepper}>
<mask> <Step/>
<mask> <Step/>
<mask> <Step/>
<mask> <Step/>
<mask> <Step/>
<mask> </Steps>
<mask> );
<mask> };
<mask>
<mask> export default Stepper;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove const { Step } = Steps;
</s> add </s> remove <div>
</s> add <div className={theme.install.actions}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Stepper/Stepper.tsx |
<mask> import Store from 'Store/installStore';
<mask> import Icon from 'Common/ui/Icon';
<mask> import theme from 'Lib/theme';
<mask>
<mask> import s from './Welcome.module.pcss';
<mask>
<mask> interface WelcomeProps {
<mask> onNext: () => void;
<mask> }
<mask>
<mask> const Welcome: FC<WelcomeProps> = observer(({ onNext }) => {
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import s from './AdminInterface.module.pcss';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add </s> remove import theme from 'Lib/theme';
</s> add </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Welcome/Welcome.tsx | |
<>
<Icon icon="logo" className={theme.install.logo} />
<div className={theme.install.title}> | <mask>
<mask> const Welcome: FC<WelcomeProps> = observer(({ onNext }) => {
<mask> const { ui: { intl } } = useContext(Store);
<mask> return (
<mask> <div className={s.content}>
<mask> <div className={s.iconContainer}>
<mask> <Icon icon="mainLogo" className={s.icon} />
<mask> </div>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_wellcome_title')}
<mask> </div>
<mask> <div className={theme.typography.text}>
<mask> {intl.getMessage('install_wellcome_desc')}
<mask> </div>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <div>
<div className={theme.typography.title}>
</s> add <>
<div className={theme.install.title}> </s> remove import s from './Welcome.module.pcss';
</s> add </s> remove <div>
</s> add <div className={theme.install.actions}> </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Welcome/Welcome.tsx |
<div className={theme.install.text}> | <mask> </div>
<mask> <div className={theme.typography.title}>
<mask> {intl.getMessage('install_wellcome_title')}
<mask> </div>
<mask> <div className={theme.typography.text}>
<mask> {intl.getMessage('install_wellcome_desc')}
<mask> </div>
<mask> <Button
<mask> size="large"
<mask> type="primary"
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove <Button
size="large"
type="primary"
className={s.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</s> add <div className={theme.install.actions}>
<Button
size="large"
type="primary"
className={theme.install.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</> </s> remove className={cn(s.button)}
</s> add className={theme.install.button} </s> remove <div className={s.content}>
<div className={s.iconContainer}>
<Icon icon="mainLogo" className={s.icon} />
</div>
<div className={theme.typography.title}>
</s> add <>
<Icon icon="logo" className={theme.install.logo} />
<div className={theme.install.title}> </s> remove className={cn(s.button, s.inGroup)}
</s> add className={theme.install.button} </s> remove <div>
</s> add <div className={theme.install.actions}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Welcome/Welcome.tsx |
<div className={theme.install.actions}>
<Button
size="large"
type="primary"
className={theme.install.button}
onClick={onNext}
>
{intl.getMessage('install_wellcome_button')}
</Button>
</div>
</> | <mask> </div>
<mask> <div className={theme.typography.text}>
<mask> {intl.getMessage('install_wellcome_desc')}
<mask> </div>
<mask> <Button
<mask> size="large"
<mask> type="primary"
<mask> className={s.button}
<mask> onClick={onNext}
<mask> >
<mask> {intl.getMessage('install_wellcome_button')}
<mask> </Button>
<mask> </div>
<mask> );
<mask> });
<mask>
<mask> export default Welcome;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove className={cn(s.button)}
</s> add className={theme.install.button} </s> remove <div className={theme.typography.text}>
</s> add <div className={theme.install.text}> </s> remove className={cn(s.button, s.inGroup)}
</s> add className={theme.install.button} </s> remove </div>
</s> add </> </s> remove </div>
</s> add </> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/Install/components/Welcome/Welcome.tsx |
<mask>
<mask> &:last-child {
<mask> border-bottom: 0;
<mask> }
<mask> } </s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import theme from 'Lib/theme';
</s> add </s> remove import cn from 'classnames';
</s> add </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; </s> remove import s from './ConfigureDevices.module.pcss';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/common/controls/Radio/Radio.module.pcss | |
<mask> import React, { FC } from 'react';
<mask> import { Radio } from 'antd';
<mask> import { observer } from 'mobx-react-lite';
<mask>
<mask> import theme from 'Lib/theme';
<mask>
<mask> import s from './Radio.module.pcss';
<mask>
<mask> const { Group } = Radio;
<mask>
<mask> interface AdminInterfaceProps {
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import cn from 'classnames';
</s> add </s> remove import { Steps } from 'antd';
</s> add import cn from 'classnames'; </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; </s> remove import s from './DnsServer.module.pcss';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/common/controls/Radio/Radio.tsx | |
<div className={s.desc}> | <mask> <div>
<mask> {o.label}
<mask> </div>
<mask> {o.desc && (
<mask> <div className={theme.typography.subtext}>
<mask> {o.desc}
<mask> </div>
<mask> )}
<mask> </Radio>
<mask> ))}
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove </p>
<div>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <div key={ip}>
</s> add <div key={ip} className={theme.install.ip}> </s> remove </p>
<p>
</s> add </div>
<div className={cn(theme.install.text, theme.install.text_base)}> </s> remove <form noValidate className={s.content} onSubmit={handleSubmit}>
</s> add <form noValidate onSubmit={handleSubmit}> </s> remove <div>
<div className={s.name}>
{name}
</div>
{a.ipAddresses?.map((addrIp) => (
<div key={addrIp} className={s.manualOption}>
<div className={theme.typography.subtext}>
{addrIp}
</div>
<Switch
checked={values.dns.ip.includes(addrIp)}
onChange={() => {
const temp = new Set(ip);
if (temp.has(addrIp)) {
temp.delete(addrIp);
} else {
temp.add(addrIp);
}
setFieldValue('dns.ip', Array.from(temp.values()));
}}/>
</div>
))}
</s> add <div className={theme.install.name}>
{name} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/common/controls/Radio/Radio.tsx |
<span className={theme.text.danger}> | <mask> import theme from 'Lib/theme';
<mask>
<mask> const danger = (e: string) => {
<mask> return (
<mask> <span className={theme.typography.danger}>
<mask> {e}
<mask> </span>
<mask> );
<mask> };
<mask>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> </s> remove import s from './Welcome.module.pcss';
</s> add </s> remove typography,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/components/common/formating/danger.tsx |
@success-color: #4d995f; | <mask> @primary-color: #67b279;
<mask> @success-color: #53d4b1;
<mask> @text-color: #000;
<mask> @link-hover-color: #1332BB;
<mask> @link-active-color: #246FFF;
<mask>
<mask> @font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove @link-hover-color: #1332BB;
@link-active-color: #246FFF;
</s> add @link-hover-color: #4d995f;
@link-active-color: #4d995f; </s> remove @font-size-base: 14px; </s> add </s> remove /*ADDITIONAL*/
--purple400: #b267a0;
--purple700: #994d87;
--slateblue400: #677bb2;
--slateblue700: #4d6199;
/*VPN*/
--vpngreen400: #74a352;
--vpngreen700: #568040;
--vpnslateblue700: #575770;
--vpnslateblue800: #464558;
--vpnseagreen: #5eb0b7;
</s> add --red400: #c23814;
--transition: 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
--font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace; </s> remove --black: #131313;
/*FEEDBACK*/
--red400: #c23814;
--orange400: #eb9300;
/*BRAND*/
</s> add --black: #000000; </s> remove } </s> add | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/ant/ant-overrides.less |
@link-hover-color: #4d995f;
@link-active-color: #4d995f; | <mask> @primary-color: #67b279;
<mask> @success-color: #53d4b1;
<mask> @text-color: #000;
<mask> @link-hover-color: #1332BB;
<mask> @link-active-color: #246FFF;
<mask>
<mask> @font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
<mask> @font-size-base: 14px; </s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove @success-color: #53d4b1;
</s> add @success-color: #4d995f; </s> remove @font-size-base: 14px; </s> add </s> remove /*ADDITIONAL*/
--purple400: #b267a0;
--purple700: #994d87;
--slateblue400: #677bb2;
--slateblue700: #4d6199;
/*VPN*/
--vpngreen400: #74a352;
--vpngreen700: #568040;
--vpnslateblue700: #575770;
--vpnslateblue800: #464558;
--vpnseagreen: #5eb0b7;
</s> add --red400: #c23814;
--transition: 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
--font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace; </s> remove } </s> add </s> remove --black: #131313;
/*FEEDBACK*/
--red400: #c23814;
--orange400: #eb9300;
/*BRAND*/
</s> add --black: #000000; | [
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/ant/ant-overrides.less |
<mask> @link-hover-color: #1332BB;
<mask> @link-active-color: #246FFF;
<mask>
<mask> @font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
<mask> @font-size-base: 14px; </s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove @link-hover-color: #1332BB;
@link-active-color: #246FFF;
</s> add @link-hover-color: #4d995f;
@link-active-color: #4d995f; </s> remove @success-color: #53d4b1;
</s> add @success-color: #4d995f; </s> remove /*ADDITIONAL*/
--purple400: #b267a0;
--purple700: #994d87;
--slateblue400: #677bb2;
--slateblue700: #4d6199;
/*VPN*/
--vpngreen400: #74a352;
--vpngreen700: #568040;
--vpnslateblue700: #575770;
--vpnslateblue800: #464558;
--vpnseagreen: #5eb0b7;
</s> add --red400: #c23814;
--transition: 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
--font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace; </s> remove } </s> add </s> remove <div className={cn(theme.typography.text, theme.typography.text_base)}>
</s> add <div className={theme.install.subtitle}>
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
</div>
<div className={cn(theme.install.text, theme.install.text_base)}> | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/ant/ant-overrides.less | |
<mask> import './Step.pcss';
<mask> import './Radio.pcss';
<mask>
<mask> const insertStyles = true;
<mask> export default insertStyles;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove typography,
</s> add </s> remove import s from './Install.module.pcss';
</s> add </s> remove 'mainLogo' |
</s> add 'logo' | | [
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/ant/index.ts | |
'logo' | | <mask> import React, { FC } from 'react';
<mask> import './Icon.pcss';
<mask>
<mask> export type IconType =
<mask> 'mainLogo' |
<mask> 'visibility_disable' |
<mask> 'visibility_enable';
<mask>
<mask> const Icons: FC = () => (
<mask> <svg xmlns="http://www.w3.org/2000/svg" className="icons">
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import theme from 'Lib/theme';
</s> add </s> remove import s from './Install.module.pcss';
</s> add </s> remove import { Steps } from 'antd';
</s> add import cn from 'classnames'; </s> remove import cn from 'classnames';
</s> add </s> remove import { Tabs } from 'antd';
</s> add import { Tabs, Grid } from 'antd'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/theme/Icons/index.tsx |
<symbol id="logo" viewBox="0 0 185 57">
<g fill="none" fillRule="evenodd">
<path fill="#242424" fillRule="nonzero" d="M0.5,15.7348066 L7.2386844,0.154696133 L10.4283283,0.154696133 L17.1670127,15.7348066 L13.5505855,15.7348066 L12.1129994,12.2651934 L5.46416417,12.2651934 L4.02657817,15.7348066 L0.5,15.7348066 Z M6.69958965,9.25966851 L10.877574,9.25966851 L8.78858181,4.24309392 L6.69958965,9.25966851 Z M18.9722792,15.7348066 L18.9722792,0.26519337 L25.104482,0.26519337 C27.5603704,0.26519337 29.5669808,0.99815105 31.1243734,2.4640884 C32.681766,3.93002575 33.4604507,5.77531116 33.4604507,8 C33.4604507,10.2099558 32.6780224,12.0515654 31.1131423,13.5248619 C29.5482622,14.9981584 27.5453955,15.7348066 25.104482,15.7348066 L18.9722792,15.7348066 Z M22.4314705,12.6629834 L25.104482,12.6629834 C26.5271003,12.6629834 27.6726695,12.2320485 28.5412111,11.3701657 C29.4097569,10.508283 29.8440234,9.38490564 29.8440234,8 C29.8440234,6.6298274 29.4060133,5.51013326 28.5299799,4.64088398 C27.6539466,3.7716347 26.5121254,3.33701657 25.104482,3.33701657 L22.4314705,3.33701657 L22.4314705,12.6629834 Z M43.4869121,16 C41.0459987,16 39.0581066,15.2486263 37.5231764,13.7458564 C35.9882462,12.2430864 35.2207926,10.3278201 35.2207926,8 C35.2207926,5.77531116 36.0069646,3.88582729 37.5793321,2.33149171 C39.1516997,0.777156133 41.113386,0 43.4644498,0 C44.8271684,0 45.9802206,0.173110608 46.9236412,0.519337017 C47.8670617,0.865563425 48.7730313,1.39962807 49.6415772,2.12154696 L47.4627359,4.70718232 C46.803839,4.16205989 46.1674141,3.76427381 45.553442,3.51381215 C44.9394699,3.2633505 44.2057051,3.13812155 43.3521384,3.13812155 C42.0942444,3.13812155 41.0272967,3.61325492 40.1512633,4.56353591 C39.27523,5.51381691 38.8372199,6.65929348 38.8372199,8 C38.8372199,9.41437171 39.2827173,10.5856307 40.1737256,11.5138122 C41.0647339,12.4419936 42.2065551,12.9060773 43.5992235,12.9060773 C44.8870674,12.9060773 45.9727335,12.5966882 46.8562543,11.9779006 L46.8562543,9.7679558 L43.3746007,9.7679558 L43.3746007,6.82872928 L50.2031342,6.82872928 L50.2031342,13.5469613 C48.2414185,15.1823286 46.0027002,16 43.4869121,16 Z M60.086538,15.9779006 C57.9451232,15.9779006 56.2754376,15.392271 55.0774493,14.2209945 C53.8794549,13.0497179 53.2804668,11.3443943 53.2804668,9.10497238 L53.2804668,0.26519337 L56.7396581,0.26519337 L56.7396581,9.01657459 C56.7396581,10.2541498 57.0354085,11.2007334 57.6269182,11.8563536 C58.2184279,12.5119738 59.0532677,12.839779 60.1314626,12.839779 C61.2096575,12.839779 62.0444972,12.5230234 62.6360069,11.8895028 C63.2275166,11.2559821 63.5232671,10.335181 63.5232671,9.12707182 L63.5232671,0.26519337 L66.9824584,0.26519337 L66.9824584,8.99447514 C66.9824584,11.2928292 66.3722392,13.0313017 65.1517825,14.2099448 C63.9313257,15.3885878 62.2429278,15.9779006 60.086538,15.9779006 Z M67.9199798,15.7348066 L74.6586642,0.154696133 L77.8483082,0.154696133 L84.5869926,15.7348066 L80.9705653,15.7348066 L79.5329793,12.2651934 L72.884144,12.2651934 L71.446558,15.7348066 L67.9199798,15.7348066 Z M74.1195695,9.25966851 L78.2975538,9.25966851 L76.2085617,4.24309392 L74.1195695,9.25966851 Z M86.3922591,15.7348066 L86.3922591,0.26519337 L93.5801891,0.26519337 C95.5718547,0.26519337 97.0992745,0.788208398 98.1624945,1.83425414 C99.0609902,2.71823646 99.5102314,3.9115947 99.5102314,5.41436464 C99.5102314,7.78638387 98.3871285,9.38489459 96.1408892,10.2099448 L99.9819393,15.7348066 L95.9387286,15.7348066 L92.5244619,10.7845304 L89.8514504,10.7845304 L89.8514504,15.7348066 L86.3922591,15.7348066 Z M89.8514504,7.77900552 L93.3555663,7.77900552 C94.1941623,7.77900552 94.8455619,7.57642928 95.3097847,7.17127072 C95.7740075,6.76611215 96.0061155,6.2246811 96.0061155,5.54696133 C96.0061155,4.82504243 95.7665202,4.27624497 95.2873225,3.90055249 C94.8081247,3.52486 94.1417504,3.33701657 93.2881794,3.33701657 L89.8514504,3.33701657 L89.8514504,7.77900552 Z M102.011829,15.7348066 L102.011829,0.26519337 L108.144031,0.26519337 C110.59992,0.26519337 112.60653,0.99815105 114.163923,2.4640884 C115.721315,3.93002575 116.5,5.77531116 116.5,8 C116.5,10.2099558 115.717572,12.0515654 114.152692,13.5248619 C112.587812,14.9981584 110.584945,15.7348066 108.144031,15.7348066 L102.011829,15.7348066 Z M105.47102,12.6629834 L108.144031,12.6629834 C109.56665,12.6629834 110.712219,12.2320485 111.58076,11.3701657 C112.449306,10.508283 112.883573,9.38490564 112.883573,8 C112.883573,6.6298274 112.445563,5.51013326 111.569529,4.64088398 C110.693496,3.7716347 109.551675,3.33701657 108.144031,3.33701657 L105.47102,3.33701657 L105.47102,12.6629834 Z" transform="translate(67.5 14)" />
<path fill="#68BC71" d="M28.4993695,0 C19.5913422,0 8.84603419,2.043769 8.73987156e-06,6.54224924 C8.73987156e-06,16.2577508 -0.122097033,40.4620061 28.4993695,57 C57.1214688,40.4620061 56.9999957,16.2577508 56.9999957,6.54224924 C48.1533375,2.043769 37.4080296,0 28.4993695,0 L28.4993695,0 Z" />
<path fill="#67B279" d="M28.4993695,0 L28.4993695,57 C0.736546964,40.9581459 0.0185516086,17.7031064 0.000458427595,7.45516583 L8.73987165e-06,6.54224924 C8.84603419,2.043769 19.5913422,0 28.4993695,0 L28.4993695,0 Z" />
<path fill="#FFF" d="M28.2485704,36.6428571 L44.7857143,14.7312121 C43.573906,13.7763263 42.510977,14.450265 41.9258467,14.9720239 L41.9044958,14.9736962 L28.1158485,29.075123 L22.9206532,22.9288475 C20.4422167,20.113802 17.0728126,22.2610406 16.2857143,22.8285092 L28.2485704,36.6428571" />
<path fill="#4D4D4D" fillRule="nonzero" d="M70.056,49 L70.056,43.768 L76.072,43.768 L76.072,49 L77.592,49 L77.592,37.576 L76.072,37.576 L76.072,42.488 L70.056,42.488 L70.056,37.576 L68.536,37.576 L68.536,49 L70.056,49 Z M85.92,49.256 C86.8266667,49.256 87.6213333,49.0933333 88.304,48.768 C88.9866667,48.4426667 89.5573333,48.0026667 90.016,47.448 C90.4746667,46.8933333 90.8186667,46.256 91.048,45.536 C91.2773333,44.816 91.392,44.0666667 91.392,43.288 C91.392,42.5093333 91.2773333,41.76 91.048,41.04 C90.8186667,40.32 90.4746667,39.6826667 90.016,39.128 C89.5573333,38.5733333 88.9866667,38.1306667 88.304,37.8 C87.6213333,37.4693333 86.8266667,37.304 85.92,37.304 C85.0133333,37.304 84.2186667,37.4693333 83.536,37.8 C82.8533333,38.1306667 82.2826667,38.5733333 81.824,39.128 C81.3653333,39.6826667 81.0213333,40.32 80.792,41.04 C80.5626667,41.76 80.448,42.5093333 80.448,43.288 C80.448,44.0666667 80.5626667,44.816 80.792,45.536 C81.0213333,46.256 81.3653333,46.8933333 81.824,47.448 C82.2826667,48.0026667 82.8533333,48.4426667 83.536,48.768 C84.2186667,49.0933333 85.0133333,49.256 85.92,49.256 Z M85.92,47.992 C85.2266667,47.992 84.6293333,47.856 84.128,47.584 C83.6266667,47.312 83.216,46.952 82.896,46.504 C82.576,46.056 82.3413333,45.552 82.192,44.992 C82.0426667,44.432 81.968,43.864 81.968,43.288 C81.968,42.712 82.0426667,42.144 82.192,41.584 C82.3413333,41.024 82.576,40.52 82.896,40.072 C83.216,39.624 83.6266667,39.264 84.128,38.992 C84.6293333,38.72 85.2266667,38.584 85.92,38.584 C86.6133333,38.584 87.2106667,38.72 87.712,38.992 C88.2133333,39.264 88.624,39.624 88.944,40.072 C89.264,40.52 89.4986667,41.024 89.648,41.584 C89.7973333,42.144 89.872,42.712 89.872,43.288 C89.872,43.864 89.7973333,44.432 89.648,44.992 C89.4986667,45.552 89.264,46.056 88.944,46.504 C88.624,46.952 88.2133333,47.312 87.712,47.584 C87.2106667,47.856 86.6133333,47.992 85.92,47.992 Z M95.72,49 L95.72,39.496 L95.752,39.496 L99.32,49 L100.616,49 L104.184,39.496 L104.216,39.496 L104.216,49 L105.656,49 L105.656,37.576 L103.576,37.576 L99.96,47.176 L96.36,37.576 L94.28,37.576 L94.28,49 L95.72,49 Z M117.12,49 L117.12,47.72 L110.704,47.72 L110.704,43.768 L116.64,43.768 L116.64,42.488 L110.704,42.488 L110.704,38.856 L117.072,38.856 L117.072,37.576 L109.184,37.576 L109.184,49 L117.12,49 Z" /> | <mask> 'visibility_enable';
<mask>
<mask> const Icons: FC = () => (
<mask> <svg xmlns="http://www.w3.org/2000/svg" className="icons">
<mask> <symbol id="mainLogo" width="185px" height="57px" viewBox="0 0 185 57">
<mask> <g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
<mask> <g transform="translate(-521.000000, -104.000000)">
<mask> <g transform="translate(521.000000, 104.000000)">
<mask> <g>
<mask> <g transform="translate(67.500000, 14.000000)" fill="#242424" fillRule="nonzero">
<mask> <path d="M0.5,15.7348066 L7.2386844,0.154696133 L10.4283283,0.154696133 L17.1670127,15.7348066 L13.5505855,15.7348066 L12.1129994,12.2651934 L5.46416417,12.2651934 L4.02657817,15.7348066 L0.5,15.7348066 Z M6.69958965,9.25966851 L10.877574,9.25966851 L8.78858181,4.24309392 L6.69958965,9.25966851 Z M18.9722792,15.7348066 L18.9722792,0.26519337 L25.104482,0.26519337 C27.5603704,0.26519337 29.5669808,0.99815105 31.1243734,2.4640884 C32.681766,3.93002575 33.4604507,5.77531116 33.4604507,8 C33.4604507,10.2099558 32.6780224,12.0515654 31.1131423,13.5248619 C29.5482622,14.9981584 27.5453955,15.7348066 25.104482,15.7348066 L18.9722792,15.7348066 Z M22.4314705,12.6629834 L25.104482,12.6629834 C26.5271003,12.6629834 27.6726695,12.2320485 28.5412111,11.3701657 C29.4097569,10.508283 29.8440234,9.38490564 29.8440234,8 C29.8440234,6.6298274 29.4060133,5.51013326 28.5299799,4.64088398 C27.6539466,3.7716347 26.5121254,3.33701657 25.104482,3.33701657 L22.4314705,3.33701657 L22.4314705,12.6629834 Z M43.4869121,16 C41.0459987,16 39.0581066,15.2486263 37.5231764,13.7458564 C35.9882462,12.2430864 35.2207926,10.3278201 35.2207926,8 C35.2207926,5.77531116 36.0069646,3.88582729 37.5793321,2.33149171 C39.1516997,0.777156133 41.113386,0 43.4644498,0 C44.8271684,0 45.9802206,0.173110608 46.9236412,0.519337017 C47.8670617,0.865563425 48.7730313,1.39962807 49.6415772,2.12154696 L47.4627359,4.70718232 C46.803839,4.16205989 46.1674141,3.76427381 45.553442,3.51381215 C44.9394699,3.2633505 44.2057051,3.13812155 43.3521384,3.13812155 C42.0942444,3.13812155 41.0272967,3.61325492 40.1512633,4.56353591 C39.27523,5.51381691 38.8372199,6.65929348 38.8372199,8 C38.8372199,9.41437171 39.2827173,10.5856307 40.1737256,11.5138122 C41.0647339,12.4419936 42.2065551,12.9060773 43.5992235,12.9060773 C44.8870674,12.9060773 45.9727335,12.5966882 46.8562543,11.9779006 L46.8562543,9.7679558 L43.3746007,9.7679558 L43.3746007,6.82872928 L50.2031342,6.82872928 L50.2031342,13.5469613 C48.2414185,15.1823286 46.0027002,16 43.4869121,16 Z M60.086538,15.9779006 C57.9451232,15.9779006 56.2754376,15.392271 55.0774493,14.2209945 C53.8794549,13.0497179 53.2804668,11.3443943 53.2804668,9.10497238 L53.2804668,0.26519337 L56.7396581,0.26519337 L56.7396581,9.01657459 C56.7396581,10.2541498 57.0354085,11.2007334 57.6269182,11.8563536 C58.2184279,12.5119738 59.0532677,12.839779 60.1314626,12.839779 C61.2096575,12.839779 62.0444972,12.5230234 62.6360069,11.8895028 C63.2275166,11.2559821 63.5232671,10.335181 63.5232671,9.12707182 L63.5232671,0.26519337 L66.9824584,0.26519337 L66.9824584,8.99447514 C66.9824584,11.2928292 66.3722392,13.0313017 65.1517825,14.2099448 C63.9313257,15.3885878 62.2429278,15.9779006 60.086538,15.9779006 Z M67.9199798,15.7348066 L74.6586642,0.154696133 L77.8483082,0.154696133 L84.5869926,15.7348066 L80.9705653,15.7348066 L79.5329793,12.2651934 L72.884144,12.2651934 L71.446558,15.7348066 L67.9199798,15.7348066 Z M74.1195695,9.25966851 L78.2975538,9.25966851 L76.2085617,4.24309392 L74.1195695,9.25966851 Z M86.3922591,15.7348066 L86.3922591,0.26519337 L93.5801891,0.26519337 C95.5718547,0.26519337 97.0992745,0.788208398 98.1624945,1.83425414 C99.0609902,2.71823646 99.5102314,3.9115947 99.5102314,5.41436464 C99.5102314,7.78638387 98.3871285,9.38489459 96.1408892,10.2099448 L99.9819393,15.7348066 L95.9387286,15.7348066 L92.5244619,10.7845304 L89.8514504,10.7845304 L89.8514504,15.7348066 L86.3922591,15.7348066 Z M89.8514504,7.77900552 L93.3555663,7.77900552 C94.1941623,7.77900552 94.8455619,7.57642928 95.3097847,7.17127072 C95.7740075,6.76611215 96.0061155,6.2246811 96.0061155,5.54696133 C96.0061155,4.82504243 95.7665202,4.27624497 95.2873225,3.90055249 C94.8081247,3.52486 94.1417504,3.33701657 93.2881794,3.33701657 L89.8514504,3.33701657 L89.8514504,7.77900552 Z M102.011829,15.7348066 L102.011829,0.26519337 L108.144031,0.26519337 C110.59992,0.26519337 112.60653,0.99815105 114.163923,2.4640884 C115.721315,3.93002575 116.5,5.77531116 116.5,8 C116.5,10.2099558 115.717572,12.0515654 114.152692,13.5248619 C112.587812,14.9981584 110.584945,15.7348066 108.144031,15.7348066 L102.011829,15.7348066 Z M105.47102,12.6629834 L108.144031,12.6629834 C109.56665,12.6629834 110.712219,12.2320485 111.58076,11.3701657 C112.449306,10.508283 112.883573,9.38490564 112.883573,8 C112.883573,6.6298274 112.445563,5.51013326 111.569529,4.64088398 C110.693496,3.7716347 109.551675,3.33701657 108.144031,3.33701657 L105.47102,3.33701657 L105.47102,12.6629834 Z"></path>
<mask> </g>
<mask> <g>
<mask> <g id="small/Logo-3">
<mask> <g id="small/Logo-2">
<mask> <g id="small/Logo">
<mask> <g id="Group-4">
<mask> <g id="Group">
<mask> <path d="M28.4993695,0 C19.5913422,0 8.84603419,2.043769 8.73987156e-06,6.54224924 C8.73987156e-06,16.2577508 -0.122097033,40.4620061 28.4993695,57 C57.1214688,40.4620061 56.9999957,16.2577508 56.9999957,6.54224924 C48.1533375,2.043769 37.4080296,0 28.4993695,0 L28.4993695,0 Z" id="Path" fill="#68BC71"></path>
<mask> <path d="M28.4993695,0 L28.4993695,57 C0.736546964,40.9581459 0.0185516086,17.7031064 0.000458427595,7.45516583 L8.73987165e-06,6.54224924 C8.84603419,2.043769 19.5913422,0 28.4993695,0 L28.4993695,0 Z" id="Combined-Shape" fill="#67B279"></path>
<mask> </g>
<mask> <path d="M28.2485704,36.6428571 L44.7857143,14.7312121 C43.573906,13.7763263 42.510977,14.450265 41.9258467,14.9720239 L41.9044958,14.9736962 L28.1158485,29.075123 L22.9206532,22.9288475 C20.4422167,20.113802 17.0728126,22.2610406 16.2857143,22.8285092 L28.2485704,36.6428571" id="Fill-11" fill="#FFFFFF"></path>
<mask> </g>
<mask> </g>
<mask> </g>
<mask> </g>
<mask> </g>
<mask> </g>
<mask> <text fontFamily="HelveticaNeue, Helvetica Neue" fontSize="16" fontWeight="normal" letterSpacing="1" fill="#4D4D4D">
<mask> <tspan x="67.288" y="49">HOME</tspan>
<mask> </text>
<mask> </g>
<mask> </g>
<mask> </g>
<mask> </symbol>
<mask> <symbol id="visibility_disable" viewBox="0 0 24 24" fill="currentColor" fillRule="evenodd" clipRule="evenodd">
<mask> <path d="M6.07675 11.0186L5.30088 11.4665C4.88614 11.706 4.35582 11.5639 4.11638 11.1491C3.87693 10.7344 4.01903 10.2041 4.43376 9.96464L5.77791 9.1886C5.82632 9.16065 5.87632 9.1379 5.92724 9.12017C5.94 9.11267 5.95302 9.10545 5.96629 9.09852C6.39087 8.877 6.91464 9.04161 7.13616 9.4662C7.63369 10.4198 9.41088 12.43 12.3523 12.4681C15.2937 12.43 17.0709 10.4198 17.5684 9.4662C17.7899 9.04161 18.3137 8.877 18.7383 9.09852C18.7844 9.1226 18.8275 9.15025 18.8674 9.18096C18.8719 9.18347 18.8764 9.18601 18.8809 9.1886L20.225 9.96464C20.6398 10.2041 20.7818 10.7344 20.5424 11.1491C20.303 11.5639 19.7726 11.706 19.3579 11.4665L18.614 11.037C18.188 11.6053 17.575 12.2431 16.7787 12.7966L17.2222 13.5647C17.4616 13.9794 17.3195 14.5097 16.9048 14.7492C16.4901 14.9886 15.9597 14.8465 15.7203 14.4318L15.2549 13.6258C14.6462 13.8742 13.9706 14.0595 13.2289 14.1469V15.1327C13.2289 15.6116 12.8407 15.9998 12.3618 15.9998C11.8829 15.9998 11.4947 15.6116 11.4947 15.1327V14.1492C10.607 14.0466 9.81358 13.804 9.11589 13.4803L8.56656 14.4318C8.32711 14.8465 7.79679 14.9886 7.38206 14.7492C6.96732 14.5097 6.82523 13.9794 7.06467 13.5647L7.63183 12.5823C6.969 12.0763 6.44978 11.5196 6.07675 11.0186Z" />
<mask> </symbol>
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove 'mainLogo' |
</s> add 'logo' | </s> remove <Layout className={s.layout}>
<Content className={s.container}>
</s> add <Layout className={theme.install.layout}>
<Content className={theme.install.container}> </s> remove <form noValidate className={s.content} onSubmit={handleSubmit}>
</s> add <form noValidate onSubmit={handleSubmit}> </s> remove <div className={s.manualOptions}>
</s> add <div className={theme.install.options}> </s> remove <div className={s.manualOptions}>
</s> add <div className={theme.install.options}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/theme/Icons/index.tsx |
<mask> import typography from './Typography.module.pcss';
<mask> import form from './Form.module.pcss';
<mask>
<mask> const theme = {
<mask> typography,
<mask> form,
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove typography,
</s> add </s> remove import theme from 'Lib/theme';
</s> add </s> remove import s from './Welcome.module.pcss';
</s> add </s> remove import s from './DnsServer.module.pcss';
</s> add | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/theme/index.ts | |
import text from './Text.module.pcss';
import install from './Install.module.pcss';
import link from './Link.module.pcss'; | <mask> import form from './Form.module.pcss';
<mask>
<mask> const theme = {
<mask> form,
<mask> text,
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import typography from './Typography.module.pcss';
</s> add </s> remove typography,
</s> add </s> remove import theme from 'Lib/theme';
</s> add </s> remove import s from './Welcome.module.pcss';
</s> add | [
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/theme/index.ts |
<mask> import typography from './Typography.module.pcss';
<mask> import form from './Form.module.pcss';
<mask>
<mask> const theme = {
<mask> typography,
<mask> form,
<mask> };
<mask>
<mask> export default theme;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove import typography from './Typography.module.pcss';
</s> add </s> remove import s from './Install.module.pcss';
</s> add </s> remove import theme from 'Lib/theme';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/theme/index.ts | |
text,
install,
link, | <mask> const theme = {
<mask> form,
<mask> };
<mask>
<mask> export default theme;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove typography,
</s> add </s> remove import typography from './Typography.module.pcss';
</s> add </s> remove </div>
</s> add </> </s> remove import './Step.pcss';
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/lib/theme/index.ts |
"router": "Router", | <mask> "login": "Login",
<mask> "password": "Password",
<mask> "next": "Next",
<mask> "port": "Port",
<mask>
<mask>
<mask> "install_admin_interface_port_desc": "Now it is working at 3000 port, just in case, but we recomended to use 80 port. Using this ports allow to access to Web interface like to common site",
<mask> "install_admin_interface_port": "Which port will be used",
<mask> "install_admin_interface_title_decs": "Admin web interface is used to control AdGuard Home. You can open it in your browser and it does not require using a client-side program",
<mask> "install_admin_interface_title": "Admin interface settings",
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only",
</s> add "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only", </s> remove "install_configure_how_to_title": "How to configure Router",
</s> add "install_configure_how_to_title": "How to configure %value%", </s> remove } </s> add </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/localization/locales/en.json |
"install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only", | <mask> "install_admin_interface_port_desc": "Now it is working at 3000 port, just in case, but we recomended to use 80 port. Using this ports allow to access to Web interface like to common site",
<mask> "install_admin_interface_port": "Which port will be used",
<mask> "install_admin_interface_title_decs": "Admin web interface is used to control AdGuard Home. You can open it in your browser and it does not require using a client-side program",
<mask> "install_admin_interface_title": "Admin interface settings",
<mask> "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only",
<mask> "install_admin_interface_where_interface": "Where can I open Admin interface",
<mask>
<mask> "install_all_networks_description": "All available web interfaces",
<mask> "install_all_networks": "All networks",
<mask> "install_choose_networks_desc": "For advanced users",
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove
</s> add "router": "Router", </s> remove "install_configure_how_to_title": "How to configure Router",
</s> add "install_configure_how_to_title": "How to configure %value%", </s> remove } </s> add </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/localization/locales/en.json |
"install_configure_how_to_title": "How to configure %value%", | <mask> "install_dns_server_non_static_ip": "How to use non-static IP adresses?",
<mask>
<mask> "install_configure_title": "Configure your devices",
<mask> "install_configure_danger_notice": "<danger>IMPORTANT!</danger> To start using AdGuard Home, you need to configure your devices manually",
<mask> "install_configure_how_to_title": "How to configure Router",
<mask> "install_configure_router": "<p>This setup will automatically cover all the devices connected to your home router and you will not need to configure each of them manually.</p> <p>Open the preferences for your router. Usually, you can access it from your browser via a URL (like http://192.168.0.1/ or http://192.168.1.1/). You may be asked to enter the password. If you don't remember it, you can often reset the password by pressing a button on the router itself. Some routers require a specific application, which in that case should be already installed on your computer/phone.</p><p>Find the DHCP/DNS settings. Look for the DNS letters next to a field which allows two or three sets of numbers, each broken into four groups of one to three digits.</p><p>Enter your AdGuard Home server addresses there.</p>",
<mask> "install_configure_windows": "<p>Open Control Panel through Start menu or Windows search.</p><p>Go to Network and Internet category and then to Network and Sharing Center.</p><p>On the left side of the screen find Change adapter settings and click on it.</p><p>Select your active connection, right-click on it and choose Properties.</p><p>Find Internet Protocol Version 4 (TCP/IP) in the list, select it and then click on Properties again.</p><p>Choose Use the following DNS server addresses and enter your AdGuard Home server addresses.</p>",
<mask> "install_configure_macos": "<p>Click on Apple icon and go to System Preferences.</p><p>Click on Network.</p><p>Select the first connection in your list and click Advanced.</p><p>Select the DNS tab and enter your AdGuard Home server addresses.</p>",
<mask> "install_configure_android": "<p>From the Android Menu home screen, tap Settings.</p><p>Tap Wi-Fi on the menu. The screen listing all of the available networks will be shown (it is impossible to set custom DNS for mobile connection).</p><p>Long press the network you're connected to, and tap Modify Network.</p><p>On some devices, you may need to check the box for Advanced to see further settings. To adjust your Android DNS settings, you will need to switch the IP settings from DHCP to Static.</p><p>Change set DNS 1 and DNS 2 values to your AdGuard Home server addresses.</p>",
<mask> "install_configure_ios": "<p>From the home screen, tap Settings.</p><p>Choose Wi-Fi in the left menu (it is impossible to configure DNS for mobile networks).</p><p>Tap on the name of the currently active network.</p><p>In the DNS field enter your AdGuard Home server addresses.</p>",
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove } </s> add </s> remove "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only",
</s> add "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only", </s> remove
</s> add "router": "Router", </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/localization/locales/en.json |
<mask> "install_configure_android": "<p>From the Android Menu home screen, tap Settings.</p><p>Tap Wi-Fi on the menu. The screen listing all of the available networks will be shown (it is impossible to set custom DNS for mobile connection).</p><p>Long press the network you're connected to, and tap Modify Network.</p><p>On some devices, you may need to check the box for Advanced to see further settings. To adjust your Android DNS settings, you will need to switch the IP settings from DHCP to Static.</p><p>Change set DNS 1 and DNS 2 values to your AdGuard Home server addresses.</p>",
<mask> "install_configure_ios": "<p>From the home screen, tap Settings.</p><p>Choose Wi-Fi in the left menu (it is impossible to configure DNS for mobile networks).</p><p>Tap on the name of the currently active network.</p><p>In the DNS field enter your AdGuard Home server addresses.</p>",
<mask> "install_configure_adresses": "AdGuard Home addresses:",
<mask> "install_configure_dhcp": "You can't set a custom DNS server on some types of routers. In this case it may help if you set up <dhcp>AdGuard Home as a DHCP server</dhcp>. Otherwise, you should search for the manual on how to customize DNS servers for your particular router model."
<mask> } </s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove "install_configure_how_to_title": "How to configure Router",
</s> add "install_configure_how_to_title": "How to configure %value%", </s> remove "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only",
</s> add "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only", </s> remove
</s> add "router": "Router", </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/localization/locales/en.json | |
} | <mask> "install_configure_ios": "<p>From the home screen, tap Settings.</p><p>Choose Wi-Fi in the left menu (it is impossible to configure DNS for mobile networks).</p><p>Tap on the name of the currently active network.</p><p>In the DNS field enter your AdGuard Home server addresses.</p>",
<mask> "install_configure_adresses": "AdGuard Home addresses:",
<mask> "install_configure_dhcp": "You can't set a custom DNS server on some types of routers. In this case it may help if you set up <dhcp>AdGuard Home as a DHCP server</dhcp>. Otherwise, you should search for the manual on how to customize DNS servers for your particular router model."
<mask> }
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove } </s> add </s> remove "install_configure_how_to_title": "How to configure Router",
</s> add "install_configure_how_to_title": "How to configure %value%", </s> remove "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only",
</s> add "install_admin_interface_where_interface_desc": "Set what kind of networks will be able to access to Admin interface. For example: if you choose a local interface only, then Admin inteface will be accessed by this local device only", </s> remove
</s> add "router": "Router", </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/localization/locales/en.json |
<mask> :root {
<mask> /*GRAYSCALE*/
<mask> --white: #ffffff;
<mask> --gray100: #f3f3f3;
<mask> --gray300: #d8d8d8;
<mask> --gray400: #a4a4a4;
<mask> --gray700: #888888;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove --black: #131313;
/*FEEDBACK*/
--red400: #c23814;
--orange400: #eb9300;
/*BRAND*/
</s> add --black: #000000; </s> remove import theme from 'Lib/theme';
</s> add </s> remove // TODO: link to dhcp
<a href="http://" target="_blank" rel="noopener noreferrer">{e}</a>
</s> add <a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a> </s> remove import s from './ConfigureDevices.module.pcss';
</s> add | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/main.pcss | |
--black: #000000; | <mask> --gray300: #d8d8d8;
<mask> --gray400: #a4a4a4;
<mask> --gray700: #888888;
<mask> --gray900: #4d4d4d;
<mask> --black: #131313;
<mask> /*FEEDBACK*/
<mask> --red400: #c23814;
<mask> --orange400: #eb9300;
<mask> /*BRAND*/
<mask> --green400: #67b279;
<mask> --green700: #4d995f;
<mask> /*ADDITIONAL*/
<mask> --purple400: #b267a0;
<mask> --purple700: #994d87;
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove /*ADDITIONAL*/
--purple400: #b267a0;
--purple700: #994d87;
--slateblue400: #677bb2;
--slateblue700: #4d6199;
/*VPN*/
--vpngreen400: #74a352;
--vpngreen700: #568040;
--vpnslateblue700: #575770;
--vpnslateblue800: #464558;
--vpnseagreen: #5eb0b7;
</s> add --red400: #c23814;
--transition: 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
--font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace; </s> remove /*GRAYSCALE*/
</s> add </s> remove @link-hover-color: #1332BB;
@link-active-color: #246FFF;
</s> add @link-hover-color: #4d995f;
@link-active-color: #4d995f; </s> remove @success-color: #53d4b1;
</s> add @success-color: #4d995f; </s> remove } </s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/main.pcss |
--red400: #c23814;
--transition: 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
--font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace; | <mask> --orange400: #eb9300;
<mask> /*BRAND*/
<mask> --green400: #67b279;
<mask> --green700: #4d995f;
<mask> /*ADDITIONAL*/
<mask> --purple400: #b267a0;
<mask> --purple700: #994d87;
<mask> --slateblue400: #677bb2;
<mask> --slateblue700: #4d6199;
<mask> /*VPN*/
<mask> --vpngreen400: #74a352;
<mask> --vpngreen700: #568040;
<mask> --vpnslateblue700: #575770;
<mask> --vpnslateblue800: #464558;
<mask> --vpnseagreen: #5eb0b7;
<mask>
<mask> }
<mask>
<mask> body {
<mask> font-size: 14px;
<mask> color: var(--gray900);
</s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove --black: #131313;
/*FEEDBACK*/
--red400: #c23814;
--orange400: #eb9300;
/*BRAND*/
</s> add --black: #000000; </s> remove } </s> add </s> remove @link-hover-color: #1332BB;
@link-active-color: #246FFF;
</s> add @link-hover-color: #4d995f;
@link-active-color: #4d995f; </s> remove @success-color: #53d4b1;
</s> add @success-color: #4d995f; </s> remove @font-size-base: 14px; </s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/main.pcss |
<mask>
<mask> body {
<mask> font-size: 14px;
<mask> color: var(--gray900);
<mask> } </s> Merge: client: fix mobile layout for install page
Squashed commit of the following:
commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:57:00 2021 +0300
Merge branch 'master' into 2554-mobile-install
commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 18 14:09:25 2021 +0300
client: fix mobile layout for install page </s> remove /*ADDITIONAL*/
--purple400: #b267a0;
--purple700: #994d87;
--slateblue400: #677bb2;
--slateblue700: #4d6199;
/*VPN*/
--vpngreen400: #74a352;
--vpngreen700: #568040;
--vpnslateblue700: #575770;
--vpnslateblue800: #464558;
--vpnseagreen: #5eb0b7;
</s> add --red400: #c23814;
--transition: 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
--font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace; </s> remove @font-size-base: 14px; </s> add </s> remove import theme from 'Lib/theme';
</s> add </s> remove import cn from 'classnames';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9f75725dfa0a6f6208f8e7e156d49642a4248f95 | client2/src/main.pcss | |
"dhcp_config_saved": "Saved DHCP server config",
"form_error_required": "Required field",
"form_error_ip_format": "Invalid IPv4 format",
"form_error_positive": "Must be greater than 0",
"dhcp_form_gateway_input": "Gateway IP",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Range of IP addresses",
"dhcp_form_range_start": "Range start",
"dhcp_form_range_end": "Range end",
"dhcp_form_lease_title": "DHCP lease time (in seconds)",
"dhcp_form_lease_input": "Lease duration" | <mask> "dhcp_disable": "Disable DHCP server",
<mask> "dhcp_not_found": "No active DHCP servers found on the network. It is safe to enable the built-in DHCP server.",
<mask> "dhcp_leases": "DHCP leases",
<mask> "dhcp_leases_not_found": "No DHCP leases found",
<mask> "dhcp_config_saved": "Saved DHCP server config"
<mask> }
</s> Added DHCP form strings to translations </s> remove handleSubmit, pristine, submitting, enabled,
</s> add handleSubmit, pristine, submitting, enabled, t, </s> remove return 'Invalid IPv4 format';
</s> add return <Trans>form_error_ip_format</Trans>; </s> remove return 'Required field';
</s> add return <Trans>form_error_required</Trans>; </s> remove return 'Must be greater than 0';
</s> add return <Trans>form_error_positive</Trans>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9fa85a5c48cc5db772c3fd4c0decddd30a8a6b31 | client/src/__locales/en.json |
import { withNamespaces, Trans } from 'react-i18next';
import flow from 'lodash/flow';
| <mask> import React, { Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { R_IPV4 } from '../../../helpers/constants';
<mask>
<mask> const required = (value) => {
<mask> if (value || value === 0) {
<mask> return false;
</s> Added DHCP form strings to translations </s> remove return 'Required field';
</s> add return <Trans>form_error_required</Trans>; </s> remove return 'Must be greater than 0';
</s> add return <Trans>form_error_positive</Trans>; </s> remove return 'Invalid IPv4 format';
</s> add return <Trans>form_error_ip_format</Trans>; </s> remove handleSubmit, pristine, submitting, enabled,
</s> add handleSubmit, pristine, submitting, enabled, t, </s> remove Save config
</s> add {t('save_config')} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9fa85a5c48cc5db772c3fd4c0decddd30a8a6b31 | client/src/components/Settings/Dhcp/Form.js |
return <Trans>form_error_required</Trans>; | <mask> const required = (value) => {
<mask> if (value || value === 0) {
<mask> return false;
<mask> }
<mask> return 'Required field';
<mask> };
<mask>
<mask> const ipv4 = (value) => {
<mask> if (value && !new RegExp(R_IPV4).test(value)) {
<mask> return 'Invalid IPv4 format';
</s> Added DHCP form strings to translations </s> remove return 'Invalid IPv4 format';
</s> add return <Trans>form_error_ip_format</Trans>; </s> remove return 'Must be greater than 0';
</s> add return <Trans>form_error_positive</Trans>; </s> remove handleSubmit, pristine, submitting, enabled,
</s> add handleSubmit, pristine, submitting, enabled, t, </s> remove Save config
</s> add {t('save_config')} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9fa85a5c48cc5db772c3fd4c0decddd30a8a6b31 | client/src/components/Settings/Dhcp/Form.js |
return <Trans>form_error_ip_format</Trans>; | <mask> };
<mask>
<mask> const ipv4 = (value) => {
<mask> if (value && !new RegExp(R_IPV4).test(value)) {
<mask> return 'Invalid IPv4 format';
<mask> }
<mask> return false;
<mask> };
<mask>
<mask> const isPositive = (value) => {
</s> Added DHCP form strings to translations </s> remove return 'Required field';
</s> add return <Trans>form_error_required</Trans>; </s> remove return 'Must be greater than 0';
</s> add return <Trans>form_error_positive</Trans>; </s> remove handleSubmit, pristine, submitting, enabled,
</s> add handleSubmit, pristine, submitting, enabled, t, </s> remove Save config
</s> add {t('save_config')} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9fa85a5c48cc5db772c3fd4c0decddd30a8a6b31 | client/src/components/Settings/Dhcp/Form.js |
return <Trans>form_error_positive</Trans>; | <mask> };
<mask>
<mask> const isPositive = (value) => {
<mask> if ((value || value === 0) && (value <= 0)) {
<mask> return 'Must be greater than 0';
<mask> }
<mask> return false;
<mask> };
<mask>
<mask> const toNumber = value => value && parseInt(value, 10);
</s> Added DHCP form strings to translations </s> remove return 'Required field';
</s> add return <Trans>form_error_required</Trans>; </s> remove return 'Invalid IPv4 format';
</s> add return <Trans>form_error_ip_format</Trans>; </s> remove handleSubmit, pristine, submitting, enabled,
</s> add handleSubmit, pristine, submitting, enabled, t, </s> remove Save config
</s> add {t('save_config')} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9fa85a5c48cc5db772c3fd4c0decddd30a8a6b31 | client/src/components/Settings/Dhcp/Form.js |
handleSubmit, pristine, submitting, enabled, t, | <mask> );
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit, pristine, submitting, enabled,
<mask> } = props;
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
</s> Added DHCP form strings to translations </s> remove return 'Invalid IPv4 format';
</s> add return <Trans>form_error_ip_format</Trans>; </s> remove return 'Required field';
</s> add return <Trans>form_error_required</Trans>; </s> remove return 'Must be greater than 0';
</s> add return <Trans>form_error_positive</Trans>; </s> remove <label>Gateway IP</label>
</s> add <label>{t('dhcp_form_gateway_input')}</label> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9fa85a5c48cc5db772c3fd4c0decddd30a8a6b31 | client/src/components/Settings/Dhcp/Form.js |
<label>{t('dhcp_form_gateway_input')}</label> | <mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-lg-6">
<mask> <div className="form__group form__group--dhcp">
<mask> <label>Gateway IP</label>
<mask> <Field
<mask> name="gateway_ip"
<mask> component={renderField}
<mask> type="text"
<mask> className="form-control"
</s> Added DHCP form strings to translations </s> remove <label>Range of IP addresses</label>
</s> add <label>{t('dhcp_form_range_title')}</label> </s> remove placeholder="Gateway IP"
</s> add placeholder={t('dhcp_form_gateway_input')} </s> remove <label>Subnet mask</label>
</s> add <label>{t('dhcp_form_subnet_input')}</label> </s> remove handleSubmit, pristine, submitting, enabled,
</s> add handleSubmit, pristine, submitting, enabled, t, </s> remove <label>DHCP lease time (in seconds)</label>
</s> add <label>{t('dhcp_form_lease_title')}</label> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9fa85a5c48cc5db772c3fd4c0decddd30a8a6b31 | client/src/components/Settings/Dhcp/Form.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.