Commit Graph
1462 Commits
Author SHA1 Message Date
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 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 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
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
Adam Warner 3c67b46a9f Merge pull request #420 from pi-hole/new/polyfills
IE11/Edge support
2019-11-17 21:02:44 +00:00
Adam Warner a75e1a6b8c Merge pull request #413 from pi-hole/new/whitelist_regex_support
Add support for whitelist regex + use updated FTL paths for the lists
2019-11-17 19:14:23 +00:00
Mcat12 a5388a123c Don't explicitly require core-js in package.json
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-11-17 13:57:19 -05:00
Adam Warner e2074cb1f2 Adds polyfills for IE11/Edge
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-17 18:14:20 +00:00
DL6ER 9d395104bf Merge branch 'development-FTL' into new/whitelist_regex_support
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-17 10:39:31 +01:00
DL6ER 11f74387c1 Merge pull request #419 from pi-hole/tweak/sidebar
Hide black/whitelist menu items from unauthenticated users
2019-11-17 10:37:16 +01:00
Mark Drobnak e7face8932 Merge pull request #418 from pi-hole/tweak/versions
Remove "API" version box
2019-11-16 21:41:07 -05:00
Dan Schaper 7c06ef6575 Fixes https://github.com/pi-hole/web/pull/418#issuecomment-554695826
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-11-16 18:37:07 -08:00
Dan Schaper 7410e09a1f Fixes https://github.com/pi-hole/web/pull/418#pullrequestreview-317996299
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-11-16 17:55:01 -08:00
Adam Warner ed6b5fbe81 update tests to reflect name changes in endpoints/functionsSigned-off-by: Adam Warner <me@adamwarner.co.uk> 2019-11-17 01:00:20 +00:00
Adam Warner 6a69c63a93 Make it how prettier likes it.
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-17 00:29:59 +00:00
Adam Warner b829a2bfae Don't show whitelist and blacklist menu items to an unauthenticated user
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-17 00:23:26 +00:00
Adam Warner 45c5444ecc Only need 3 version boxes
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-17 00:07:06 +00:00
Adam Warner 0324ff6efa Merge pull request #417 from pi-hole/development
Development
2019-11-16 23:52:52 +00:00
Adam Warner 504ebc1f07 Merge pull request #416 from pi-hole/new/URLOverride
Allow for custom API URL during development
2019-11-16 23:52:09 +00:00
Adam Warner 045014ba6f apply @mcat12's suggestion. I agree, it is cleaner to read!
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-16 21:43:20 +00:00
Adam Warner c644bb9c1b format to prettier's liking.
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-16 21:29:59 +00:00
Adam Warner 2908c9edf0 test for existence of REACT_APP_CUSTOM_API_URL, use that if it exists, else fallback to PUBLIC_URL
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-16 21:10:39 +00:00
DL6ER 05089656e5 Merge pull request #412 from pi-hole/dependabot/npm_and_yarn/development/types/chart.js-2.9.0
Bump @types/chart.js from 2.7.56 to 2.9.0
2019-11-16 22:02:26 +01:00
dependabot-preview[bot] 9d9b5af49f Bump @types/chart.js from 2.7.56 to 2.9.0
Bumps [@types/chart.js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chart.js) from 2.7.56 to 2.9.0.
- [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-11-16 20:28:31 +00:00
Mark Drobnak e7ef69c81e Merge pull request #415 from pi-hole/fix/npmaudit
Take 2 on changes to package-lock.json
2019-11-16 15:25:52 -05:00
Adam Warner a0112f0ce5 after running npm fix audit
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-16 20:21:36 +00:00
DL6ER 700e222572 Merge pull request #408 from pi-hole/dependabot/npm_and_yarn/development/types/react-router-dom-5.1.2
Bump @types/react-router-dom from 4.3.4 to 5.1.2
2019-11-16 19:11:33 +01:00
DL6ER 928ef6ebed Add support for whitelist regex + use updated FTL paths for the lists
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-16 10:45:20 +01:00
dependabot-preview[bot] 70483007dd Bump @types/react-router-dom from 4.3.4 to 5.1.2
Bumps [@types/react-router-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-router-dom) from 4.3.4 to 5.1.2.
- [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-11-16 09:27:20 +00:00
DL6ER 167a15adaf Merge pull request #395 from pi-hole/dependabot/npm_and_yarn/development/redux-saga-test-plan-4.0.0-rc.3
Bump redux-saga-test-plan from 4.0.0-beta.3 to 4.0.0-rc.3
2019-11-16 10:24:44 +01:00
dependabot-preview[bot] 5622335a09 Bump redux-saga-test-plan from 4.0.0-beta.3 to 4.0.0-rc.3
Bumps [redux-saga-test-plan](https://github.com/jfairbank/redux-saga-test-plan) from 4.0.0-beta.3 to 4.0.0-rc.3.
- [Release notes](https://github.com/jfairbank/redux-saga-test-plan/releases)
- [Changelog](https://github.com/jfairbank/redux-saga-test-plan/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jfairbank/redux-saga-test-plan/compare/v4.0.0-beta.3...v4.0.0-rc.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-15 20:57:21 +00:00
DL6ER 594028502b Merge pull request #394 from pi-hole/dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-5.11.2
Bump @fortawesome/fontawesome-free from 5.10.1 to 5.11.2
2019-11-15 21:54:33 +01:00
DL6ER def1b108d1 Merge pull request #344 from pi-hole/docs/contributing
Add issue templates and contributor's guide
2019-11-15 21:52:40 +01:00
DL6ER 9f8a4d240b Merge pull request #322 from pi-hole/l10n_development
New Crowdin translations
2019-11-15 21:51:00 +01:00
pralor 3e549a46a5 New translations time-ranges.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:24 -08:00
pralor f78c8bd620 New translations settings.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:23 -08:00
pralor b4779d6358 New translations query-log.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:21 -08:00
pralor deb1b3e635 New translations preferences.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:20 -08:00
pralor 1287d041f2 New translations location.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:09 -08:00
pralor bd66490fb8 New translations lists.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:07 -08:00
pralor 197cfa8c36 New translations footer.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:06 -08:00
pralor c81b186f35 New translations dashboard.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:05 -08:00
pralor 75c163bd1a New translations common.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:04 -08:00
pralor 70a61932f6 New translations api-errors.json (Polish)
Signed-off-by: pralor <36384445+pralor@users.noreply.github.com>
2019-11-15 07:02:02 -08:00