Commit Graph
1202 Commits
Author SHA1 Message Date
Mcat12 e692d271b7 Use another defaultProps method for NavButton
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:52:07 -07:00
Mcat12 87ad853e3d Export ClientsGraphContainer instead of using a default export
Also removed the unnecessary `props: any` argument, and fixed a type
issue where the chart expected strings instead of dates.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:52:04 -07:00
Mcat12 78dac44874 Use moment in the ClientsGraph tooltip title to fix negative date error
If a data point fell in the first 4 minutes of the hour, the "from" date
would be shown as negative, as it is supposed to be 5 minutes before the
data point's date (and "to" is 5 minutes after). Moment will correctly
handle this and other possible issues.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:52:01 -07:00
Mcat12 7c3c8ce5f4 Remove unnecessary tooltip functions in ClientsGraph
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:51:57 -07:00
Mark Drobnak b1def4c497 Merge pull request #286 from pi-hole/tweak/upload-sftp
Use SFTP to upload build artifacts
2019-06-17 01:29:39 -04:00
Mcat12 351dd7b8f7 Use SFTP to upload build artifacts
FTL-server has been shut down in favor of SFTP.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-16 16:00:52 -07:00
Mark Drobnak 5a82cf89e4 Merge pull request #279 from pi-hole/tweak/opendns-ipv6
Use the filtered IPv6 OpenDNS servers
2019-06-16 14:39:13 -04:00
Mark Drobnak b6c80ead29 Merge branch 'development' into tweak/opendns-ipv6 2019-06-16 14:37:22 -04:00
Mark Drobnak 12a82d5a6c Merge pull request #278 from pi-hole/tweak/with-api-data-tests
Add WithAPIData tests
2019-06-16 14:37:09 -04:00
Mark Drobnak e736c3853e Merge branch 'development' into tweak/with-api-data-tests 2019-06-16 14:33:17 -04:00
Mark Drobnak bc2a125a4c Merge pull request #284 from pi-hole/dependabot/npm_and_yarn/development/typescript-3.5.2
Bump typescript from 3.5.1 to 3.5.2
2019-06-15 23:50:47 -04:00
dependabot-preview[bot] 2b58777dea Bump typescript from 3.5.1 to 3.5.2
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v3.5.1...v3.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-16 03:34:00 +00:00
Mark Drobnak 601b2ed5d0 Merge pull request #285 from pi-hole/dependabot/npm_and_yarn/development/@types/react-router-dom-4.3.4
Bump @types/react-router-dom from 4.3.3 to 4.3.4
2019-06-15 23:30:21 -04:00
dependabot-preview[bot] 5ff00d6c8c Bump @types/react-router-dom from 4.3.3 to 4.3.4
Bumps [@types/react-router-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-router-dom) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-router-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-16 03:27:23 +00:00
Mark Drobnak 37d33f5b23 Merge pull request #283 from pi-hole/dependabot/npm_and_yarn/development/@types/react-16.8.20
Bump @types/react from 16.8.19 to 16.8.20
2019-06-15 23:23:59 -04:00
dependabot-preview[bot] fdffe32edd Bump @types/react from 16.8.19 to 16.8.20
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 16.8.19 to 16.8.20.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-16 02:19:25 +00:00
Mark Drobnak 627b5fb123 Merge pull request #281 from isdampe/isdampe_ftl_style
Adds styling to the FTL settings tab, fixes #166
2019-06-15 22:16:47 -04:00
Mark Drobnak 6f6c3bd30d Merge branch 'development' into isdampe_ftl_style 2019-06-15 22:15:09 -04:00
Richard Denton 1d560ac3cc Fix mismatching labels, correct usage of toLocaleString(), ensure formatter has been run
Signed-off-by: Richard Denton <isdampe@gmail.com>
2019-06-16 08:56:16 +08:00
Richard Denton fd14e4fe9e Adds styling to the FTL settings tab, fixes #166
Signed-off-by: Richard Denton <isdampe@gmail.com>
2019-06-15 08:40:30 +08:00
Mark Drobnak 1e98a5bf1f Merge pull request #280 from pi-hole/dependabot/npm_and_yarn/development/@types/jest-24.0.14
Bump @types/jest from 24.0.13 to 24.0.14
2019-06-13 20:24:24 -04:00
dependabot-preview[bot] d543bf334a Bump @types/jest from 24.0.13 to 24.0.14
Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 24.0.13 to 24.0.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-13 11:55:17 +00:00
Mcat12 a5a00f13a4 Use the filtered IPv6 OpenDNS servers
The ones we were using previously were not filtered. See
https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6-

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-12 19:41:15 -07:00
Mcat12 5e0f115a67 Add WithAPIData tests
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-12 19:32:12 -07:00
Mark Drobnak bc163b0f4b Merge pull request #277 from pi-hole/dependabot/npm_and_yarn/development/@types/node-12.0.8
Bump @types/node from 12.0.7 to 12.0.8
2019-06-12 22:11:29 -04:00
dependabot-preview[bot] e38a14d74f Bump @types/node from 12.0.7 to 12.0.8
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.0.7 to 12.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-13 02:07:30 +00:00
Mark Drobnak 6508bbed6d Merge pull request #276 from pi-hole/dependabot/npm_and_yarn/development/@coreui/coreui-2.1.12
Bump @coreui/coreui from 2.1.11 to 2.1.12
2019-06-12 22:04:44 -04:00
dependabot-preview[bot] 2e23bb5465 Bump @coreui/coreui from 2.1.11 to 2.1.12
Bumps [@coreui/coreui](https://github.com/coreui/coreui) from 2.1.11 to 2.1.12.
- [Release notes](https://github.com/coreui/coreui/releases)
- [Changelog](https://github.com/coreui/coreui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/coreui/coreui/compare/v2.1.11...v2.1.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-12 14:00:31 +00:00
Mark Drobnak 6f23df0b90 Merge pull request #274 from pi-hole/dependabot/npm_and_yarn/development/prettier-1.18.2
Bump prettier from 1.17.1 to 1.18.2
2019-06-07 23:47:14 -04:00
dependabot-preview[bot] cecd0e58a5 Bump prettier from 1.17.1 to 1.18.2
Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 to 1.18.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.17.1...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-08 03:45:11 +00:00
Mark Drobnak edf404ca54 Merge pull request #272 from pi-hole/dependabot/npm_and_yarn/development/i18next-17.0.3
Bump i18next from 17.0.2 to 17.0.3
2019-06-07 23:40:28 -04:00
dependabot-preview[bot] 04d5b79aac Bump i18next from 17.0.2 to 17.0.3
Bumps [i18next](https://github.com/i18next/i18next) from 17.0.2 to 17.0.3.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next/compare/v17.0.2...v17.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-08 03:37:40 +00:00
Mark Drobnak 953b55e7c6 Merge pull request #235 from pi-hole/tweak/common-tests
Improve common component test coverage
2019-06-07 23:28:53 -04:00
Mark Drobnak f65c2855df Merge branch 'development' into tweak/common-tests 2019-06-07 23:16:38 -04:00
Mark Drobnak 947ba28cc5 Merge pull request #273 from pi-hole/fix/ci-test-performance
Improve CI test performance by limiting the number of workers
2019-06-07 23:14:29 -04:00
Mcat12 2ecaa1ec8c Improve CI test performance by limiting the number of workers
Around the time of merging #264 and afterwards, the CI would sometimes
freeze while running the tests. When SSHing into the box with the tests
running, several node processes were running. Jest also recommends to
limit the number of workers if CI performance is lacking:

https://jestjs.io/docs/en/troubleshooting.html#tests-are-extremely-slow-on-docker-and-or-continuous-integration-ci-server

This change is applied in this commit.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-07 20:09:37 -07:00
Mark Drobnak 73f18e5fda Merge branch 'development' into tweak/common-tests 2019-06-07 22:51:57 -04:00
Mark Drobnak f385a0908c Merge pull request #254 from pi-hole/fix/query-log-debounce
Fix debouncing in query log before selecting filters
2019-06-07 22:51:19 -04:00
Mcat12 d1d8f74028 Merge branch 'development' into fix/query-log-debounce
# Conflicts:
#	package.json
2019-06-07 19:40:39 -07:00
Mark Drobnak ebb7abab72 Merge pull request #259 from pi-hole/fix/flaky-graphUtils-test
Fix a flaky test in graphUtils.test.tsx
2019-06-07 22:39:05 -04:00
Mark Drobnak b824d3801d Merge branch 'development' into fix/flaky-graphUtils-test 2019-06-07 22:36:27 -04:00
Mark Drobnak 1e5e6e6ef8 Merge pull request #270 from pi-hole/dependabot/npm_and_yarn/development/@types/node-12.0.7
Bump @types/node from 12.0.5 to 12.0.7
2019-06-07 22:36:13 -04:00
dependabot-preview[bot] 6758a3d721 Bump @types/node from 12.0.5 to 12.0.7
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.0.5 to 12.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-07 13:40:52 +00:00
Mark Drobnak 1becb0f0d0 Merge pull request #269 from pi-hole/dependabot/npm_and_yarn/development/i18next-17.0.2
Bump i18next from 17.0.1 to 17.0.2
2019-06-06 22:52:53 -04:00
dependabot-preview[bot] 8d9a59be36 Bump i18next from 17.0.1 to 17.0.2
Bumps [i18next](https://github.com/i18next/i18next) from 17.0.1 to 17.0.2.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next/compare/v17.0.1...v17.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-07 02:48:49 +00:00
Mark Drobnak af19607427 Merge pull request #268 from pi-hole/dependabot/npm_and_yarn/development/@types/node-12.0.5
Bump @types/node from 12.0.4 to 12.0.5
2019-06-06 22:44:57 -04:00
dependabot-preview[bot] 1d03ed631c Bump @types/node from 12.0.4 to 12.0.5
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.0.4 to 12.0.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-06 13:42:22 +00:00
Mark Drobnak 424c1130fc Merge pull request #264 from pi-hole/feature/codecov
Add Codecov to CI
2019-06-05 22:51:21 -04:00
Mark Drobnak 1960a894f8 Merge branch 'development' into feature/codecov 2019-06-05 22:46:26 -04:00
Mark Drobnak 93b9050613 Merge pull request #267 from pi-hole/dependabot/npm_and_yarn/development/react-router-dom-5.0.1
Bump react-router-dom from 5.0.0 to 5.0.1
2019-06-05 22:45:51 -04:00