Commit Graph
1505 Commits
Author SHA1 Message Date
DL6ER c816c2e792 Merge pull request #445 from pi-hole/tweak/sum_queries
Use new field "sum_queries"
2019-12-11 14:04:18 +01:00
DL6ER d3b65bb90f Merge branch 'development' into tweak/sum_queries 2019-12-11 13:54:53 +01:00
DL6ER 6afe08698f Merge branch 'development' into development-FTL 2019-12-11 12:45:37 +00:00
DL6ER 4c13cc9fbf Merge pull request #450 from pi-hole/update/docker
Update dockerfile to use node 12 (lts) base image
2019-12-11 11:42:34 +01:00
DL6ER dd919f646c Merge pull request #434 from pi-hole/dependabot/npm_and_yarn/development/i18next-xhr-backend-3.2.2
Bump i18next-xhr-backend from 3.1.1 to 3.2.2
2019-12-11 11:28:11 +01:00
DL6ER 62dc78a3a9 Merge pull request #432 from pi-hole/dependabot/npm_and_yarn/development/react-redux-7.1.3
Bump react-redux from 7.1.1 to 7.1.3
2019-12-11 11:27:53 +01:00
XhmikosR 0a671a50fa README.md: suggest Node.js>= 10.x.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-11 10:42:52 +02:00
XhmikosR eb33649eb2 CI: improve config
* use `npm ci`
* make the cache more foolproof

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-11 10:42:51 +02:00
Dan Schaper c4c1eb2a7c Pin circleci to the version 12 image 2019-12-11 10:36:56 +02:00
Dan Schaper 0713b2f422 Update dockerfile to use node 12 (lts) base image 2019-12-11 10:36:49 +02:00
dependabot-preview[bot] 8089b5d381 Bump i18next-xhr-backend from 3.1.1 to 3.2.2
Bumps [i18next-xhr-backend](https://github.com/i18next/i18next-xhr-backend) from 3.1.1 to 3.2.2.
- [Release notes](https://github.com/i18next/i18next-xhr-backend/releases)
- [Changelog](https://github.com/i18next/i18next-xhr-backend/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next-xhr-backend/compare/v3.1.1...v3.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 08:35:03 +00:00
dependabot-preview[bot] 6b05e3e68a Bump react-redux from 7.1.1 to 7.1.3
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.1 to 7.1.3.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.1...v7.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 08:33:10 +00:00
DL6ER da8a10a1b5 Merge pull request #444 from pi-hole/l10n_development
New Crowdin translations
2019-12-10 23:24:43 +01:00
DL6ER 7d71cba45d Merge pull request #430 from pi-hole/dependabot/npm_and_yarn/development/react-router-dom-5.1.2
Bump react-router-dom from 5.0.1 to 5.1.2
2019-12-10 23:15:04 +01:00
DL6ER 4dfccbec36 Merge pull request #433 from pi-hole/dependabot/npm_and_yarn/development/types/node-12.12.14
Bump @types/node from 12.12.7 to 12.12.14
2019-12-10 23:14:21 +01:00
DL6ER 0fdf6a88af Merge branch 'development' into development-FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-09 12:06:22 +00:00
dependabot-preview[bot] c42d10a2f2 Bump react-router-dom from 5.0.1 to 5.1.2
Bumps [react-router-dom](https://github.com/ReactTraining/react-router) from 5.0.1 to 5.1.2.
- [Release notes](https://github.com/ReactTraining/react-router/releases)
- [Changelog](https://github.com/ReactTraining/react-router/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ReactTraining/react-router/compare/v5.0.1...v5.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-06 11:21:43 +00:00
dependabot-preview[bot] 200629648b Bump @types/node from 12.12.7 to 12.12.14
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.12.7 to 12.12.14.
- [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-12-06 11:21:35 +00:00
DL6ER 82c0d2a693 Merge pull request #436 from pi-hole/dependabot/npm_and_yarn/development/node-sass-chokidar-1.4.0
Bump node-sass-chokidar from 1.3.5 to 1.4.0
2019-12-06 12:19:03 +01:00
dependabot-preview[bot] c22d387bae Bump node-sass-chokidar from 1.3.5 to 1.4.0
Bumps [node-sass-chokidar](https://github.com/michaelwayman/node-sass-chokidar) from 1.3.5 to 1.4.0.
- [Release notes](https://github.com/michaelwayman/node-sass-chokidar/releases)
- [Changelog](https://github.com/michaelwayman/node-sass-chokidar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/michaelwayman/node-sass-chokidar/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-06 08:42:29 +00:00
DL6ER 720137f7e4 Merge pull request #443 from pi-hole/dependabot/npm_and_yarn/development/typescript-3.7.3
Bump typescript from 3.6.3 to 3.7.3
2019-12-06 09:39:54 +01:00
DL6ER a5a60ce82b Adjust tests and fake-data
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-06 08:35:44 +00:00
DL6ER 0b72291e0a Use new field "sum_queries" for displaying the total queries number on the dashboard. This avoids to necessity to sum all individual query types. Furthermore (and more important), it greatly simplifies the database queries as we do not need to count the different query types indicidually.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-06 08:28:30 +00:00
pralor 334d10740c New translations settings.json (Turkish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-12-05 23:55:23 -08:00
pralor 4dfc4a6786 New translations dashboard.json (Turkish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-12-05 23:55:22 -08:00
dependabot-preview[bot] ba913f50f0 Bump typescript from 3.6.3 to 3.7.3
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.6.3 to 3.7.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v3.6.3...v3.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-05 22:15:42 +00:00
DL6ER 0fcecae139 Merge pull request #441 from pi-hole/dependabot/npm_and_yarn/development/react-table-6.11.2
Bump react-table from 6.10.0 to 6.11.2
2019-12-05 23:12:57 +01:00
dependabot-preview[bot] 9de188fabc Bump react-table from 6.10.0 to 6.11.2
Bumps [react-table](https://github.com/tannerlinsley/react-table) from 6.10.0 to 6.11.2.
- [Release notes](https://github.com/tannerlinsley/react-table/releases)
- [Changelog](https://github.com/tannerlinsley/react-table/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tannerlinsley/react-table/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-03 12:45:40 +00:00
DL6ER b92247fc97 Merge pull request #437 from pi-hole/dependabot/npm_and_yarn/development/redux-starter-kit-1.0.1
Bump redux-starter-kit from 0.6.3 to 1.0.1
2019-12-03 13:42:58 +01:00
dependabot-preview[bot] f3532f2c1d Bump redux-starter-kit from 0.6.3 to 1.0.1
Bumps [redux-starter-kit](https://github.com/reduxjs/redux-starter-kit) from 0.6.3 to 1.0.1.
- [Release notes](https://github.com/reduxjs/redux-starter-kit/releases)
- [Commits](https://github.com/reduxjs/redux-starter-kit/compare/v0.6.3...v1.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-01 12:49:50 +00:00
DL6ER df5ce31703 Merge pull request #439 from pi-hole/dependabot/npm_and_yarn/development/react-dom-16.12.0
Bump react-dom from 16.8.6 to 16.12.0
2019-12-01 13:46:57 +01:00
dependabot-preview[bot] 1e415f9053 Bump react-dom from 16.8.6 to 16.12.0
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.8.6 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-01 12:12:57 +00:00
DL6ER e0a1db6874 Merge pull request #438 from pi-hole/dependabot/npm_and_yarn/development/react-16.12.0
Bump react from 16.9.0 to 16.12.0
2019-12-01 13:10:27 +01:00
dependabot-preview[bot] cdc9cb46ad Bump react from 16.9.0 to 16.12.0
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.9.0 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-01 10:23:13 +00:00
Adam Warner 2210192097 Merge pull request #429 from XhmikosR/css-tweaks
Minor SCSS consistency tweaks
2019-11-27 19:47:32 +00:00
Adam Warner 0e93965ccc Merge pull request #428 from XhmikosR/bs-classes
Use Bootstrap's classes when possible.
2019-11-27 19:44:29 +00:00
XhmikosR a518a69d5d Minor SCSS consistency tweaks
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-27 17:00:58 +02:00
XhmikosR 31e9acb7a2 Use Bootstrap's classes when possible.
This reduces the custom CSS and style elements.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-27 16:32:15 +02:00
Adam Warner 36aa0f3660 Merge pull request #422 from pi-hole/l10n_development
New Crowdin translations
2019-11-26 22:09:29 +00:00
Adam Warner c83bd4ff12 Merge branch 'development' into l10n_development 2019-11-26 22:03:48 +00:00
Adam Warner 7da13208fd Merge pull request #427 from XhmikosR/compress-logo
Compress logo.svg with the latest SVGO v1.3.2.
2019-11-26 22:02:43 +00:00
Adam Warner 86654143fb Merge pull request #426 from XhmikosR/patch-1
Make `.navbar-toggler` white
2019-11-26 22:01:55 +00:00
DL6ER 4a55fb2d62 Merge pull request #424 from pi-hole/fix/query_types
Query Types are now zero-based in FTL
2019-11-26 19:14:45 +01:00
XhmikosR 8cae687126 Compress logo.svg with the latest SVGO v1.3.2.
Also, remove the unused IDs.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-26 17:13:31 +02:00
XhmikosR bc59e18c47 Make .navbar-toggler white
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-26 17:10:59 +02:00
DL6ER fa549697bb Query Types are now zero-based in FTL. This removes the extra offset of 1 everywhere.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-26 11:48:13 +01:00
pralor 7d11032427 New translations settings.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-21 06:22:17 -08:00
Mark Drobnak b6b1750c27 Merge pull request #421 from pi-hole/new/whitelist_regex_support
Review comments missed in #413
2019-11-18 23:00:21 -05:00
DL6ER 54034c186c Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-18 20:58:10 +01:00
DL6ER 938903322f Merge pull request #411 from pi-hole/dependabot/npm_and_yarn/development/types/jest-24.0.23
Bump @types/jest from 24.0.17 to 24.0.23
2019-11-18 20:03:13 +01:00