docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace replace keep keep replace keep
|
<mask> onChange={event => onChange(event.target.value)}
<mask> className="form-control"
<mask> value={filter ? filter.value : 'all'}
<mask> >
<mask> <option value="all">Show all</option>
<mask> <option value="filtered">Show filtered</option>
<mask> </select>,
<mask> }, {
<mask> Header: 'Client',
<mask> accessor: 'client',
</s> Complete translate client to Vietnamese </s> remove Header: 'Response',
</s> add Header: t('Response'), </s> remove Header: 'Type',
</s> add Header: t('Type'), </s> remove Header: 'Last time updated',
</s> add Header: this.props.t('Last time updated'), </s> remove Header: 'Name',
</s> add Header: this.props.t('Name'), </s> remove Header: 'Filter URL',
</s> add Header: this.props.t('Filter URL'),
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Logs/index.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> columns={columns}
<mask> showPagination={true}
<mask> defaultPageSize={50}
<mask> minRows={7}
<mask> noDataText="No logs found"
<mask> defaultFilterMethod={(filter, row) => {
<mask> const id = filter.pivotId || filter.id;
<mask> return row[id] !== undefined ?
<mask> String(row[id]).indexOf(filter.value) !== -1 : true;
<mask> }}
</s> Complete translate client to Vietnamese </s> remove Header: 'Response',
</s> add Header: t('Response'), </s> remove Header: 'Client',
</s> add Header: t('Client'), </s> add import { Trans } from 'react-i18next'; </s> remove <span>Empty</span>
</s> add <span><Trans>Empty</Trans></span> </s> remove <option value="all">Show all</option>
<option value="filtered">Show filtered</option>
</s> add <option value="all">{ t('Show all') }</option>
<option value="filtered">{ t('Show filtered') }</option> </s> remove const { queryLogs, dashboard } = this.props;
</s> add const { queryLogs, dashboard, t } = this.props;
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Logs/index.js
|
keep replace keep keep keep keep replace keep keep keep
|
<mask> onClick={() => this.props.toggleLogStatus(queryLogEnabled)}
<mask> >Disable log</button>
<mask> <button
<mask> className="btn btn-primary btn-sm mr-2"
<mask> type="submit"
<mask> onClick={this.handleDownloadButton}
<mask> >Download log file</button>
<mask> <button
<mask> className="btn btn-outline-primary btn-sm"
<mask> type="submit"
</s> Complete translate client to Vietnamese </s> remove >Enable log</button>
</s> add ><Trans>Enable log</Trans></button> </s> remove >Refresh</button>
</s> add ><Trans>Refresh</Trans></button> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}>Add filter</button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}>Check updates</button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button> </s> remove noDataText="No filters added"
</s> add noDataText={ t('No filters added') } </s> remove <button type="button" className="btn btn-secondary" onClick={this.closeModal}>Cancel</button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}>Add filter</button>
</s> add <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>Cancel</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>Add filter</Trans></button>
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Logs/index.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <button
<mask> className="btn btn-outline-primary btn-sm"
<mask> type="submit"
<mask> onClick={this.getLogs}
<mask> >Refresh</button>
<mask> </Fragment>
<mask> );
<mask> }
<mask>
<mask> return (
</s> Complete translate client to Vietnamese </s> remove >Download log file</button>
</s> add ><Trans>Download log file</Trans></button> </s> remove >Enable log</button>
</s> add ><Trans>Enable log</Trans></button> </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}>Add filter</button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}>Check updates</button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button> </s> remove >Disable log</button>
</s> add ><Trans>Disable log</Trans></button> </s> remove <button type="button" className="btn btn-secondary" onClick={this.closeModal}>Cancel</button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}>Add filter</button>
</s> add <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>Cancel</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>Add filter</Trans></button> </s> remove noDataText="No filters added"
</s> add noDataText={ t('No filters added') }
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Logs/index.js
|
keep replace keep keep keep keep replace keep keep keep
|
<mask> onClick={() => this.props.toggleLogStatus(queryLogEnabled)}
<mask> >Enable log</button>
<mask> );
<mask> }
<mask>
<mask> render() {
<mask> const { queryLogs, dashboard } = this.props;
<mask> const { queryLogEnabled } = dashboard;
<mask> return (
<mask> <Fragment>
</s> Complete translate client to Vietnamese </s> remove <PageTitle title="Query Log" subtitle="Last 5000 DNS queries">
</s> add <PageTitle title={ t('Query Log') } subtitle={ t('Last 5000 DNS queries') }> </s> add const { t } = this.props; </s> add const { t } = this.props; </s> add const { t } = this.props; </s> remove <PageTitle title="Filters" />
</s> add <PageTitle title={ t('Filters') } />
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Logs/index.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const { queryLogs, dashboard } = this.props;
<mask> const { queryLogEnabled } = dashboard;
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title="Query Log" subtitle="Last 5000 DNS queries">
<mask> <div className="page-title__actions">
<mask> {this.renderButtons(queryLogEnabled)}
<mask> </div>
<mask> </PageTitle>
<mask> <Card>
</s> Complete translate client to Vietnamese </s> remove const { queryLogs, dashboard } = this.props;
</s> add const { queryLogs, dashboard, t } = this.props; </s> add const { t } = this.props; </s> remove >Enable log</button>
</s> add ><Trans>Enable log</Trans></button> </s> remove <PageTitle title="Filters" />
</s> add <PageTitle title={ t('Filters') } /> </s> add const { t } = this.props; </s> add const { t } = this.props;
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Logs/index.js
|
keep add keep keep keep
|
<mask> setRules: PropTypes.func,
<mask> addSuccessToast: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Logs);
</s> Complete translate client to Vietnamese </s> remove export default Logs;
</s> add export default withNamespaces()(Logs); </s> add t: PropTypes.func, </s> add t: PropTypes.func, </s> add t: PropTypes.func, </s> remove export default Filters;
</s> add export default withNamespaces()(Filters); </s> remove export default class Modal extends Component {
</s> add class Modal extends Component {
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Logs/index.js
|
keep keep keep keep replace
|
<mask> setRules: PropTypes.func,
<mask> addSuccessToast: PropTypes.func,
<mask> };
<mask>
<mask> export default Logs;
</s> Complete translate client to Vietnamese </s> add t: PropTypes.func, </s> add t: PropTypes.func, </s> add t: PropTypes.func, </s> add t: PropTypes.func, </s> remove export default Filters;
</s> add export default withNamespaces()(Filters); </s> remove export default class Modal extends Component {
</s> add class Modal extends Component {
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Logs/index.js
|
keep add keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> class Toast extends Component {
<mask> componentDidMount() {
<mask> const timeout = this.props.type === 'error' ? 30000 : 5000;
</s> Complete translate client to Vietnamese </s> remove export default class UserRules extends Component {
</s> add class UserRules extends Component { </s> add import { Trans, withNamespaces } from 'react-i18next'; </s> add import { Trans, withNamespaces } from 'react-i18next'; </s> add import { Trans, withNamespaces } from 'react-i18next'; </s> add import { Trans, withNamespaces } from 'react-i18next'; </s> remove export default class Modal extends Component {
</s> add class Modal extends Component {
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Toasts/Toast.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> render() {
<mask> return (
<mask> <div className={`toast toast--${this.props.type}`}>
<mask> <p className="toast__content">
<mask> {this.props.message}
<mask> </p>
<mask> <button className="toast__dismiss" onClick={() => this.props.removeToast(this.props.id)}>
<mask> <svg stroke="#fff" fill="none" width="20" height="20" strokeWidth="2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m18 6-12 12"/><path d="m6 6 12 12"/></svg>
<mask> </button>
<mask> </div>
</s> Complete translate client to Vietnamese </s> remove {buttonText}
</s> add <Trans>{buttonText}</Trans> </s> remove >Enable log</button>
</s> add ><Trans>Enable log</Trans></button> </s> remove Url added successfully
</s> add <Trans>Url added successfully</Trans> </s> remove <span>Empty</span>
</s> add <span><Trans>Empty</Trans></span> </s> remove <PageTitle title="Filters" />
</s> add <PageTitle title={ t('Filters') } /> </s> add const { t } = this.props;
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/Toasts/Toast.js
|
keep add keep keep keep keep keep keep
|
<mask> import ReactModal from 'react-modal';
<mask> import classnames from 'classnames';
<mask> import { R_URL_REQUIRES_PROTOCOL } from '../../helpers/constants';
<mask> import './Modal.css';
<mask>
<mask> ReactModal.setAppElement('#root');
<mask>
<mask> const initialState = {
</s> Complete translate client to Vietnamese </s> add import { Trans, withNamespaces } from 'react-i18next'; </s> add import { Trans, withNamespaces } from 'react-i18next'; </s> add import { Trans, withNamespaces } from 'react-i18next'; </s> add import { Trans } from 'react-i18next'; </s> remove export default class UserRules extends Component {
</s> add class UserRules extends Component { </s> remove const { queryLogs, dashboard } = this.props;
</s> add const { queryLogs, dashboard, t } = this.props;
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/ui/Modal.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> name: '',
<mask> isUrlValid: false,
<mask> };
<mask>
<mask> export default class Modal extends Component {
<mask> state = initialState;
<mask>
<mask> // eslint-disable-next-line
<mask> isUrlValid = url => {
<mask> return R_URL_REQUIRES_PROTOCOL.test(url);
</s> Complete translate client to Vietnamese </s> remove export default class UserRules extends Component {
</s> add class UserRules extends Component { </s> add import { Trans, withNamespaces } from 'react-i18next'; </s> add import { Trans } from 'react-i18next'; </s> remove export default Filters;
</s> add export default withNamespaces()(Filters); </s> remove export default Logs;
</s> add export default withNamespaces()(Logs); </s> add t: PropTypes.func,
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/ui/Modal.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> const renderBody = () => {
<mask> if (!this.props.isFilterAdded) {
<mask> return (
<mask> <React.Fragment>
<mask> <input type="text" className={inputNameClass} placeholder="Enter name" onChange={this.handleNameChange} />
<mask> <input type="text" className={inputUrlClass} placeholder="Enter URL" onChange={this.handleUrlChange} />
<mask> {inputDescription &&
<mask> <div className="description">
<mask> {inputDescription}
<mask> </div>}
<mask> </React.Fragment>
</s> Complete translate client to Vietnamese </s> remove <PageTitle title="Filters" />
</s> add <PageTitle title={ t('Filters') } /> </s> remove Url added successfully
</s> add <Trans>Url added successfully</Trans> </s> add const { t } = this.props; </s> remove <span>Empty</span>
</s> add <span><Trans>Empty</Trans></span> </s> remove const { queryLogs, dashboard } = this.props;
</s> add const { queryLogs, dashboard, t } = this.props; </s> remove <PageTitle title="Query Log" subtitle="Last 5000 DNS queries">
</s> add <PageTitle title={ t('Query Log') } subtitle={ t('Last 5000 DNS queries') }>
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/ui/Modal.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> }
<mask> return (
<mask> <div className="description">
<mask> Url added successfully
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> const isValidForSubmit = !(url.length > 0 && isUrlValid && name.length > 0);
</s> Complete translate client to Vietnamese </s> remove {buttonText}
</s> add <Trans>{buttonText}</Trans> </s> remove <button type="button" className="btn btn-secondary" onClick={this.closeModal}>Cancel</button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}>Add filter</button>
</s> add <button type="button" className="btn btn-secondary" onClick={this.closeModal}><Trans>Cancel</Trans></button>
<button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}><Trans>Add filter</Trans></button> </s> remove <input type="text" className={inputNameClass} placeholder="Enter name" onChange={this.handleNameChange} />
<input type="text" className={inputUrlClass} placeholder="Enter URL" onChange={this.handleUrlChange} />
</s> add <input type="text" className={inputNameClass} placeholder={ this.props.t('Enter name') } onChange={this.handleNameChange} />
<input type="text" className={inputUrlClass} placeholder={ this.props.t('Enter URL') } onChange={this.handleUrlChange} /> </s> remove <span>Empty</span>
</s> add <span><Trans>Empty</Trans></span> </s> remove const { queryLogs, dashboard } = this.props;
</s> add const { queryLogs, dashboard, t } = this.props; </s> remove Apply
</s> add <Trans>Apply</Trans>
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/ui/Modal.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> </div>
<mask> {
<mask> !this.props.isFilterAdded &&
<mask> <div className="modal-footer">
<mask> <button type="button" className="btn btn-secondary" onClick={this.closeModal}>Cancel</button>
<mask> <button type="button" className="btn btn-success" onClick={this.handleNext} disabled={isValidForSubmit}>Add filter</button>
<mask> </div>
<mask> }
<mask> </div>
<mask> </ReactModal>
<mask> );
</s> Complete translate client to Vietnamese </s> remove <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}>Add filter</button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}>Check updates</button>
</s> add <button className="btn btn-success btn-standart mr-2" type="submit" onClick={this.props.toggleFilteringModal}><Trans>Add filter</Trans></button>
<button className="btn btn-primary btn-standart" type="submit" onClick={this.props.refreshFilters}><Trans>Check updates</Trans></button> </s> remove {buttonText}
</s> add <Trans>{buttonText}</Trans> </s> remove noDataText="No filters added"
</s> add noDataText={ t('No filters added') } </s> remove >Refresh</button>
</s> add ><Trans>Refresh</Trans></button> </s> remove Url added successfully
</s> add <Trans>Url added successfully</Trans> </s> remove >Enable log</button>
</s> add ><Trans>Enable log</Trans></button>
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/ui/Modal.js
|
keep keep add keep keep keep
|
<mask> inputDescription: PropTypes.string,
<mask> addFilter: PropTypes.func.isRequired,
<mask> isFilterAdded: PropTypes.bool,
<mask> };
<mask>
<mask> export default withNamespaces()(Modal);
</s> Complete translate client to Vietnamese </s> add t: PropTypes.func, </s> remove export default Filters;
</s> add export default withNamespaces()(Filters); </s> add t: PropTypes.func, </s> remove export default Logs;
</s> add export default withNamespaces()(Logs); </s> add t: PropTypes.func, </s> remove export default class Modal extends Component {
</s> add class Modal extends Component {
|
https://github.com/AdguardTeam/AdGuardHome/commit/4590564fea78b4aa247db0e2bd0ac400c60c8252
|
client/src/components/ui/Modal.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // Update filters we've just loaded right away, don't wait for periodic update timer
<mask> go func() {
<mask> refreshFiltersIfNeccessary(false)
<mask> // Save the updated config
<mask> err := writeConfig()
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask> }()
<mask>
</s> Fix incorrect cherry-pick in previous commit. </s> remove err := writeConfig()
</s> add err := config.write() </s> remove err := writeConfig()
</s> add err := config.write() </s> remove func writeConfig() error {
</s> add func (c *configuration) write() error {
|
https://github.com/AdguardTeam/AdGuardHome/commit/45ae984f3bd7bad1f21c1e8f9910558cc2986cba
|
app.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> os.Args = os.Args[:1]
<mask> }
<mask>
<mask> // Save the updated config
<mask> err := writeConfig()
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask>
<mask> address := net.JoinHostPort(config.BindHost, strconv.Itoa(config.BindPort))
</s> Fix incorrect cherry-pick in previous commit. </s> remove err := writeConfig()
</s> add err := config.write() </s> remove err := writeConfig()
</s> add err := config.write() </s> remove func writeConfig() error {
</s> add func (c *configuration) write() error {
|
https://github.com/AdguardTeam/AdGuardHome/commit/45ae984f3bd7bad1f21c1e8f9910558cc2986cba
|
app.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return nil
<mask> }
<mask>
<mask> // Saves configuration to the YAML file and also saves the user filter contents to a file
<mask> func writeConfig() error {
<mask> c.Lock()
<mask> defer c.Unlock()
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> log.Printf("Writing YAML file: %s", configFile)
<mask> yamlText, err := yaml.Marshal(&config)
</s> Fix incorrect cherry-pick in previous commit. </s> remove err := writeConfig()
</s> add err := config.write() </s> remove err := writeConfig()
</s> add err := config.write() </s> remove err := writeConfig()
</s> add err := config.write()
|
https://github.com/AdguardTeam/AdGuardHome/commit/45ae984f3bd7bad1f21c1e8f9910558cc2986cba
|
config.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return nil
<mask> }
<mask>
<mask> func writeAllConfigs() error {
<mask> err := writeConfig()
<mask> if err != nil {
<mask> log.Printf("Couldn't write our config: %s", err)
<mask> return err
<mask> }
<mask> err = writeCoreDNSConfig()
</s> Fix incorrect cherry-pick in previous commit. </s> remove err := writeConfig()
</s> add err := config.write() </s> remove err := writeConfig()
</s> add err := config.write() </s> remove func writeConfig() error {
</s> add func (c *configuration) write() error {
|
https://github.com/AdguardTeam/AdGuardHome/commit/45ae984f3bd7bad1f21c1e8f9910558cc2986cba
|
config.go
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> var webHandlersRegistered = false
<mask>
<mask> // Client contains information about persistent clients.
<mask> type Client struct {
<mask> IDs []string
<mask> Tags []string
<mask> Name string
<mask> UseOwnSettings bool // false: use global settings
<mask> FilteringEnabled bool
<mask> SafeSearchEnabled bool
<mask> SafeBrowsingEnabled bool
<mask> ParentalEnabled bool
<mask>
<mask> UseOwnBlockedServices bool // false: use global settings
<mask> BlockedServices []string
<mask>
<mask> Upstreams []string // list of upstream servers to be used for the client's requests
<mask>
<mask> // Custom upstream config for this client
<mask> // nil: not yet initialized
<mask> // not nil, but empty: initialized, no good upstreams
<mask> // not nil, not empty: Upstreams ready to be used
<mask> upstreamConfig *proxy.UpstreamConfig
<mask> }
<mask>
<mask> type clientSource uint
<mask>
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> add Name string
IDs []string
Tags []string
BlockedServices []string
Upstreams []string
UseOwnSettings bool
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool </s> remove IDs []string `json:"ids"`
Tags []string `json:"tags"`
Name string `json:"name"`
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
BlockedServices []string `json:"blocked_services"`
Upstreams []string `json:"upstreams"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked.
Disallowed bool `json:"disallowed"`
// DisallowedRule - the rule due to which the client is disallowed
// If Disallowed is true, and this string is empty - it means that the client IP
// is disallowed by the "allowed IP list", i.e. it is not included in allowed.
DisallowedRule string `json:"disallowed_rule"`
</s> add // Disallowed, if non-nil and false, means that the client's IP is
// allowed. Otherwise, the IP is blocked.
Disallowed *bool `json:"disallowed,omitempty"`
// DisallowedRule is the rule due to which the client is disallowed.
// If Disallowed is true and this string is empty, the client IP is
// disallowed by the "allowed IP list", that is it is not included in
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
Name string `json:"name"`
BlockedServices []string `json:"blocked_services"`
IDs []string `json:"ids"`
Tags []string `json:"tags"`
Upstreams []string `json:"upstreams"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
UseGlobalSettings bool `json:"use_global_settings"` </s> add // clientJSON is a common structure used by several handlers to deal with
// clients. Some of the fields are only necessary in one or two handlers and
// are thus made pointers with an omitempty tag.
//
// TODO(a.garipov): Consider using nullbool and an optional string here? Or
// split into several structs? </s> add WhoisInfo *RuntimeClientWhoisInfo </s> remove WhoisInfo *RuntimeClientWhoisInfo
</s> add </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clients.go
|
keep keep keep add keep keep keep keep keep
|
<mask> // it's nil, it has not been initialized yet. If it's non-nil and
<mask> // empty, there are no valid upstreams. If it's non-nil and non-empty,
<mask> // these upstream must be used.
<mask> upstreamConfig *proxy.UpstreamConfig
<mask> }
<mask>
<mask> type clientSource uint
<mask>
<mask> // Client sources. The order determines the priority.
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> remove IDs []string
Tags []string
Name string
UseOwnSettings bool // false: use global settings
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool // false: use global settings
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
// Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
</s> add // upstreamConfig is the custom upstream config for this client. If
// it's nil, it has not been initialized yet. If it's non-nil and
// empty, there are no valid upstreams. If it's non-nil and non-empty,
// these upstream must be used. </s> remove IDs []string `json:"ids"`
Tags []string `json:"tags"`
Name string `json:"name"`
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
BlockedServices []string `json:"blocked_services"`
Upstreams []string `json:"upstreams"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked.
Disallowed bool `json:"disallowed"`
// DisallowedRule - the rule due to which the client is disallowed
// If Disallowed is true, and this string is empty - it means that the client IP
// is disallowed by the "allowed IP list", i.e. it is not included in allowed.
DisallowedRule string `json:"disallowed_rule"`
</s> add // Disallowed, if non-nil and false, means that the client's IP is
// allowed. Otherwise, the IP is blocked.
Disallowed *bool `json:"disallowed,omitempty"`
// DisallowedRule is the rule due to which the client is disallowed.
// If Disallowed is true and this string is empty, the client IP is
// disallowed by the "allowed IP list", that is it is not included in
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
Name string `json:"name"`
BlockedServices []string `json:"blocked_services"`
IDs []string `json:"ids"`
Tags []string `json:"tags"`
Upstreams []string `json:"upstreams"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
UseGlobalSettings bool `json:"use_global_settings"` </s> add // clientJSON is a common structure used by several handlers to deal with
// clients. Some of the fields are only necessary in one or two handlers and
// are thus made pointers with an omitempty tag.
//
// TODO(a.garipov): Consider using nullbool and an optional string here? Or
// split into several structs? </s> add WhoisInfo *RuntimeClientWhoisInfo </s> remove WhoisInfo *RuntimeClientWhoisInfo
</s> add </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clients.go
|
keep keep keep add keep keep keep keep keep
|
<mask> )
<mask>
<mask> // RuntimeClient information
<mask> type RuntimeClient struct {
<mask> Host string
<mask> Source clientSource
<mask> }
<mask>
<mask> // RuntimeClientWhoisInfo is the filtered WHOIS data for a runtime client.
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> remove WhoisInfo *RuntimeClientWhoisInfo
</s> add </s> remove IDs []string
Tags []string
Name string
UseOwnSettings bool // false: use global settings
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool // false: use global settings
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
// Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
</s> add // upstreamConfig is the custom upstream config for this client. If
// it's nil, it has not been initialized yet. If it's non-nil and
// empty, there are no valid upstreams. If it's non-nil and non-empty,
// these upstream must be used. </s> add // clientJSON is a common structure used by several handlers to deal with
// clients. Some of the fields are only necessary in one or two handlers and
// are thus made pointers with an omitempty tag.
//
// TODO(a.garipov): Consider using nullbool and an optional string here? Or
// split into several structs? </s> remove IDs []string `json:"ids"`
Tags []string `json:"tags"`
Name string `json:"name"`
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
BlockedServices []string `json:"blocked_services"`
Upstreams []string `json:"upstreams"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked.
Disallowed bool `json:"disallowed"`
// DisallowedRule - the rule due to which the client is disallowed
// If Disallowed is true, and this string is empty - it means that the client IP
// is disallowed by the "allowed IP list", i.e. it is not included in allowed.
DisallowedRule string `json:"disallowed_rule"`
</s> add // Disallowed, if non-nil and false, means that the client's IP is
// allowed. Otherwise, the IP is blocked.
Disallowed *bool `json:"disallowed,omitempty"`
// DisallowedRule is the rule due to which the client is disallowed.
// If Disallowed is true and this string is empty, the client IP is
// disallowed by the "allowed IP list", that is it is not included in
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
Name string `json:"name"`
BlockedServices []string `json:"blocked_services"`
IDs []string `json:"ids"`
Tags []string `json:"tags"`
Upstreams []string `json:"upstreams"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
UseGlobalSettings bool `json:"use_global_settings"` </s> add Name string
IDs []string
Tags []string
BlockedServices []string
Upstreams []string
UseOwnSettings bool
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clients.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> // RuntimeClient information
<mask> type RuntimeClient struct {
<mask> Host string
<mask> Source clientSource
<mask> WhoisInfo *RuntimeClientWhoisInfo
<mask> }
<mask>
<mask> // RuntimeClientWhoisInfo is the filtered WHOIS data for a runtime client.
<mask> type RuntimeClientWhoisInfo struct {
<mask> City string `json:"city,omitempty"`
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> add WhoisInfo *RuntimeClientWhoisInfo </s> remove IDs []string
Tags []string
Name string
UseOwnSettings bool // false: use global settings
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool // false: use global settings
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
// Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
</s> add // upstreamConfig is the custom upstream config for this client. If
// it's nil, it has not been initialized yet. If it's non-nil and
// empty, there are no valid upstreams. If it's non-nil and non-empty,
// these upstream must be used. </s> remove IDs []string `json:"ids"`
Tags []string `json:"tags"`
Name string `json:"name"`
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
BlockedServices []string `json:"blocked_services"`
Upstreams []string `json:"upstreams"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked.
Disallowed bool `json:"disallowed"`
// DisallowedRule - the rule due to which the client is disallowed
// If Disallowed is true, and this string is empty - it means that the client IP
// is disallowed by the "allowed IP list", i.e. it is not included in allowed.
DisallowedRule string `json:"disallowed_rule"`
</s> add // Disallowed, if non-nil and false, means that the client's IP is
// allowed. Otherwise, the IP is blocked.
Disallowed *bool `json:"disallowed,omitempty"`
// DisallowedRule is the rule due to which the client is disallowed.
// If Disallowed is true and this string is empty, the client IP is
// disallowed by the "allowed IP list", that is it is not included in
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
Name string `json:"name"`
BlockedServices []string `json:"blocked_services"`
IDs []string `json:"ids"`
Tags []string `json:"tags"`
Upstreams []string `json:"upstreams"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
UseGlobalSettings bool `json:"use_global_settings"` </s> add // clientJSON is a common structure used by several handlers to deal with
// clients. Some of the fields are only necessary in one or two handlers and
// are thus made pointers with an omitempty tag.
//
// TODO(a.garipov): Consider using nullbool and an optional string here? Or
// split into several structs? </s> add Name string
IDs []string
Tags []string
BlockedServices []string
Upstreams []string
UseOwnSettings bool
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clients.go
|
keep keep keep add keep keep keep keep
|
<mask> "net"
<mask> "net/http"
<mask> )
<mask>
<mask> type clientJSON struct {
<mask> // Disallowed, if non-nil and false, means that the client's IP is
<mask> // allowed. Otherwise, the IP is blocked.
<mask> Disallowed *bool `json:"disallowed,omitempty"`
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> remove IDs []string `json:"ids"`
Tags []string `json:"tags"`
Name string `json:"name"`
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
BlockedServices []string `json:"blocked_services"`
Upstreams []string `json:"upstreams"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked.
Disallowed bool `json:"disallowed"`
// DisallowedRule - the rule due to which the client is disallowed
// If Disallowed is true, and this string is empty - it means that the client IP
// is disallowed by the "allowed IP list", i.e. it is not included in allowed.
DisallowedRule string `json:"disallowed_rule"`
</s> add // Disallowed, if non-nil and false, means that the client's IP is
// allowed. Otherwise, the IP is blocked.
Disallowed *bool `json:"disallowed,omitempty"`
// DisallowedRule is the rule due to which the client is disallowed.
// If Disallowed is true and this string is empty, the client IP is
// disallowed by the "allowed IP list", that is it is not included in
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
Name string `json:"name"`
BlockedServices []string `json:"blocked_services"`
IDs []string `json:"ids"`
Tags []string `json:"tags"`
Upstreams []string `json:"upstreams"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
UseGlobalSettings bool `json:"use_global_settings"` </s> add WhoisInfo *RuntimeClientWhoisInfo </s> remove IDs []string
Tags []string
Name string
UseOwnSettings bool // false: use global settings
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool // false: use global settings
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
// Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
</s> add // upstreamConfig is the custom upstream config for this client. If
// it's nil, it has not been initialized yet. If it's non-nil and
// empty, there are no valid upstreams. If it's non-nil and non-empty,
// these upstream must be used. </s> remove WhoisInfo *RuntimeClientWhoisInfo
</s> add </s> add Name string
IDs []string
Tags []string
BlockedServices []string
Upstreams []string
UseOwnSettings bool
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clientshttp.go
|
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 replace replace replace keep keep keep keep keep
|
<mask> "net/http"
<mask> )
<mask>
<mask> type clientJSON struct {
<mask> IDs []string `json:"ids"`
<mask> Tags []string `json:"tags"`
<mask> Name string `json:"name"`
<mask> UseGlobalSettings bool `json:"use_global_settings"`
<mask> FilteringEnabled bool `json:"filtering_enabled"`
<mask> ParentalEnabled bool `json:"parental_enabled"`
<mask> SafeSearchEnabled bool `json:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
<mask>
<mask> UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
<mask> BlockedServices []string `json:"blocked_services"`
<mask>
<mask> Upstreams []string `json:"upstreams"`
<mask>
<mask> WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
<mask>
<mask> // Disallowed - if true -- client's IP is not disallowed
<mask> // Otherwise, it is blocked.
<mask> Disallowed bool `json:"disallowed"`
<mask>
<mask> // DisallowedRule - the rule due to which the client is disallowed
<mask> // If Disallowed is true, and this string is empty - it means that the client IP
<mask> // is disallowed by the "allowed IP list", i.e. it is not included in allowed.
<mask> DisallowedRule string `json:"disallowed_rule"`
<mask> }
<mask>
<mask> type runtimeClientJSON struct {
<mask> WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
<mask>
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> remove IDs []string
Tags []string
Name string
UseOwnSettings bool // false: use global settings
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool // false: use global settings
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
// Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
</s> add // upstreamConfig is the custom upstream config for this client. If
// it's nil, it has not been initialized yet. If it's non-nil and
// empty, there are no valid upstreams. If it's non-nil and non-empty,
// these upstream must be used. </s> add Name string
IDs []string
Tags []string
BlockedServices []string
Upstreams []string
UseOwnSettings bool
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool </s> add // clientJSON is a common structure used by several handlers to deal with
// clients. Some of the fields are only necessary in one or two handlers and
// are thus made pointers with an omitempty tag.
//
// TODO(a.garipov): Consider using nullbool and an optional string here? Or
// split into several structs? </s> add WhoisInfo *RuntimeClientWhoisInfo </s> remove WhoisInfo *RuntimeClientWhoisInfo
</s> add </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clientshttp.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> UseGlobalBlockedServices: !c.UseOwnBlockedServices,
<mask> BlockedServices: c.BlockedServices,
<mask>
<mask> Upstreams: c.Upstreams,
<mask>
<mask> WhoisInfo: &RuntimeClientWhoisInfo{},
<mask> }
<mask>
<mask> return cj
<mask> }
<mask>
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> remove Disallowed: disallowed,
DisallowedRule: rule,
</s> add Disallowed: &disallowed,
DisallowedRule: &rule, </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> add WhoisInfo *RuntimeClientWhoisInfo </s> remove WhoisInfo *RuntimeClientWhoisInfo
</s> add </s> add Name string
IDs []string
Tags []string
BlockedServices []string
Upstreams []string
UseOwnSettings bool
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clientshttp.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> continue
<mask> }
<mask> } else {
<mask> cj = clientToJSON(c)
<mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask> }
<mask>
<mask> data = append(data, map[string]clientJSON{
<mask> idStr: cj,
<mask> })
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> remove Disallowed: disallowed,
DisallowedRule: rule,
</s> add Disallowed: &disallowed,
DisallowedRule: &rule, </s> remove
WhoisInfo: &RuntimeClientWhoisInfo{},
</s> add </s> add WhoisInfo *RuntimeClientWhoisInfo </s> remove WhoisInfo *RuntimeClientWhoisInfo
</s> add </s> remove IDs []string
Tags []string
Name string
UseOwnSettings bool // false: use global settings
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool // false: use global settings
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
// Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
</s> add // upstreamConfig is the custom upstream config for this client. If
// it's nil, it has not been initialized yet. If it's non-nil and
// empty, there are no valid upstreams. If it's non-nil and non-empty,
// these upstream must be used.
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clientshttp.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> cj = clientJSON{
<mask> IDs: []string{idStr},
<mask> Disallowed: disallowed,
<mask> DisallowedRule: rule,
<mask> WhoisInfo: &RuntimeClientWhoisInfo{},
<mask> }
<mask>
<mask> return cj, true
<mask> }
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> remove
WhoisInfo: &RuntimeClientWhoisInfo{},
</s> add </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> add WhoisInfo *RuntimeClientWhoisInfo </s> remove WhoisInfo *RuntimeClientWhoisInfo
</s> add </s> remove IDs []string `json:"ids"`
Tags []string `json:"tags"`
Name string `json:"name"`
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
BlockedServices []string `json:"blocked_services"`
Upstreams []string `json:"upstreams"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked.
Disallowed bool `json:"disallowed"`
// DisallowedRule - the rule due to which the client is disallowed
// If Disallowed is true, and this string is empty - it means that the client IP
// is disallowed by the "allowed IP list", i.e. it is not included in allowed.
DisallowedRule string `json:"disallowed_rule"`
</s> add // Disallowed, if non-nil and false, means that the client's IP is
// allowed. Otherwise, the IP is blocked.
Disallowed *bool `json:"disallowed,omitempty"`
// DisallowedRule is the rule due to which the client is disallowed.
// If Disallowed is true and this string is empty, the client IP is
// disallowed by the "allowed IP list", that is it is not included in
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
Name string `json:"name"`
BlockedServices []string `json:"blocked_services"`
IDs []string `json:"ids"`
Tags []string `json:"tags"`
Upstreams []string `json:"upstreams"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
UseGlobalSettings bool `json:"use_global_settings"`
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clientshttp.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return cj, true
<mask> }
<mask>
<mask> cj = runtimeClientToJSON(idStr, rc)
<mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask>
<mask> return cj, true
<mask> }
<mask>
<mask> // RegisterClientsHandlers registers HTTP handlers
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> remove Disallowed: disallowed,
DisallowedRule: rule,
</s> add Disallowed: &disallowed,
DisallowedRule: &rule, </s> remove
WhoisInfo: &RuntimeClientWhoisInfo{},
</s> add </s> add // clientJSON is a common structure used by several handlers to deal with
// clients. Some of the fields are only necessary in one or two handlers and
// are thus made pointers with an omitempty tag.
//
// TODO(a.garipov): Consider using nullbool and an optional string here? Or
// split into several structs? </s> remove IDs []string `json:"ids"`
Tags []string `json:"tags"`
Name string `json:"name"`
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
BlockedServices []string `json:"blocked_services"`
Upstreams []string `json:"upstreams"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked.
Disallowed bool `json:"disallowed"`
// DisallowedRule - the rule due to which the client is disallowed
// If Disallowed is true, and this string is empty - it means that the client IP
// is disallowed by the "allowed IP list", i.e. it is not included in allowed.
DisallowedRule string `json:"disallowed_rule"`
</s> add // Disallowed, if non-nil and false, means that the client's IP is
// allowed. Otherwise, the IP is blocked.
Disallowed *bool `json:"disallowed,omitempty"`
// DisallowedRule is the rule due to which the client is disallowed.
// If Disallowed is true and this string is empty, the client IP is
// disallowed by the "allowed IP list", that is it is not included in
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
Name string `json:"name"`
BlockedServices []string `json:"blocked_services"`
IDs []string `json:"ids"`
Tags []string `json:"tags"`
Upstreams []string `json:"upstreams"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
UseGlobalSettings bool `json:"use_global_settings"` </s> remove IDs []string
Tags []string
Name string
UseOwnSettings bool // false: use global settings
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool // false: use global settings
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
// Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
</s> add // upstreamConfig is the custom upstream config for this client. If
// it's nil, it has not been initialized yet. If it's non-nil and
// empty, there are no valid upstreams. If it's non-nil and non-empty,
// these upstream must be used.
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
internal/home/clientshttp.go
|
keep keep add keep keep keep keep keep keep
|
<mask> 'type': 'array'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'ClientAuto':
<mask> 'type': 'object'
<mask> 'description': 'Auto-Client information'
<mask> 'properties':
<mask> 'ip':
<mask> 'type': 'string'
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> add 'whois_info':
'$ref': '#/components/schemas/WhoisInfo' </s> add 'supported_tags':
'items':
'type': 'string'
'type': 'array' </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> remove Disallowed: disallowed,
DisallowedRule: rule,
</s> add Disallowed: &disallowed,
DisallowedRule: &rule, </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> remove
WhoisInfo: &RuntimeClientWhoisInfo{},
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
openapi/openapi.yaml
|
keep keep keep add keep keep keep keep keep keep
|
<mask> 'source':
<mask> 'type': 'string'
<mask> 'description': 'The source of this information'
<mask> 'example': 'etc/hosts'
<mask> 'ClientUpdate':
<mask> 'type': 'object'
<mask> 'description': 'Client update request'
<mask> 'properties':
<mask> 'name':
<mask> 'type': 'string'
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> add 'tags':
'items':
'type': 'string'
'type': 'array' </s> add 'supported_tags':
'items':
'type': 'string'
'type': 'array' </s> remove IDs []string
Tags []string
Name string
UseOwnSettings bool // false: use global settings
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
UseOwnBlockedServices bool // false: use global settings
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
// Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
</s> add // upstreamConfig is the custom upstream config for this client. If
// it's nil, it has not been initialized yet. If it's non-nil and
// empty, there are no valid upstreams. If it's non-nil and non-empty,
// these upstream must be used. </s> add // clientJSON is a common structure used by several handlers to deal with
// clients. Some of the fields are only necessary in one or two handlers and
// are thus made pointers with an omitempty tag.
//
// TODO(a.garipov): Consider using nullbool and an optional string here? Or
// split into several structs? </s> remove IDs []string `json:"ids"`
Tags []string `json:"tags"`
Name string `json:"name"`
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
BlockedServices []string `json:"blocked_services"`
Upstreams []string `json:"upstreams"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info"`
// Disallowed - if true -- client's IP is not disallowed
// Otherwise, it is blocked.
Disallowed bool `json:"disallowed"`
// DisallowedRule - the rule due to which the client is disallowed
// If Disallowed is true, and this string is empty - it means that the client IP
// is disallowed by the "allowed IP list", i.e. it is not included in allowed.
DisallowedRule string `json:"disallowed_rule"`
</s> add // Disallowed, if non-nil and false, means that the client's IP is
// allowed. Otherwise, the IP is blocked.
Disallowed *bool `json:"disallowed,omitempty"`
// DisallowedRule is the rule due to which the client is disallowed.
// If Disallowed is true and this string is empty, the client IP is
// disallowed by the "allowed IP list", that is it is not included in
// the allowlist.
DisallowedRule *string `json:"disallowed_rule,omitempty"`
WhoisInfo *RuntimeClientWhoisInfo `json:"whois_info,omitempty"`
Name string `json:"name"`
BlockedServices []string `json:"blocked_services"`
IDs []string `json:"ids"`
Tags []string `json:"tags"`
Upstreams []string `json:"upstreams"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
UseGlobalSettings bool `json:"use_global_settings"` </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
openapi/openapi.yaml
|
keep keep add keep keep keep keep keep keep
|
<mask> '$ref': '#/components/schemas/ClientsArray'
<mask> 'auto_clients':
<mask> '$ref': '#/components/schemas/ClientsAutoArray'
<mask> 'ClientsArray':
<mask> 'type': 'array'
<mask> 'items':
<mask> '$ref': '#/components/schemas/Client'
<mask> 'description': 'Clients array'
<mask> 'ClientsAutoArray':
</s> Pull request: home: imp client http api, docs
Updates #3075.
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <[email protected]>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs </s> add 'whois_info':
'$ref': '#/components/schemas/WhoisInfo' </s> add 'tags':
'items':
'type': 'string'
'type': 'array' </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> remove Disallowed: disallowed,
DisallowedRule: rule,
</s> add Disallowed: &disallowed,
DisallowedRule: &rule, </s> remove cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
</s> add disallowed, rule := clients.dnsServer.IsBlockedIP(ip)
cj.Disallowed, cj.DisallowedRule = &disallowed, &rule </s> remove
WhoisInfo: &RuntimeClientWhoisInfo{},
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/460aa1a5ba4409a2fccb596b2156922532bab5b3
|
openapi/openapi.yaml
|
add keep keep keep keep keep
|
<mask> :root {
<mask> --bgcolor: #f5f7fb;
<mask> --mcolor: #495057;
<mask> --scolor: rgba(74, 74, 74, 0.7);
<mask> --border-color: rgba(0, 40, 100, 0.12);
<mask> --header-bgcolor: #fff;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add --black: #ffffff; </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> add [data-theme=dark] .custom-switch-indicator {
opacity: 0.75;
}
</s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove border-color: #3e7a00;
</s> add border-color: #448700; </s> remove border-color: #448700;
</s> add border-color: #4b9400;
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/App/index.css
|
keep keep keep add keep keep keep keep keep keep
|
<mask> --green79: #67b279;
<mask> --gray-a5: #a5a5a5;
<mask> --gray-d8: #d8d8d8;
<mask> --gray-f3: #f3f3f3;
<mask> --font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
<mask> --font-size-disable-autozoom: 1rem;
<mask> }
<mask>
<mask> [data-theme="dark"] {
<mask> --black: #ffffff;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add --black: #ffffff; </s> remove --form-disabled-bgcolor: #3d3d3d;
</s> add --form-disabled-bgcolor: #2d2d2d; </s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
</s> remove --modal-overlay-bgcolor: #1c1c1c;
</s> add --modal-overlay-bgcolor: rgba(19, 19, 19, 0.75); </s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
</s> add [data-theme=dark] .dropdown-item {
color: #ffffff;
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/App/index.css
|
keep keep keep add keep keep keep keep keep keep
|
<mask> --font-size-disable-autozoom: 1rem;
<mask> }
<mask>
<mask> [data-theme="dark"] {
<mask> --bgcolor: #131313;
<mask> --mcolor: #e6e6e6;
<mask> --scolor: #a5a5a5;
<mask> --header-bgcolor: #131313;
<mask> --border-color: #222;
<mask> --card-bgcolor: #1c1c1c;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add --black: #131313; </s> add --loading-bg: rgba(255, 255, 255, 0.48); </s> add --gray300: #f3f3f3;
--loading-bg: #131313; </s> remove --modal-overlay-bgcolor: #1c1c1c;
</s> add --modal-overlay-bgcolor: rgba(19, 19, 19, 0.75); </s> remove --form-disabled-bgcolor: #3d3d3d;
</s> add --form-disabled-bgcolor: #2d2d2d; </s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/App/index.css
|
keep keep keep keep replace keep keep keep keep replace keep keep keep
|
<mask> --ctrl-dropdown-color: #fff;
<mask> --ctrl-dropdown-bgcolor-focus: #000;
<mask> --ctrl-dropdown-color-focus: #fff;
<mask> --btn-success-bgcolor: #67b279;
<mask> --form-disabled-bgcolor: #3d3d3d;
<mask> --form-disabled-color: #a5a5a5;
<mask> --logs__text-color: #f3f3f3;
<mask> --rt-nodata-bgcolor: #1c1c1c;
<mask> --rt-nodata-color: #fff;
<mask> --modal-overlay-bgcolor: #1c1c1c;
<mask> --logs__table-bgcolor: #3d3d3d;
<mask> --logs__row--blue-bgcolor: #467fcf;
<mask> --logs__row--white-bgcolor: #1c1c1c;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add --gray300: #f3f3f3;
--loading-bg: #131313; </s> add --black: #ffffff; </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> add --loading-bg: rgba(255, 255, 255, 0.48); </s> remove border-color: #3e7a00;
</s> add border-color: #448700;
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/App/index.css
|
keep keep add keep keep keep keep keep keep
|
<mask> --logs__row--blue-bgcolor: #467fcf;
<mask> --logs__row--white-bgcolor: #1c1c1c;
<mask> --detailed-info-color: #fff;
<mask> }
<mask>
<mask> body {
<mask> margin: 0;
<mask> padding: 0;
<mask> font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove --modal-overlay-bgcolor: #1c1c1c;
</s> add --modal-overlay-bgcolor: rgba(19, 19, 19, 0.75); </s> add [data-theme="dark"] .tooltip-custom__container .button-action--arrow-option:not(:disabled):hover {
background: var(--ctrl-dropdown-bgcolor-focus);
}
</s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
</s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> add [data-theme=dark] .login__logo {
filter: invert(1);
}
</s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/App/index.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> .counters__row {
<mask> display: flex;
<mask> align-items: center;
<mask> justify-content: space-between;
<mask> border-top: 1px solid #dee2e6;
<mask> padding: 0.75rem 1.5rem;
<mask> }
<mask>
<mask> .counters__column--value {
<mask> flex-shrink: 0;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e9ecef;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
</s> add .logs__modal-wrap {
padding: 1rem 1.5rem;
background-color: var(--card-bgcolor);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Dashboard/Dashboard.css
|
keep replace replace keep keep keep keep replace replace keep
|
<mask> .nav-tabs .nav-link.active {
<mask> border-color: var(--green-74);
<mask> color: var(--green-74);
<mask> background: transparent;
<mask> }
<mask>
<mask> .nav-tabs .nav-link.active:hover {
<mask> border-color: #58a273;
<mask> color: #58a273;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove border-color: #3e7a00;
</s> add border-color: #448700; </s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor); </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> add [data-theme=dark] .dropdown-item {
color: #ffffff;
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Header/Header.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> box-shadow: 2px 4px 8px rgba(0, 0, 0, 0.2);
<mask> border-radius: 4px !important;
<mask> pointer-events: auto !important;
<mask> background-color: var(--ctrl-bgcolor);
<mask> color: var(--scolor);
<mask> z-index: 102;
<mask> overflow-y: auto;
<mask> max-height: 100%;
<mask> }
<mask>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); </s> add [data-theme=dark] .icon--selected {
opacity: 0.75;
}
</s> add [data-theme="dark"] {
--red: rgba(223, 56, 18, 0.25);
--green-pale: rgba(103, 178, 121, 0.25);
--yellow: rgba(247, 181, 0, 0.2);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/Cells/IconTooltip.css
|
keep keep keep add keep keep keep keep
|
<mask> --btn-unblock-active: #4d4d4d;
<mask> --option-border-radius: 4px;
<mask> }
<mask>
<mask> .logs__text {
<mask> padding: 0 1px;
<mask> text-overflow: ellipsis;
<mask> white-space: nowrap;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
</s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> add [data-theme=dark] .icon--selected {
opacity: 0.75;
}
</s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/Logs.css
|
keep add keep keep keep keep keep
|
<mask> }
<mask>
<mask> .logs__text--bold {
<mask> font-weight: 600;
<mask> }
<mask>
<mask> .logs__time {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
</s> add .card-chart-bg {
color: var(--black);
}
</s> add [data-theme=dark] .setup__logo {
filter: invert(1);
}
</s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
</s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
</s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/Logs.css
|
keep add keep keep keep keep keep
|
<mask> }
<mask>
<mask> .text-pre {
<mask> white-space: pre-wrap !important;
<mask> overflow-wrap: break-word;
<mask> overflow: visible;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme="dark"] .tooltip-custom__container .button-action--arrow-option:not(:disabled):hover {
background: var(--ctrl-dropdown-bgcolor-focus);
}
</s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
</s> remove color: var(--scolor);
</s> add color: var(--mcolor); </s> add [data-theme="dark"] {
--red: rgba(223, 56, 18, 0.25);
--green-pale: rgba(103, 178, 121, 0.25);
--yellow: rgba(247, 181, 0, 0.2);
}
</s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/Logs.css
|
keep keep add keep keep keep keep keep
|
<mask> position: relative;
<mask> }
<mask>
<mask> .logs__cell--header__container > .logs__cell--header__item {
<mask> border-right: 0;
<mask> font-size: 1rem;
<mask> }
<mask>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .dropdown-item {
color: #ffffff;
}
</s> add .card-chart-bg {
color: var(--black);
}
</s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); </s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
</s> add [data-theme="dark"] .tooltip-custom__container .button-action--arrow-option:not(:disabled):hover {
background: var(--ctrl-dropdown-bgcolor-focus);
}
</s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/Logs.css
|
keep keep add keep keep keep keep
|
<mask> overflow: hidden;
<mask> }
<mask>
<mask> .button-action--arrow-option-container {
<mask> overflow: visible;
<mask> transform-origin: left;
<mask> padding: 1rem 0;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .icon--selected {
opacity: 0.75;
}
</s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> add .logs__modal-wrap {
padding: 1rem 1.5rem;
background-color: var(--card-bgcolor);
} </s> add --gray300: #f3f3f3;
--loading-bg: #131313; </s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
</s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/Logs.css
|
keep keep add keep keep keep keep keep
|
<mask> color: var(--green79);
<mask> }
<mask>
<mask> @media (max-width: 1024px) {
<mask> .logs__question {
<mask> display: none;
<mask> }
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .setup__container {
box-shadow: none;
border: 1px solid var(--card-border-color);
}
</s> add [data-theme=dark] .dropdown-item {
color: #ffffff;
}
</s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
</s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
</s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
</s> add .card-chart-bg {
color: var(--black);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/Logs.css
|
keep keep keep add
|
<mask>
<mask> .logs__modal {
<mask> max-width: 720px;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .setup__logo {
filter: invert(1);
}
</s> add [data-theme=dark] .login__logo {
filter: invert(1);
}
</s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
</s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
</s> add .card-chart-bg {
color: var(--black);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/Logs.css
|
keep keep replace keep keep keep replace keep keep keep
|
<mask> style={{
<mask> content: {
<mask> width: '100%',
<mask> height: 'fit-content',
<mask> left: '50%',
<mask> top: 47,
<mask> padding: '1rem 1.5rem 1rem',
<mask> maxWidth: '720px',
<mask> transform: 'translateX(-50%)',
<mask> },
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .custom-switch-indicator {
opacity: 0.75;
}
</s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); </s> add [data-theme=dark] .dropdown-item {
color: #ffffff;
}
</s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> remove stroke: 'black',
</s> add stroke: 'currentColor',
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Logs/index.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> flex-direction: row-reverse;
<mask> align-items: center;
<mask> margin-bottom: 15px;
<mask> padding: 10px 15px;
<mask> border: 1px solid #eee;
<mask> border-radius: 4px;
<mask> cursor: pointer;
<mask> }
<mask>
<mask> .service__text {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
</s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> remove border-bottom: 1px solid #e9ecef;
</s> add border-bottom: 1px solid var(--card-border-color);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/Settings/Clients/Service.css
|
keep keep replace keep keep keep keep keep
|
<mask> .dropdown-item.active,
<mask> .dropdown-item:active {
<mask> background-color: var(--green-74);
<mask> }
<mask>
<mask> .dropdown-menu {
<mask> cursor: default;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
</s> remove border-color: var(--green-74);
color: var(--green-74);
</s> add border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor); </s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
</s> add [data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-track {
background-color: var(--card-bgcolor);
}
[data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-thumb {
background-color: #888888;
}
</s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; </s> add .logs__modal-wrap {
padding: 1rem 1.5rem;
background-color: var(--card-bgcolor);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Dropdown.css
|
replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import { useTranslation } from 'react-i18next';
<mask> import { useDispatch, useSelector } from 'react-redux';
<mask> import classNames from 'classnames';
<mask>
<mask> import { REPOSITORY, PRIVACY_POLICY_LINK, THEMES } from '../../helpers/constants';
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { setHtmlLangAttr, setUITheme } from '../../helpers/helpers'; </s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
</s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
</s> add .card-chart-bg {
color: var(--black);
}
</s> add [data-theme=dark] .setup__logo {
filter: invert(1);
}
</s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Footer.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> import Version from './Version';
<mask> import './Footer.css';
<mask> import './Select.css';
<mask> import { setHtmlLangAttr } from '../../helpers/helpers';
<mask> import { changeTheme } from '../../actions';
<mask>
<mask> const linksData = [
<mask> {
<mask> href: REPOSITORY.URL,
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove import React from 'react';
</s> add import React, { useState, useEffect } from 'react'; </s> add const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
useEffect(() => {
if (!isLoggedIn) {
setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
}
}, []); </s> add const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
};
</s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Footer.js
|
keep add keep keep keep keep keep
|
<mask> const profileName = useSelector((state) => (state.dashboard ? state.dashboard.name : ''));
<mask> const isLoggedIn = profileName !== '';
<mask>
<mask> const getYear = () => {
<mask> const today = new Date();
<mask> return today.getFullYear();
<mask> };
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
};
</s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { setHtmlLangAttr, setUITheme } from '../../helpers/helpers'; </s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Footer.js
|
keep add keep keep keep keep keep
|
<mask> };
<mask>
<mask> const renderCopyright = () => <div className="footer__column">
<mask> <div className="footer__copyright">
<mask> {t('copyright')} © {getYear()}{' '}
<mask> <a target="_blank" rel="noopener noreferrer" href="https://link.adtidy.org/forward.html?action=home&from=ui&app=home">AdGuard</a>
<mask> </div>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
useEffect(() => {
if (!isLoggedIn) {
setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
}
}, []); </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()} </s> remove <img src={logo} className="h-6" alt="logo" />
</s> add <img src={logo} className="h-6 login__logo" alt="logo" /> </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Footer.js
|
keep keep keep replace replace replace replace keep replace keep keep
|
<mask> {t(name)}
<mask> </a>);
<mask>
<mask> const renderThemeSelect = (currentTheme, isLoggedIn) => {
<mask> if (!isLoggedIn) {
<mask> return '';
<mask> }
<mask>
<mask> return <select
<mask> className="form-control select select--theme"
<mask> value={currentTheme}
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> add const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
useEffect(() => {
if (!isLoggedIn) {
setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
}
}, []); </s> add const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
};
</s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { setHtmlLangAttr, setUITheme } from '../../helpers/helpers'; </s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Footer.js
|
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> className="form-control select select--theme"
<mask> value={currentTheme}
<mask> onChange={onThemeChanged}
<mask> >
<mask> {Object.values(THEMES)
<mask> .map((theme) => (
<mask> <option key={theme} value={theme}>
<mask> {t(`theme_${theme}`)}
<mask> </option>
<mask> ))}
<mask> </select>;
<mask> };
<mask>
<mask> return (
<mask> <>
<mask> <footer className="footer">
<mask> <div className="container">
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove <img src={logo} className="h-6" alt="logo" />
</s> add <img src={logo} className="h-6 login__logo" alt="logo" /> </s> add const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
};
</s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()} </s> add const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
useEffect(() => {
if (!isLoggedIn) {
setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
}
}, []);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Footer.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <div className="footer__column footer__column--links">
<mask> {renderLinks(linksData)}
<mask> </div>
<mask> <div className="footer__column footer__column--theme">
<mask> {renderThemeSelect(currentTheme, isLoggedIn)}
<mask> </div>
<mask> <div className="footer__column footer__column--language">
<mask> <select
<mask> className="form-control select select--language"
<mask> value={i18n.language}
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove <img src={logo} className="h-6" alt="logo" />
</s> add <img src={logo} className="h-6 login__logo" alt="logo" /> </s> add const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
};
</s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> add .ReactTable .-loading .-loading-inner {
color: var(--gray300);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Footer.js
|
keep keep keep add keep keep keep
|
<mask> .line__tooltip-text {
<mask> font-size: 0.7rem;
<mask> }
<mask>
<mask> .card-chart-bg path[d^="M0,32"] {
<mask> transform: translateY(32px);
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
</s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
</s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
</s> add [data-theme=dark] .setup__logo {
filter: invert(1);
}
</s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
</s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Line.css
|
keep keep keep replace keep replace keep keep keep keep
|
<mask> theme={{
<mask> crosshair: {
<mask> line: {
<mask> stroke: 'black',
<mask> strokeWidth: 1,
<mask> strokeOpacity: 0.35,
<mask> },
<mask> },
<mask> }}
<mask> xScale={{
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove padding: '1rem 1.5rem 1rem',
</s> add padding: '0', </s> add const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
useEffect(() => {
if (!isLoggedIn) {
setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
}
}, []); </s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
</s> add .card-chart-bg {
color: var(--black);
}
</s> add [data-theme=dark] .setup__logo {
filter: invert(1);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Line.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> left: 0;
<mask> z-index: 100;
<mask> width: 100%;
<mask> min-height: 100vh;
<mask> background-color: rgba(255, 255, 255, 0.48);
<mask> }
<mask>
<mask> .loading:after {
<mask> content: "";
<mask> position: fixed;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add --loading-bg: rgba(255, 255, 255, 0.48); </s> add [data-theme=dark] .custom-switch-indicator {
opacity: 0.75;
}
</s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
</s> remove width: '100%',
</s> add width: 'calc(100% - 32px)', </s> remove color: var(--scolor);
</s> add color: var(--mcolor); </s> add [data-theme=dark] .login__logo {
filter: invert(1);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Loading.css
|
keep add keep keep keep keep keep keep
|
<mask> }
<mask>
<mask> .ReactTable .-pagination input, .ReactTable .-pagination select {
<mask> color: var(--rt-nodata-color);
<mask> background-color: var(--rt-nodata-bgcolor);
<mask> }
<mask>
<mask> [data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-track {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-track {
background-color: var(--card-bgcolor);
}
[data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-thumb {
background-color: #888888;
}
</s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
</s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
</s> add [data-theme=dark] .dropdown-item {
color: #ffffff;
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/ReactTable.css
|
keep keep add keep keep keep keep
|
<mask> background-color: var(--rt-nodata-bgcolor);
<mask> }
<mask>
<mask> [data-theme=dark] .ReactTable .-pagination .-btn {
<mask> filter: invert(1);
<mask> }
<mask>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; </s> add .ReactTable .-loading .-loading-inner {
color: var(--gray300);
}
</s> add [data-theme=dark] .setup__logo {
filter: invert(1);
}
</s> add [data-theme=dark] .login__logo {
filter: invert(1);
}
</s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
</s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/ReactTable.css
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> background-color: var(--rt-nodata-bgcolor);
<mask> }
<mask>
<mask> [data-theme=dark] .ReactTable .-pagination .-btn {
<mask> color: var(--scolor);
<mask> background-color: var(--ctrl-bgcolor);
<mask> }
<mask>
<mask> .rt-tr-group.logs__row--red {
<mask> background-color: rgba(223, 56, 18, 0.05);
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-track {
background-color: var(--card-bgcolor);
}
[data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-thumb {
background-color: #888888;
}
</s> add .ReactTable .-loading .-loading-inner {
color: var(--gray300);
}
</s> remove color: var(--scolor);
</s> add color: var(--mcolor); </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor); </s> add [data-theme="dark"] {
--red: rgba(223, 56, 18, 0.25);
--green-pale: rgba(103, 178, 121, 0.25);
--yellow: rgba(247, 181, 0, 0.2);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/ReactTable.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> .btn-success {
<mask> color: #fff;
<mask> background-color: var(--btn-success-bgcolor);
<mask> border-color: #5eba00;
<mask> }
<mask>
<mask> .btn-success:hover {
<mask> color: #fff;
<mask> background-color: #4b9400;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> remove border-color: #3e7a00;
</s> add border-color: #448700; </s> remove border-color: var(--green-74);
color: var(--green-74);
</s> add border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor); </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor); </s> add .ReactTable .-loading .-loading-inner {
color: var(--gray300);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> .btn-success:hover {
<mask> color: #fff;
<mask> background-color: #4b9400;
<mask> border-color: #448700;
<mask> }
<mask>
<mask> .btn-success:focus,
<mask> .btn-success.focus {
<mask> box-shadow: 0 0 0 2px rgba(94, 186, 0, 0.5);
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> remove border-color: #3e7a00;
</s> add border-color: #448700; </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> add [data-theme="dark"] {
--red: rgba(223, 56, 18, 0.25);
--green-pale: rgba(103, 178, 121, 0.25);
--yellow: rgba(247, 181, 0, 0.2);
}
</s> remove color: var(--scolor);
</s> add color: var(--mcolor);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> .btn-success:not(:disabled):not(.disabled).active,
<mask> .show>.btn-success.dropdown-toggle {
<mask> color: #fff;
<mask> background-color: #448700;
<mask> border-color: #3e7a00;
<mask> }
<mask>
<mask> .btn-success:not(:disabled):not(.disabled):active:focus,
<mask> .btn-success:not(:disabled):not(.disabled).active:focus,
<mask> .show>.btn-success.dropdown-toggle:focus {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove border-color: var(--green-74);
color: var(--green-74);
</s> add border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor); </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> add .ReactTable .-loading .-loading-inner {
color: var(--gray300);
}
</s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1;
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep add keep keep keep keep keep keep
|
<mask> }
<mask>
<mask> .dropup .dropdown-menu {
<mask> margin-top: 0;
<mask> margin-bottom: 0.125rem;
<mask> }
<mask>
<mask> .dropup .dropdown-toggle::after {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor); </s> add [data-theme=dark] .setup__logo {
filter: invert(1);
}
</s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
</s> add [data-theme="dark"] .tooltip-custom__container .button-action--arrow-option:not(:disabled):hover {
background: var(--ctrl-dropdown-bgcolor-focus);
}
</s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> align-items: flex-start;
<mask> -ms-flex-pack: justify;
<mask> justify-content: space-between;
<mask> padding: 1rem;
<mask> border-bottom: 1px solid #e9ecef;
<mask> border-top-left-radius: 3px;
<mask> border-top-right-radius: 3px;
<mask> }
<mask>
<mask> .modal-header .close {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> add [data-theme=dark] .dropdown-menu-arrow:after {
border-bottom: 5px solid var(--card-border-color);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> align-items: center;
<mask> -ms-flex-pack: end;
<mask> justify-content: flex-end;
<mask> padding: 1rem;
<mask> border-top: 1px solid #e9ecef;
<mask> }
<mask>
<mask> .modal-footer> :not(:first-child) {
<mask> margin-left: 0.25rem;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-bottom: 1px solid #e9ecef;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> add [data-theme=dark] .setup__container {
box-shadow: none;
border: 1px solid var(--card-border-color);
}
</s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep keep add keep keep keep keep keep keep
|
<mask> color: #6e7687;
<mask> }
<mask>
<mask> .dropdown-menu-arrow:before {
<mask> position: absolute;
<mask> top: -6px;
<mask> left: 12px;
<mask> display: inline-block;
<mask> border-right: 5px solid transparent;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .dropdown-menu-arrow:after {
border-bottom: 5px solid var(--card-border-color);
}
</s> add [data-theme=dark] .custom-switch-indicator {
opacity: 0.75;
}
</s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
</s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
</s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> remove border-color: var(--green-74);
color: var(--green-74);
</s> add border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep add keep keep keep keep keep keep
|
<mask> }
<mask>
<mask> .dropdown-menu-arrow.dropdown-menu-right:before,
<mask> .dropdown-menu-arrow.dropdown-menu-right:after {
<mask> left: auto;
<mask> right: 12px;
<mask> }
<mask>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .dropdown-item {
color: #ffffff;
}
</s> add [data-theme=dark] .login__logo {
filter: invert(1);
}
</s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
</s> add [data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep keep keep add keep keep keep keep keep keep
|
<mask> border: 1px solid rgba(0, 40, 100, 0.12);
<mask> transition: 0.3s border-color, 0.3s background-color;
<mask> }
<mask>
<mask> .custom-switch-indicator:before {
<mask> content: "";
<mask> position: absolute;
<mask> height: calc(1.25rem - 4px);
<mask> width: calc(1.25rem - 4px);
<mask> top: 1px;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove width: '100%',
</s> add width: 'calc(100% - 32px)', </s> add --black: #131313; </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); </s> add [data-theme=dark] .dropdown-item {
color: #ffffff;
}
</s> add [data-theme=dark] .setup__container {
box-shadow: none;
border: 1px solid var(--card-border-color);
}
</s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabler.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> display: flex;
<mask> justify-content: space-between;
<mask> margin-bottom: 15px;
<mask> padding: 10px 0;
<mask> border-bottom: 1px solid #e8e8e8;
<mask> overflow: auto;
<mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
<mask> .tabs__controls {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> add [data-theme=dark] .setup__container {
box-shadow: none;
border: 1px solid var(--card-border-color);
}
</s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e9ecef;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabs.css
|
keep keep keep add keep keep keep keep keep
|
<mask> cursor: pointer;
<mask> opacity: 0.6;
<mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
<mask> .tab__control {
<mask> white-space: normal;
<mask> }
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .setup__container {
box-shadow: none;
border: 1px solid var(--card-border-color);
}
</s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
</s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> add [data-theme=dark] .icon--selected {
opacity: 0.75;
}
</s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/components/ui/Tabs.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> max-width: 650px;
<mask> margin: 0 auto;
<mask> padding: 30px 20px;
<mask> line-height: 1.6;
<mask> background-color: #fff;
<mask> box-shadow: 0 1px 4px rgba(74, 74, 74, 0.36);
<mask> border-radius: 3px;
<mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add [data-theme=dark] .setup__container {
box-shadow: none;
border: 1px solid var(--card-border-color);
}
</s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> add --black: #131313; </s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
</s> remove color: var(--scolor);
</s> add color: var(--mcolor);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/install/Setup/Setup.css
|
keep add keep keep keep keep
|
<mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
<mask> .setup__container {
<mask> width: 650px;
<mask> padding: 40px 30px;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> add [data-theme=dark] .tab__control {
filter: invert(1);
}
</s> add @media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
</s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> add [data-theme=dark] .login__logo {
filter: invert(1);
}
</s> add [data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/install/Setup/Setup.css
|
keep keep add keep keep keep keep keep keep
|
<mask> max-width: 140px;
<mask> }
<mask>
<mask> .setup__nav {
<mask> text-align: center;
<mask> }
<mask>
<mask> .setup__step {
<mask> margin-bottom: 25px;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> add .logs__modal-wrap {
padding: 1rem 1.5rem;
background-color: var(--card-bgcolor);
} </s> add [data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
</s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> add [data-theme=dark] .login__logo {
filter: invert(1);
}
</s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/install/Setup/Setup.css
|
keep add keep keep keep keep keep keep
|
<mask> }
<mask>
<mask> .login__form {
<mask> margin: auto;
<mask> padding: 40px 15px 100px;
<mask> width: 100%;
<mask> max-width: 24rem;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> add [data-theme=dark] .setup__container {
box-shadow: none;
border: 1px solid var(--card-border-color);
}
</s> add .logs__modal-wrap {
padding: 1rem 1.5rem;
background-color: var(--card-bgcolor);
} </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); </s> add [data-theme=dark] .setup__logo {
filter: invert(1);
}
</s> add [data-theme=dark] .dropdown-menu-arrow:after {
border-bottom: 5px solid var(--card-border-color);
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/login/Login/Login.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return (
<mask> <div className="login">
<mask> <div className="login__form">
<mask> <div className="text-center mb-6">
<mask> <img src={logo} className="h-6" alt="logo" />
<mask> </div>
<mask> <Form onSubmit={this.handleSubmit} processing={processingLogin} />
<mask> <div className="login__info">
<mask> <button
<mask> type="button"
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()} </s> add const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
};
</s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> add const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
useEffect(() => {
if (!isLoggedIn) {
setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
}
}, []);
|
https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24
|
client/src/login/Login/index.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.1'
<mask>
<mask> 'stages':
<mask> - 'Make release':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <[email protected]>
Date: Wed Jul 14 12:04:59 2021 +0300
bamboo-specs: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3'
|
https://github.com/AdguardTeam/AdGuardHome/commit/4684c8e4ed83e904d705a501e30aa52a0bfe33b4
|
bamboo-specs/release.yaml
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.1'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Build final releases on release branches manually.
<mask> 'triggers': []
</s> Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <[email protected]>
Date: Wed Jul 14 12:04:59 2021 +0300
bamboo-specs: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3'
|
https://github.com/AdguardTeam/AdGuardHome/commit/4684c8e4ed83e904d705a501e30aa52a0bfe33b4
|
bamboo-specs/release.yaml
|
keep keep keep keep replace
|
<mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <[email protected]>
Date: Wed Jul 14 12:04:59 2021 +0300
bamboo-specs: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3'
|
https://github.com/AdguardTeam/AdGuardHome/commit/4684c8e4ed83e904d705a501e30aa52a0bfe33b4
|
bamboo-specs/release.yaml
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.1'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <[email protected]>
Date: Wed Jul 14 12:04:59 2021 +0300
bamboo-specs: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3'
|
https://github.com/AdguardTeam/AdGuardHome/commit/4684c8e4ed83e904d705a501e30aa52a0bfe33b4
|
bamboo-specs/test.yaml
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.40.0
<mask> github.com/AdguardTeam/golibs v0.10.3
<mask> github.com/AdguardTeam/urlfilter v0.15.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: all: opt log levels
Updates #3929.
Squashed commit of the following:
commit bfb2361d81a0667c36193484ca125d08e5638b21
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 24 17:23:39 2021 +0300
all: opt log levels </s> remove github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ=
github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
</s> add github.com/AdguardTeam/dnsproxy v0.40.1 h1:lYNi7VeCBhmdyf5xEUxfj84ikgiz5cjzocL9moiIRhk=
github.com/AdguardTeam/dnsproxy v0.40.1/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove log.Error("error while shutting down http server %q: %s", srv.Addr, err)
</s> add if errors.Is(err, context.Canceled) {
log.Debug("shutting down http server %q: %s", srv.Addr, err)
} else {
log.Error("shutting down http server %q: %s", srv.Addr, err)
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46cd974e2a5cda25032e44c525a164a0989ee061
|
go.mod
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ=
<mask> github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.9.2/go.mod h1:fCAMwPBJ8S7YMYbTWvYS+eeTLblP5E04IDtNAo7y7IY=
<mask> github.com/AdguardTeam/golibs v0.10.3 h1:FBgk17zf35ESVWQKIqEUiqqB2bDaCBC8X5vMU760yB4=
<mask> github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
</s> Pull request: all: opt log levels
Updates #3929.
Squashed commit of the following:
commit bfb2361d81a0667c36193484ca125d08e5638b21
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 24 17:23:39 2021 +0300
all: opt log levels </s> remove github.com/AdguardTeam/dnsproxy v0.40.0
</s> add github.com/AdguardTeam/dnsproxy v0.40.1 </s> remove log.Error("error while shutting down http server %q: %s", srv.Addr, err)
</s> add if errors.Is(err, context.Canceled) {
log.Debug("shutting down http server %q: %s", srv.Addr, err)
} else {
log.Error("shutting down http server %q: %s", srv.Addr, err)
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/46cd974e2a5cda25032e44c525a164a0989ee061
|
go.sum
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> err := srv.Shutdown(ctx)
<mask> if err != nil {
<mask> log.Error("error while shutting down http server %q: %s", srv.Addr, err)
<mask> }
<mask> }
<mask>
<mask> // Apply new configuration, start DNS server, restart Web server
<mask> func (web *Web) handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
</s> Pull request: all: opt log levels
Updates #3929.
Squashed commit of the following:
commit bfb2361d81a0667c36193484ca125d08e5638b21
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 24 17:23:39 2021 +0300
all: opt log levels </s> remove github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ=
github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
</s> add github.com/AdguardTeam/dnsproxy v0.40.1 h1:lYNi7VeCBhmdyf5xEUxfj84ikgiz5cjzocL9moiIRhk=
github.com/AdguardTeam/dnsproxy v0.40.1/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove github.com/AdguardTeam/dnsproxy v0.40.0
</s> add github.com/AdguardTeam/dnsproxy v0.40.1
|
https://github.com/AdguardTeam/AdGuardHome/commit/46cd974e2a5cda25032e44c525a164a0989ee061
|
internal/home/controlinstall.go
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "path-exists": "^3.0.0"
<mask> }
<mask> },
<mask> "lodash": {
<mask> "version": "4.17.15",
<mask> "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
<mask> "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
<mask> },
<mask> "lodash-es": {
<mask> "version": "4.17.15",
<mask> "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
<mask> "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove .container {
padding: 0 !important;
}
</s> add </s> add padding-left: 24px;
padding-right: 24px; </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove "lodash": "^4.17.15",
</s> add "lodash": "^4.17.19", </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px;
|
https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309
|
client/package-lock.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "dev": true
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "snapdragon-util": {
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" </s> remove .container {
padding: 0 !important;
}
</s> add </s> add padding-left: 24px;
padding-right: 24px; </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove <form className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
</s> add <form
className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
|
https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309
|
client/package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "date-fns": "^1.29.0",
<mask> "i18next": "^19.4.4",
<mask> "i18next-browser-languagedetector": "^4.2.0",
<mask> "ipaddr.js": "^1.9.1",
<mask> "lodash": "^4.17.15",
<mask> "nanoid": "^3.1.9",
<mask> "prop-types": "^15.7.2",
<mask> "query-string": "^6.13.1",
<mask> "react": "^16.13.1",
<mask> "react-click-outside": "^3.0.1",
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" </s> add padding-left: 24px;
padding-right: 24px; </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove }) => <option key={label} value={query}
disabled={disabled}>{t(label)}</option>)}
</s> add }) => (
<option
key={label}
value={query}
disabled={disabled}
>
{t(label)}
</option>
))
} </s> remove className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left ml-small form-control--transparent', responseStatusClass)}
</s> add className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left form-control--transparent', responseStatusClass)}
|
https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309
|
client/package.json
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> @media screen and (max-width: 992px) {
<mask> .container {
<mask> padding: 0 !important;
<mask> }
<mask>
<mask> .container--wrap {
<mask> min-height: calc(100vh);
<mask> }
<mask> }
<mask>
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> add padding-left: 24px;
padding-right: 24px; </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" </s> remove }) => <option key={label} value={query}
disabled={disabled}>{t(label)}</option>)}
</s> add }) => (
<option
key={label}
value={query}
disabled={disabled}
>
{t(label)}
</option>
))
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309
|
client/src/components/App/index.css
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask>
<mask> const normalizeOnBlur = (data) => data.trim();
<mask>
<mask> return (
<mask> <form className="d-flex flex-wrap form-control--container"
<mask> onSubmit={(e) => {
<mask> e.preventDefault();
<mask> }}
<mask> >
<mask> <div className="field__search">
<mask> <Field
<mask> id={FORM_NAMES.search}
<mask> name={FORM_NAMES.search}
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left ml-small form-control--transparent', responseStatusClass)}
</s> add className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left form-control--transparent', responseStatusClass)} </s> remove }) => <option key={label} value={query}
disabled={disabled}>{t(label)}</option>)}
</s> add }) => (
<option
key={label}
value={query}
disabled={disabled}
>
{t(label)}
</option>
))
} </s> add padding-left: 24px;
padding-right: 24px; </s> remove .container {
padding: 0 !important;
}
</s> add </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important;
|
https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309
|
client/src/components/Logs/Filters/Form.js
|
keep replace keep keep keep keep replace replace keep
|
<mask> component="select"
<mask> className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left ml-small form-control--transparent', responseStatusClass)}
<mask> >
<mask> {Object.values(RESPONSE_FILTER)
<mask> .map(({
<mask> query, label, disabled,
<mask> }) => <option key={label} value={query}
<mask> disabled={disabled}>{t(label)}</option>)}
<mask> </Field>
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove <form className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
</s> add <form
className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}} </s> add padding-left: 24px;
padding-right: 24px; </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove .container {
padding: 0 !important;
}
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309
|
client/src/components/Logs/Filters/Form.js
|
keep keep keep keep replace replace keep keep keep replace
|
<mask> cursor: pointer;
<mask> }
<mask>
<mask> .custom-select__arrow--left {
<mask> background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
<mask> background-size: 1.5rem;
<mask> }
<mask>
<mask> .custom-select--logs {
<mask> padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove .container {
padding: 0 !important;
}
</s> add </s> add padding-left: 24px;
padding-right: 24px; </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" </s> remove <form className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
</s> add <form
className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
|
https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309
|
client/src/components/Logs/Logs.css
|
keep keep keep add keep keep keep keep keep
|
<mask> }
<mask>
<mask> .field__select {
<mask> margin-top: 1.5rem;
<mask> }
<mask> }
<mask>
<mask> @media (max-width: 575px) {
<mask> .logs__table .rt-tr {
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove .container {
padding: 0 !important;
}
</s> add </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" </s> remove <form className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
</s> add <form
className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
|
https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309
|
client/src/components/Logs/Logs.css
|
keep keep keep add keep keep keep keep keep
|
<mask> }
<mask>
<mask> // Sets up a timer that will be checking for filters updates periodically
<mask> func periodicallyRefreshFilters() {
<mask> for {
<mask> isNetworkErr := false
<mask> if config.DNS.FiltersUpdateIntervalHours != 0 && refreshStatus == 0 {
<mask> refreshStatus = 1
<mask> refreshLock.Lock()
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> add isNetworkErr := false </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> add if nUpdated != 0 {
intval = maxInterval
}
}
if isNetworkErr {
intval *= 2
if intval > maxInterval {
intval = maxInterval
} </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) </s> add if nfail == len(updateFilters) {
return 0, true
}
</s> add nfail := 0
|
https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f
|
home/filter.go
|
keep add keep keep keep keep
|
<mask> nUpdated := 0
<mask> for {
<mask> if config.DNS.FiltersUpdateIntervalHours != 0 && refreshStatus == 0 {
<mask> refreshStatus = 1
<mask> refreshLock.Lock()
<mask> nUpdated, isNetworkErr = refreshFiltersIfNecessary(false)
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> add const maxInterval = 1 * 60 * 60
intval := 5 // use a dynamically increasing time interval
nUpdated := 0 </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) </s> add if nUpdated != 0 {
intval = maxInterval
}
}
if isNetworkErr {
intval *= 2
if intval > maxInterval {
intval = maxInterval
} </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) </s> add nfail := 0
|
https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f
|
home/filter.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> for {
<mask> if config.DNS.FiltersUpdateIntervalHours != 0 && refreshStatus == 0 {
<mask> refreshStatus = 1
<mask> refreshLock.Lock()
<mask> _ = refreshFiltersIfNecessary(false)
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> }
<mask> time.Sleep(1 * time.Hour)
<mask> }
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) </s> add isNetworkErr := false </s> add const maxInterval = 1 * 60 * 60
intval := 5 // use a dynamically increasing time interval
nUpdated := 0 </s> add if nUpdated != 0 {
intval = maxInterval
}
}
if isNetworkErr {
intval *= 2
if intval > maxInterval {
intval = maxInterval
} </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) </s> add nfail := 0
|
https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f
|
home/filter.go
|
keep add keep keep keep keep keep keep
|
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> }
<mask>
<mask> time.Sleep(time.Duration(intval) * time.Second)
<mask> }
<mask> }
<mask>
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) </s> add const maxInterval = 1 * 60 * 60
intval := 5 // use a dynamically increasing time interval
nUpdated := 0 </s> add nfail++ </s> add if nfail == len(updateFilters) {
return 0, true
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f
|
home/filter.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> _ = refreshFiltersIfNecessary(false)
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> }
<mask> time.Sleep(1 * time.Hour)
<mask> }
<mask> }
<mask>
<mask> // Refresh filters
<mask> func refreshFilters() (int, error) {
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> add if nUpdated != 0 {
intval = maxInterval
}
}
if isNetworkErr {
intval *= 2
if intval > maxInterval {
intval = maxInterval
} </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) </s> add const maxInterval = 1 * 60 * 60
intval := 5 // use a dynamically increasing time interval
nUpdated := 0 </s> add isNetworkErr := false </s> remove func refreshFiltersIfNecessary(force bool) int {
</s> add //
// Return the number of updated filters
// Return TRUE - there was a network error and nothing could be updated
func refreshFiltersIfNecessary(force bool) (int, bool) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f
|
home/filter.go
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.