Commit Graph
1221 Commits
Author SHA1 Message Date
Mark Drobnak f104bbe620 Merge pull request #295 from pi-hole/dependabot/npm_and_yarn/development/@types/node-12.0.10
Bump @types/node from 12.0.8 to 12.0.10
2019-06-22 23:31:54 -04:00
dependabot-preview[bot] d2912a27ae Bump @types/node from 12.0.8 to 12.0.10
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.0.8 to 12.0.10.
- [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-23 03:29:15 +00:00
Mark Drobnak 4c64d6c53f Merge pull request #298 from pi-hole/dependabot/npm_and_yarn/development/@types/enzyme-3.9.4
Bump @types/enzyme from 3.9.3 to 3.9.4
2019-06-22 23:26:35 -04:00
dependabot-preview[bot] 1613761056 Bump @types/enzyme from 3.9.3 to 3.9.4
Bumps [@types/enzyme](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/enzyme) from 3.9.3 to 3.9.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/enzyme)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-23 03:24:30 +00:00
Mark Drobnak e89fa56408 Merge pull request #299 from pi-hole/dependabot/npm_and_yarn/development/@types/chart.js-2.7.54
Bump @types/chart.js from 2.7.53 to 2.7.54
2019-06-22 23:22:12 -04:00
dependabot-preview[bot] d6c0b92b03 Bump @types/chart.js from 2.7.53 to 2.7.54
Bumps [@types/chart.js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chart.js) from 2.7.53 to 2.7.54.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chart.js)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-23 03:20:28 +00:00
Mark Drobnak 104e5d54e8 Merge pull request #292 from pi-hole/dependabot/npm_and_yarn/development/@types/fetch-mock-7.3.1
Bump @types/fetch-mock from 7.3.0 to 7.3.1
2019-06-22 23:18:04 -04:00
dependabot-preview[bot] 47ecfba741 Bump @types/fetch-mock from 7.3.0 to 7.3.1
Bumps [@types/fetch-mock](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/fetch-mock) from 7.3.0 to 7.3.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/fetch-mock)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-22 10:14:19 +00:00
Mark Drobnak 934a160b47 Merge pull request #290 from rajannpatel/development
Modifying arrangement of buttons on Login page
2019-06-20 22:39:03 -04:00
Rajan Patel fa9507b187 prettier formatting
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-20 00:37:42 -04:00
Rajan Patel 8fcb3c7c50 del inline css & form padding, wrong password fix
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-20 00:31:32 -04:00
Rajan Patel adc1cb4624 update tests to reflect our new changes
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-19 23:24:57 -04:00
Rajan Patel ca2213f847 remove unused class
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-19 23:24:57 -04:00
Rajan Patel 3f61e3400b resolve prettier error
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-19 23:24:57 -04:00
Rajan Patel 687082d8cb resize login button
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-19 23:24:57 -04:00
Rajan Patel 886427e347 delete stray commented code
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-19 23:24:57 -04:00
Rajan Patel c36714d6c4 revise forgot password button
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-19 23:24:57 -04:00
Rajan Patel 1549601eee deleted unused styles, added global overrides
Signed-off-by: Rajan Patel <bitbucket@fobiopatel.com>
2019-06-19 23:24:57 -04:00
Mark Drobnak 5c5d96cc73 Merge pull request #288 from pi-hole/tweak/misc
Misc. changes for future test coverage PRs
2019-06-19 11:10:42 -04:00
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