Commit Graph

Select branches

Hide Pull Requests

XhmikosR-patch-1

coreui-3

development

gh-pages

l10n_development

lint-3

master

new/avg_forward_response_time

new/tail

tweak/more_list_details

xo

Mono Color

• 78dac44874 Use moment in the ClientsGraph tooltip title to fix negative date error Mcat12 2019-05-05 20:25:49 -07:00
• 7c3c8ce5f4 Remove unnecessary tooltip functions in ClientsGraph Mcat12 2019-05-05 20:23:18 -07:00
• 1203b27069 Merge branch 'development' into feature/better-conditional-forwarding Mark Drobnak 2019-06-17 01:30:27 -04:00
• b1def4c497 Merge pull request #286 from pi-hole/tweak/upload-sftp Mark Drobnak 2019-06-17 01:29:39 -04:00
• 1a63c9ac5b Update conditional forwarding settings to new API Mcat12 2019-06-16 19:46:14 -07:00
• 351dd7b8f7 Use SFTP to upload build artifacts Mcat12 2019-06-16 16:00:52 -07:00
• 5a82cf89e4 Merge pull request #279 from pi-hole/tweak/opendns-ipv6 Mark Drobnak 2019-06-16 14:39:13 -04:00
• b6c80ead29 Merge branch 'development' into tweak/opendns-ipv6 Mark Drobnak 2019-06-16 14:37:22 -04:00
• 12a82d5a6c Merge pull request #278 from pi-hole/tweak/with-api-data-tests Mark Drobnak 2019-06-16 14:37:09 -04:00
• e736c3853e Merge branch 'development' into tweak/with-api-data-tests Mark Drobnak 2019-06-16 14:33:17 -04:00
• bc2a125a4c Merge pull request #284 from pi-hole/dependabot/npm_and_yarn/development/typescript-3.5.2 Mark Drobnak 2019-06-15 23:50:47 -04:00
• 2b58777dea Bump typescript from 3.5.1 to 3.5.2 dependabot-preview[bot] 2019-06-16 03:34:00 +00:00
• 601b2ed5d0 Merge pull request #285 from pi-hole/dependabot/npm_and_yarn/development/@types/react-router-dom-4.3.4 Mark Drobnak 2019-06-15 23:30:21 -04:00
• 5ff00d6c8c Bump @types/react-router-dom from 4.3.3 to 4.3.4 dependabot-preview[bot] 2019-06-16 03:27:23 +00:00
• 37d33f5b23 Merge pull request #283 from pi-hole/dependabot/npm_and_yarn/development/@types/react-16.8.20 Mark Drobnak 2019-06-15 23:23:59 -04:00
• fdffe32edd Bump @types/react from 16.8.19 to 16.8.20 dependabot-preview[bot] 2019-06-16 02:19:25 +00:00
• 627b5fb123 Merge pull request #281 from isdampe/isdampe_ftl_style Mark Drobnak 2019-06-15 22:16:47 -04:00
• 6f6c3bd30d Merge branch 'development' into isdampe_ftl_style Mark Drobnak 2019-06-15 22:15:09 -04:00
• 1d560ac3cc Fix mismatching labels, correct usage of toLocaleString(), ensure formatter has been run Richard Denton 2019-06-16 08:54:08 +08:00
• fd14e4fe9e Adds styling to the FTL settings tab, fixes #166 Richard Denton 2019-06-15 08:40:30 +08:00
• 1e98a5bf1f Merge pull request #280 from pi-hole/dependabot/npm_and_yarn/development/@types/jest-24.0.14 Mark Drobnak 2019-06-13 20:24:24 -04:00
• d543bf334a Bump @types/jest from 24.0.13 to 24.0.14 dependabot-preview[bot] 2019-06-13 11:55:17 +00:00
• a5a00f13a4 Use the filtered IPv6 OpenDNS servers Mcat12 2019-06-12 19:41:15 -07:00
• 5e0f115a67 Add WithAPIData tests Mcat12 2019-05-05 15:05:56 -07:00
• bc163b0f4b Merge pull request #277 from pi-hole/dependabot/npm_and_yarn/development/@types/node-12.0.8 Mark Drobnak 2019-06-12 22:11:29 -04:00
• e38a14d74f Bump @types/node from 12.0.7 to 12.0.8 dependabot-preview[bot] 2019-06-13 02:07:30 +00:00
• 6508bbed6d Merge pull request #276 from pi-hole/dependabot/npm_and_yarn/development/@coreui/coreui-2.1.12 Mark Drobnak 2019-06-12 22:04:44 -04:00
• 2e23bb5465 Bump @coreui/coreui from 2.1.11 to 2.1.12 dependabot-preview[bot] 2019-06-12 14:00:31 +00:00
• 6f23df0b90 Merge pull request #274 from pi-hole/dependabot/npm_and_yarn/development/prettier-1.18.2 Mark Drobnak 2019-06-07 23:47:14 -04:00
• cecd0e58a5 Bump prettier from 1.17.1 to 1.18.2 dependabot-preview[bot] 2019-06-08 03:45:11 +00:00
• edf404ca54 Merge pull request #272 from pi-hole/dependabot/npm_and_yarn/development/i18next-17.0.3 Mark Drobnak 2019-06-07 23:40:28 -04:00
• 04d5b79aac Bump i18next from 17.0.2 to 17.0.3 dependabot-preview[bot] 2019-06-08 03:37:40 +00:00
• 953b55e7c6 Merge pull request #235 from pi-hole/tweak/common-tests Mark Drobnak 2019-06-07 23:28:53 -04:00
• f65c2855df Merge branch 'development' into tweak/common-tests Mark Drobnak 2019-06-07 23:16:38 -04:00
• 947ba28cc5 Merge pull request #273 from pi-hole/fix/ci-test-performance Mark Drobnak 2019-06-07 23:14:29 -04:00
• 2ecaa1ec8c Improve CI test performance by limiting the number of workers Mcat12 2019-06-07 20:09:37 -07:00
• 73f18e5fda Merge branch 'development' into tweak/common-tests Mark Drobnak 2019-06-07 22:51:57 -04:00
• f385a0908c Merge pull request #254 from pi-hole/fix/query-log-debounce Mark Drobnak 2019-06-07 22:51:19 -04:00
• d1d8f74028 Merge branch 'development' into fix/query-log-debounce Mcat12 2019-06-07 19:40:39 -07:00
• ebb7abab72 Merge pull request #259 from pi-hole/fix/flaky-graphUtils-test Mark Drobnak 2019-06-07 22:39:05 -04:00
• b824d3801d Merge branch 'development' into fix/flaky-graphUtils-test Mark Drobnak 2019-06-07 22:36:27 -04:00
• 1e5e6e6ef8 Merge pull request #270 from pi-hole/dependabot/npm_and_yarn/development/@types/node-12.0.7 Mark Drobnak 2019-06-07 22:36:13 -04:00
• 6758a3d721 Bump @types/node from 12.0.5 to 12.0.7 dependabot-preview[bot] 2019-06-07 13:40:52 +00:00
• 1becb0f0d0 Merge pull request #269 from pi-hole/dependabot/npm_and_yarn/development/i18next-17.0.2 Mark Drobnak 2019-06-06 22:52:53 -04:00
• 8d9a59be36 Bump i18next from 17.0.1 to 17.0.2 dependabot-preview[bot] 2019-06-07 02:48:49 +00:00
• af19607427 Merge pull request #268 from pi-hole/dependabot/npm_and_yarn/development/@types/node-12.0.5 Mark Drobnak 2019-06-06 22:44:57 -04:00
• 1d03ed631c Bump @types/node from 12.0.4 to 12.0.5 dependabot-preview[bot] 2019-06-06 13:42:22 +00:00
• 424c1130fc Merge pull request #264 from pi-hole/feature/codecov Mark Drobnak 2019-06-05 22:51:21 -04:00
• 1960a894f8 Merge branch 'development' into feature/codecov Mark Drobnak 2019-06-05 22:46:26 -04:00
• 93b9050613 Merge pull request #267 from pi-hole/dependabot/npm_and_yarn/development/react-router-dom-5.0.1 Mark Drobnak 2019-06-05 22:45:51 -04:00
• bf278cba25 Bump react-router-dom from 5.0.0 to 5.0.1 dependabot-preview[bot] 2019-06-06 02:36:29 +00:00
• 2c3472bfc5 Merge pull request #266 from pi-hole/dependabot/npm_and_yarn/development/@fortawesome/fontawesome-free-5.9.0 Mark Drobnak 2019-06-05 22:32:51 -04:00
• 46ea48e074 Bump @fortawesome/fontawesome-free from 5.8.2 to 5.9.0 dependabot-preview[bot] 2019-06-06 02:25:21 +00:00
• 8d7c4da3ca Merge pull request #265 from isdampe/isdampe Mark Drobnak 2019-06-05 22:20:54 -04:00
• 535d73299b Ensure modal content is centered on mobile Richard Denton 2019-06-05 17:51:45 +08:00
• f3a8ce8ca4 Sign off Richard Denton 2019-06-05 17:40:06 +08:00
• b27904eae8 Generate test coverage for Codecov Mcat12 2019-06-04 22:01:04 -07:00
• 8545f2a0f9 Add Codecov to CI Mcat12 2019-06-04 21:52:08 -07:00
• ece915b515 Merge pull request #261 from pi-hole/dependabot/npm_and_yarn/development/enzyme-adapter-react-16-1.14.0 Mark Drobnak 2019-06-04 23:41:30 -04:00
• dd3308c3e7 Bump enzyme-adapter-react-16 from 1.13.2 to 1.14.0 dependabot-preview[bot] 2019-06-05 03:36:25 +00:00
• 7305e0350e Merge pull request #262 from pi-hole/dependabot/npm_and_yarn/development/enzyme-3.10.0 Mark Drobnak 2019-06-04 23:33:59 -04:00
• 9782998ae0 Replace mount usage with shallow Mcat12 2019-06-04 20:30:09 -07:00
• 25e4444eb5 Bump enzyme from 3.9.0 to 3.10.0 dependabot-preview[bot] 2019-06-05 03:24:05 +00:00
• 582d409e49 Merge pull request #263 from pi-hole/dependabot/npm_and_yarn/development/react-bootstrap-typeahead-3.4.5 Mark Drobnak 2019-06-04 23:20:54 -04:00
• a4472791b7 Bump react-bootstrap-typeahead from 3.4.4 to 3.4.5 dependabot-preview[bot] 2019-06-05 03:16:13 +00:00
• 033ecb9580 Merge pull request #260 from pi-hole/dependabot/npm_and_yarn/development/i18next-17.0.1 Mark Drobnak 2019-06-04 23:13:13 -04:00
• 12b98dcb91 Bump i18next from 16.0.0 to 17.0.1 dependabot-preview[bot] 2019-06-04 11:03:00 +00:00
• 0e2df9dcff Merge pull request #256 from pi-hole/dependabot/npm_and_yarn/development/i18next-browser-languagedetector-3.0.1 Mark Drobnak 2019-06-03 22:48:59 -04:00
• 6086160318 Remove @types/i18next-browser-languagedetector Mcat12 2019-06-03 19:46:36 -07:00
• 15a3088b78 Fix a flaky test in graphUtils.test.tsx Mcat12 2019-06-03 19:09:40 -07:00
• dd0d8b8b85 Bump i18next-browser-languagedetector from 2.2.4 to 3.0.1 dependabot-preview[bot] 2019-06-04 02:04:33 +00:00
• fabe3922a4 Merge pull request #255 from pi-hole/dependabot/npm_and_yarn/development/i18next-xhr-backend-3.0.0 Mark Drobnak 2019-06-03 22:01:58 -04:00
• 2a1c9f4ad7 Bump i18next-xhr-backend from 2.0.1 to 3.0.0 dependabot-preview[bot] 2019-06-04 00:40:37 +00:00
• 7c7edba7b8 Merge pull request #258 from pi-hole/dependabot/npm_and_yarn/development/i18next-16.0.0 Mark Drobnak 2019-06-03 20:37:59 -04:00
• eca01ba53e Bump i18next from 15.1.3 to 16.0.0 dependabot-preview[bot] 2019-06-04 00:27:38 +00:00
• 7961bd712b Merge pull request #257 from pi-hole/dependabot/npm_and_yarn/development/@coreui/coreui-2.1.11 Mark Drobnak 2019-06-03 20:24:50 -04:00
• bc9fc80a76 Bump @coreui/coreui from 2.1.10 to 2.1.11 dependabot-preview[bot] 2019-06-03 14:15:15 +00:00
• 2ed15d6a82 Fix debouncing in query log before selecting filters Mcat12 2019-06-02 21:42:21 -07:00
• d2ea2397b1 Merge branch 'development' into tweak/common-tests Mcat12 2019-06-01 16:26:29 -07:00
• 15d942bfb8 New Crowdin translations (#217) pralor 2019-06-01 16:24:54 -07:00
• 8157921482 Merge pull request #250 from pi-hole/dependabot/npm_and_yarn/development/prettier-1.17.1 Mark Drobnak 2019-06-01 19:22:08 -04:00
• fbf79422b9 Bump prettier from 1.15.3 to 1.17.1 dependabot-preview[bot] 2019-06-01 22:21:35 +00:00
• 25baad85df Merge pull request #251 from pi-hole/dependabot/npm_and_yarn/development/@coreui/coreui-2.1.10 Mark Drobnak 2019-06-01 18:10:39 -04:00
• 2f0dc1fbcc Bump @coreui/coreui from 2.1.9 to 2.1.10 dependabot-preview[bot] 2019-06-01 21:00:59 +00:00
• 2c4ac54b2b Merge pull request #252 from pi-hole/dependabot/npm_and_yarn/development/prop-types-15.7.2 Mark Drobnak 2019-06-01 16:58:08 -04:00
• aa095765b9 Bump prop-types from 15.6.2 to 15.7.2 dependabot-preview[bot] 2019-06-01 20:56:16 +00:00
• ddcec3a53f Merge pull request #253 from pi-hole/dependabot/npm_and_yarn/development/moment-2.24.0 Mark Drobnak 2019-06-01 16:53:47 -04:00
• 293a35e26c Bump moment from 2.23.0 to 2.24.0 dependabot-preview[bot] 2019-06-01 20:51:28 +00:00
• bddcf50d81 Merge pull request #249 from pi-hole/dependabot/npm_and_yarn/development/@fortawesome/fontawesome-free-5.8.2 Mark Drobnak 2019-06-01 16:48:55 -04:00
• 31dde09222 Bump @fortawesome/fontawesome-free from 5.6.3 to 5.8.2 dependabot-preview[bot] 2019-06-01 20:28:34 +00:00
• 2c607bf1ef Merge pull request #246 from pi-hole/dependabot/npm_and_yarn/development/react-i18next-10.11.0 Mark Drobnak 2019-06-01 00:36:48 -04:00
• f407853747 Migrate to v10 of react-i18next Mcat12 2019-05-31 21:33:05 -07:00
• cec481e13e Bump react-i18next from 9.0.7 to 10.11.0 dependabot-preview[bot] 2019-06-01 03:25:17 +00:00
• f43180af66 Merge pull request #247 from pi-hole/dependabot/npm_and_yarn/development/node-fetch-2.6.0 Mark Drobnak 2019-05-31 23:22:42 -04:00
• d6905e697c Bump node-fetch from 2.3.0 to 2.6.0 dependabot-preview[bot] 2019-06-01 02:51:19 +00:00
• 103d1a834a Merge pull request #244 from pi-hole/dependabot/npm_and_yarn/development/@types/react-table-6.8.3 Mark Drobnak 2019-05-31 22:47:17 -04:00
• 0d9eba7ab7 Bump @types/react-table from 6.8.1 to 6.8.3 dependabot-preview[bot] 2019-06-01 02:32:28 +00:00
• f25abb476d Merge pull request #245 from pi-hole/dependabot/npm_and_yarn/development/@types/chart.js-2.7.53 Mark Drobnak 2019-05-31 22:28:20 -04:00
• 4252f4b81a Bump @types/chart.js from 2.7.52 to 2.7.53 dependabot-preview[bot] 2019-06-01 02:26:16 +00:00
• 7bb9b1d85e Merge pull request #243 from pi-hole/dependabot/npm_and_yarn/development/@types/react-16.8.19 Mark Drobnak 2019-05-31 22:23:40 -04:00