Commit Graph
1059 Commits
Author SHA1 Message Date
dependabot-preview[bot] ab314bd48e Bump jest-enzyme from 7.0.1 to 7.0.2
Bumps [jest-enzyme](https://github.com/FormidableLabs/enzyme-matchers) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/FormidableLabs/enzyme-matchers/releases)
- [Changelog](https://github.com/FormidableLabs/enzyme-matchers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FormidableLabs/enzyme-matchers/compare/v7.0.1...v7.0.2)
2019-05-29 03:35:54 +00:00
Mark Drobnak 314407fba1 Merge pull request #183 from pi-hole/tweak/context-sidebar-tests
Context and sidebar test coverage
2019-05-28 20:47:10 -04:00
Mcat12 4a33d28942 Merge branch 'development' into tweak/context-sidebar-tests
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

# Conflicts:
#	package-lock.json
#	package.json
2019-05-28 17:41:38 -07:00
Mark Drobnak 65b63db7d7 Merge pull request #216 from pi-hole/feature/top-blocked-clients
Top Blocked Clients
2019-05-28 15:57:37 -04:00
Mark Drobnak 72353d2a71 Merge branch 'development' into feature/top-blocked-clients 2019-05-28 15:54:19 -04:00
Mark Drobnak 5b7ebac094 Merge pull request #223 from pi-hole/feature/ipv6-upstreams
Support IPv6 upstream servers
2019-05-28 15:53:27 -04:00
Mark Drobnak 02f41802cc Merge branch 'development' into feature/ipv6-upstreams 2019-05-28 15:39:39 -04:00
Mark Drobnak b9131d380f Merge pull request #182 from pi-hole/fix/reload-after-status-change
Fix reloading the page after a status change
2019-05-28 15:39:26 -04:00
Mark Drobnak ed4d03c0a7 Merge branch 'development' into fix/reload-after-status-change 2019-05-28 15:36:57 -04:00
Mcat12 ede891c9e1 Allow IPv6 upstreams in the DNS settings
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-27 17:47:32 -07:00
Mcat12 6bb15d607d Add isValidIpv6OptionalPort
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-27 17:40:48 -07:00
Mcat12 b3352edbf8 Add missing return type for validation functions
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-27 17:21:18 -07:00
Mark Drobnak 7dffe3fa9d Merge pull request #189 from pi-hole/dependabot/npm_and_yarn/development/@types/reactstrap-8.0.1
Bump @types/reactstrap from 6.4.4 to 8.0.1
2019-05-27 17:42:09 -04:00
dependabot-preview[bot] 7207c47198 Bump @types/reactstrap from 6.4.4 to 8.0.1
Bumps [@types/reactstrap](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/reactstrap) from 6.4.4 to 8.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/reactstrap)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-27 21:38:33 +00:00
Mark Drobnak 8493730e2a Merge pull request #222 from pi-hole/dependabot/npm_and_yarn/development/reactstrap-8.0.0
Bump reactstrap from 7.1.0 to 8.0.0
2019-05-27 17:35:54 -04:00
dependabot-preview[bot] c92a1eb3c1 Bump reactstrap from 7.1.0 to 8.0.0
Bumps [reactstrap](https://github.com/reactstrap/reactstrap) from 7.1.0 to 8.0.0.
- [Release notes](https://github.com/reactstrap/reactstrap/releases)
- [Changelog](https://github.com/reactstrap/reactstrap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reactstrap/reactstrap/compare/7.1.0...8.0.0)
2019-05-27 21:32:37 +00:00
Mark Drobnak 9b902a7a00 Merge pull request #219 from pi-hole/dependabot/npm_and_yarn/development/react-router-dom-5.0.0
Bump react-router-dom from 4.3.1 to 5.0.0
2019-05-27 17:30:05 -04:00
Mcat12 c34b9b9be3 Fix react-table crash when no action is available for a row
The render method was not returning anything if nothing was to be shown,
but it should have been returning null. This was introduced in a
previous dependency upgrade, but was only found while testing this one.

See tannerlinsley/react-table#1286

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-27 14:27:50 -07:00
dependabot-preview[bot] acf1225e23 Bump react-router-dom from 4.3.1 to 5.0.0
Bumps [react-router-dom](https://github.com/ReactTraining/react-router) from 4.3.1 to 5.0.0.
- [Release notes](https://github.com/ReactTraining/react-router/releases)
- [Commits](https://github.com/ReactTraining/react-router/compare/v4.3.1...v5.0.0)
2019-05-27 21:07:08 +00:00
Mark Drobnak 8716b30dfa Merge pull request #218 from pi-hole/dependabot/npm_and_yarn/development/@types/chart.js-2.7.52
Bump @types/chart.js from 2.7.42 to 2.7.52
2019-05-27 17:04:16 -04:00
Mcat12 29f1a4e2d8 Fix type errors in chart tooltip callbacks
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-27 13:54:36 -07:00
dependabot-preview[bot] c8e654b2cf Bump @types/chart.js from 2.7.42 to 2.7.52
Bumps [@types/chart.js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chart.js) from 2.7.42 to 2.7.52.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chart.js)
2019-05-27 20:47:21 +00:00
Mark Drobnak 63951fe1a8 Merge pull request #221 from pi-hole/dependabot/npm_and_yarn/development/enzyme-adapter-react-16-1.13.2
Bump enzyme-adapter-react-16 from 1.7.1 to 1.13.2
2019-05-27 16:43:43 -04:00
dependabot-preview[bot] f026d39c9e Bump enzyme-adapter-react-16 from 1.7.1 to 1.13.2
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.7.1 to 1.13.2.
- [Release notes](https://github.com/airbnb/enzyme/releases)
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.13.2/packages/enzyme-adapter-react-16)
2019-05-27 20:39:03 +00:00
Mark Drobnak d2e74974e9 Merge pull request #220 from pi-hole/dependabot/npm_and_yarn/development/typescript-3.4.5
Bump typescript from 3.2.4 to 3.4.5
2019-05-27 16:32:30 -04:00
dependabot-preview[bot] da6a257c6b Bump typescript from 3.2.4 to 3.4.5
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.2.4 to 3.4.5.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v3.2.4...v3.4.5)
2019-05-27 13:40:52 +00:00
Mark Drobnak 77ae3cd8f3 Merge pull request #211 from pi-hole/dependabot/npm_and_yarn/development/react-table-6.10.0
Bump react-table from 6.8.6 to 6.10.0
2019-05-27 00:28:55 -04:00
dependabot-preview[bot] edf4cb428a Bump react-table from 6.8.6 to 6.10.0
Bumps [react-table](https://github.com/react-tools/react-table) from 6.8.6 to 6.10.0.
- [Release notes](https://github.com/react-tools/react-table/releases)
- [Changelog](https://github.com/tannerlinsley/react-table/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-tools/react-table/commits)
2019-05-27 04:21:27 +00:00
Mark Drobnak a299ccea8f Merge pull request #215 from pi-hole/dependabot/npm_and_yarn/development/react-transition-group-4.0.1
Remove react-transition-group
2019-05-27 00:19:09 -04:00
Mcat12 369c64fd22 Remove react-transition-group
This dependency was never directly used, but is used by other
dependencies. As it is not directly used, we should allow the libraries
to choose the correct version instead of us.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-26 21:16:41 -07:00
dependabot-preview[bot] 8166461263 Bump react-transition-group from 2.5.3 to 4.0.1
Bumps [react-transition-group](https://github.com/reactjs/react-transition-group) from 2.5.3 to 4.0.1.
- [Release notes](https://github.com/reactjs/react-transition-group/releases)
- [Changelog](https://github.com/reactjs/react-transition-group/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reactjs/react-transition-group/compare/v2.5.3...v4.0.1)
2019-05-27 04:13:23 +00:00
Mark Drobnak f58db2ce25 Merge pull request #214 from pi-hole/dependabot/npm_and_yarn/development/chart.js-2.8.0
Bump chart.js from 2.7.3 to 2.8.0
2019-05-27 00:04:26 -04:00
dependabot-preview[bot] 60c98b6bd3 Bump chart.js from 2.7.3 to 2.8.0
Bumps [chart.js](https://github.com/chartjs/Chart.js) from 2.7.3 to 2.8.0.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v2.7.3...v2.8.0)
2019-05-27 04:00:55 +00:00
Mark Drobnak 375c079157 Merge pull request #213 from pi-hole/dependabot/npm_and_yarn/development/ionicons-4.5.8
Bump ionicons from 4.5.1 to 4.5.8
2019-05-26 23:58:22 -04:00
dependabot-preview[bot] 532da8339c Bump ionicons from 4.5.1 to 4.5.8
Bumps [ionicons](https://github.com/ionic-team/ionicons) from 4.5.1 to 4.5.8.
- [Release notes](https://github.com/ionic-team/ionicons/releases)
- [Commits](https://github.com/ionic-team/ionicons/compare/v4.5.1...v4.5.8)
2019-05-27 03:55:08 +00:00
Mark Drobnak 617140d82f Merge pull request #212 from pi-hole/dependabot/npm_and_yarn/development/fs-extra-8.0.1
Bump fs-extra from 7.0.1 to 8.0.1
2019-05-26 23:52:38 -04:00
Mcat12 e106624a58 Add tests and fix some top blocked clients naming
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-26 20:47:05 -07:00
Mcat12 70e4bb1f85 Fix white bottom border on the header
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-26 18:19:08 -07:00
Mcat12 9ad526ae38 Add TopBlockedClients to the dashboard and fix layout
When the dashboard is not wide enough, the two-column layout becomes one
column. Also, the top lists are now two rows of two columns instead of
one row of three columns.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-26 18:18:38 -07:00
Mcat12 113eddd2e3 Add top blocked client fake data
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-26 18:16:36 -07:00
Mcat12 6fd96e11c6 Add TopBlockedClients component
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-26 18:16:05 -07:00
Mcat12 89cf5931f4 Rename TopBlocked to TopBlockedDomains
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-26 17:37:46 -07:00
dependabot-preview[bot] 45d64ed92a Bump fs-extra from 7.0.1 to 8.0.1
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 7.0.1 to 8.0.1.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/commits)
2019-05-27 00:26:28 +00:00
Mark Drobnak 2ec89f2753 Merge pull request #202 from pi-hole/l10n_development
New Crowdin translations
2019-05-26 20:22:10 -04:00
Mark Drobnak 7496a148eb Merge branch 'development' into l10n_development 2019-05-26 20:20:47 -04:00
Mark Drobnak a80cdeace0 Merge pull request #209 from pi-hole/dependabot/npm_and_yarn/development/@types/enzyme-adapter-react-16-1.0.5
Bump @types/enzyme-adapter-react-16 from 1.0.3 to 1.0.5
2019-05-26 20:20:26 -04:00
dependabot-preview[bot] 10859e3857 Bump @types/enzyme-adapter-react-16 from 1.0.3 to 1.0.5
Bumps [@types/enzyme-adapter-react-16](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/enzyme-adapter-react-16) from 1.0.3 to 1.0.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/enzyme-adapter-react-16)
2019-05-27 00:15:44 +00:00
Mark Drobnak 1a29c4abb9 Merge pull request #210 from pi-hole/dependabot/npm_and_yarn/development/@types/enzyme-3.9.3
Bump @types/enzyme from 3.1.15 to 3.9.3
2019-05-26 20:13:11 -04:00
dependabot-preview[bot] f1ac4381db Bump @types/enzyme from 3.1.15 to 3.9.3
Bumps [@types/enzyme](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/enzyme) from 3.1.15 to 3.9.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/enzyme)
2019-05-27 00:11:36 +00:00
Mark Drobnak 911986d717 Merge pull request #208 from pi-hole/dependabot/npm_and_yarn/development/@coreui/coreui-plugin-chartjs-custom-tooltips-1.3.0
Remove @coreui/coreui-plugin-chartjs-custom-tooltips
2019-05-26 20:02:19 -04:00