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

• abb03fe436 Bump react-bootstrap-typeahead from 3.4.5 to 3.4.6 dependabot-preview[bot] 2019-07-14 03:17:21 +00:00
• 8a60728512 Merge pull request #325 from pi-hole/dependabot/npm_and_yarn/development/fetch-mock-7.3.6 Mark Drobnak 2019-07-13 23:14:40 -04:00
• e97468361d Bump fetch-mock from 7.3.3 to 7.3.6 dependabot-preview[bot] 2019-07-14 03:12:21 +00:00
• ea6e6afa7b Merge pull request #327 from pi-hole/dependabot/npm_and_yarn/development/reactstrap-8.0.1 Mark Drobnak 2019-07-13 23:09:11 -04:00
• 96ac863b84 Bump reactstrap from 8.0.0 to 8.0.1 dependabot-preview[bot] 2019-07-13 18:04:44 +00:00
• 858446cca4 Merge pull request #326 from pi-hole/dependabot/npm_and_yarn/development/redux-4.0.4 Mark Drobnak 2019-07-13 14:01:50 -04:00
• cd90299a94 Bump redux from 4.0.1 to 4.0.4 dependabot-preview[bot] 2019-07-13 17:56:37 +00:00
• ffb4ce0c0b Merge pull request #330 from pi-hole/dependabot/npm_and_yarn/development/redux-saga-1.0.5 Mark Drobnak 2019-07-13 13:54:10 -04:00
• 99b7a789d6 Bump redux-saga from 1.0.4 to 1.0.5 dependabot-preview[bot] 2019-07-13 17:45:00 +00:00
• 7097014f2c Merge pull request #328 from pi-hole/dependabot/npm_and_yarn/development/types/enzyme-3.10.2 Mark Drobnak 2019-07-13 13:41:50 -04:00
• 3d96e321d0 Bump @types/enzyme from 3.10.1 to 3.10.2 dependabot-preview[bot] 2019-07-13 17:39:35 +00:00
• ecac8f97b3 Merge pull request #331 from pi-hole/dependabot/npm_and_yarn/development/types/node-12.6.2 Mark Drobnak 2019-07-13 13:36:48 -04:00
• ddee87d242 Bump @types/node from 12.0.12 to 12.6.2 dependabot-preview[bot] 2019-07-13 17:21:33 +00:00
• 021e79c361 Merge pull request #324 from pi-hole/dependabot/npm_and_yarn/development/typescript-3.5.3 Mark Drobnak 2019-07-13 13:18:11 -04:00
• b9ac8b1c54 Bump typescript from 3.5.2 to 3.5.3 dependabot-preview[bot] 2019-07-13 10:14:37 +00:00
• 2d473d640f Merge pull request #321 from pi-hole/dependabot/npm_and_yarn/development/lodash-4.17.14 Mark Drobnak 2019-07-11 11:40:55 -04:00
• b8bdd0f43a New translations settings.json (Spanish) Signed-off-by: pralor <36384445+pralor@users.noreply.github.com> pralor 2019-07-10 18:44:09 -07:00
• 051ce53177 [Security] Bump lodash from 4.17.11 to 4.17.14 dependabot-preview[bot] 2019-07-10 23:11:58 +00:00
• f637ca5523 New Crowdin translations (#291) pralor 2019-07-10 14:23:45 -07:00
• a2ba62efc6 Merge pull request #320 from pi-hole/dependabot/npm_and_yarn/development/lodash.template-4.5.0 Mark Drobnak 2019-07-10 17:20:33 -04:00
• cc9281123b [Security] Bump lodash.template from 4.4.0 to 4.5.0 dependabot-preview[bot] 2019-07-10 21:12:47 +00:00
• 9615c260d9 Merge pull request #318 from pi-hole/feature/redux Mark Drobnak 2019-07-10 17:08:45 -04:00
• 87ecf04a1a Merge branch 'development' into feature/redux Mark Drobnak 2019-07-10 16:38:21 -04:00
• 119251d397 Merge pull request #307 from pi-hole/feature/auto-login-if-no-password Mark Drobnak 2019-07-10 16:23:56 -04:00
• 2abb318f00 Merge branch 'development' into feature/auto-login-if-no-password Mark Drobnak 2019-07-10 14:23:41 -04:00
• a091867c26 Merge pull request #304 from pi-hole/tweak/ClientsGraph-test-coverage Mark Drobnak 2019-07-10 14:23:15 -04:00
• b5193bae07 Merge branch 'development' into tweak/ClientsGraph-test-coverage Mark Drobnak 2019-07-10 13:43:25 -04:00
• 3e9a6e03e9 Merge pull request #287 from pi-hole/feature/better-conditional-forwarding Mark Drobnak 2019-07-10 13:40:55 -04:00
• e7d0f008c3 Merge branch 'development' into feature/better-conditional-forwarding DL6ER 2019-07-10 19:12:37 +02:00
• 9c5a83f0fd Deploy pi-hole/web to web.pi-hole.io pralor 2019-07-10 15:47:15 +00:00
• 3b5240e32a Merge pull request #319 from pi-hole/development Mark Drobnak 2019-07-10 11:45:24 -04:00
• eb70e87be1 Restrict the CIDR values to what dnsmasq and the API accepts Mcat12 2019-07-06 18:06:16 -07:00
• 6cf7558757 Tweak the onUpdate preference setting prop Mcat12 2019-07-06 15:06:53 -07:00
• 0d23bf6fb6 Merge branch 'development' into feature/redux Mcat12 2019-07-06 15:00:26 -07:00
• 02a437d82c Merge pull request #317 from pi-hole/dependabot/npm_and_yarn/development/types/chart.js-2.7.55 Mark Drobnak 2019-07-06 17:58:40 -04:00
• 783aebb838 Bump @types/chart.js from 2.7.54 to 2.7.55 dependabot-preview[bot] 2019-07-06 21:56:23 +00:00
• f1f46804ef Merge pull request #316 from pi-hole/dependabot/npm_and_yarn/development/types/node-12.0.12 Mark Drobnak 2019-07-06 17:53:50 -04:00
• 5b9a30189c Bump @types/node from 12.0.10 to 12.0.12 dependabot-preview[bot] 2019-07-06 21:50:28 +00:00
• 39cab821db Merge pull request #314 from pi-hole/dependabot/npm_and_yarn/development/types/enzyme-3.10.1 Mark Drobnak 2019-07-06 17:48:08 -04:00
• e63a834d84 Bump @types/enzyme from 3.9.4 to 3.10.1 dependabot-preview[bot] 2019-07-06 21:44:37 +00:00
• 00b81c0fe3 Merge pull request #313 from pi-hole/dependabot/npm_and_yarn/development/types/react-16.8.23 Mark Drobnak 2019-07-06 17:38:06 -04:00
• 6506bd3b00 Bump @types/react from 16.8.22 to 16.8.23 dependabot-preview[bot] 2019-07-06 21:36:06 +00:00
• 4e7fe6e160 Merge pull request #315 from pi-hole/dependabot/npm_and_yarn/development/i18next-17.0.6 Mark Drobnak 2019-07-06 17:29:23 -04:00
• 0eb0ad7cb5 Bump i18next from 17.0.4 to 17.0.6 dependabot-preview[bot] 2019-07-06 21:26:13 +00:00
• b30b2d4787 Merge pull request #312 from pi-hole/dependabot/npm_and_yarn/development/react-i18next-10.11.4 Mark Drobnak 2019-07-06 17:23:46 -04:00
• 64380acd43 Convert LayoutApplier into a saga Mcat12 2019-07-06 14:16:04 -07:00
• ad8fe9b4f2 Move applyLanguage into its own file Mcat12 2019-07-06 13:40:58 -07:00
• ce9dc08663 Bump react-i18next from 10.11.2 to 10.11.4 dependabot-preview[bot] 2019-07-06 10:13:44 +00:00
• 8993c041cc Remove PreferencesContext in favor of the Redux store Mcat12 2019-06-30 21:35:36 -07:00
• 3cd50d21bd Convert LanguageApplier into a saga and add some tests Mcat12 2019-06-30 20:35:29 -07:00
• 5b83f43e69 Add Redux Saga Mcat12 2019-06-30 18:59:57 -07:00
• 3a8f3ba5b2 Add Redux and convert LayoutApplier as a test Mcat12 2019-06-30 15:08:21 -07:00
• 70831a3d58 Auto-login the user if no password is required Mcat12 2019-06-29 21:34:15 -07:00
• dcb82e8d1b Merge pull request #306 from pi-hole/dependabot/npm_and_yarn/development/ionicons-4.6.1 Mark Drobnak 2019-06-29 18:29:47 -04:00
• 0d8302a455 Merge branch 'development' into dependabot/npm_and_yarn/development/ionicons-4.6.1 Mark Drobnak 2019-06-29 18:27:36 -04:00
• 7abfce6b79 Merge pull request #305 from pi-hole/dependabot/npm_and_yarn/development/fs-extra-8.1.0 Mark Drobnak 2019-06-29 18:25:49 -04:00
• 342894302a Bump ionicons from 4.5.8 to 4.6.1 dependabot-preview[bot] 2019-06-29 10:15:38 +00:00
• 69784e3498 Bump fs-extra from 8.0.1 to 8.1.0 dependabot-preview[bot] 2019-06-29 10:14:40 +00:00
• 74b076843f Add missing dive to Footer test Mcat12 2019-05-10 21:20:34 -07:00
• 18ac8cf526 Bring ClientsGraph up to 100% code coverage Mcat12 2019-05-10 21:11:20 -07:00
• 20813863d3 Merge pull request #303 from pi-hole/tweak/better-withTranslation-mock Mark Drobnak 2019-06-28 13:17:55 -04:00
• 0f032ca8ef Merge branch 'development' into tweak/better-withTranslation-mock Mark Drobnak 2019-06-28 11:35:18 -04:00
• ee5c5455b7 Merge pull request #302 from pi-hole/feature/fakeAPI-preferences Mark Drobnak 2019-06-28 11:35:09 -04:00
• 74173d7deb Fix test errors after rebase Mcat12 2019-06-27 23:09:02 -07:00
• 1755037ca3 Properly mock withTranslation to wrap the provided component Mcat12 2019-05-10 21:08:43 -07:00
• 7b15f45a6a Allow preferences to be modified and persisted in fakeAPI mode Mcat12 2019-06-27 22:55:49 -07:00
• 8e0d79fdb1 Merge pull request #300 from pi-hole/dependabot/npm_and_yarn/development/react-i18next-10.11.2 Mark Drobnak 2019-06-23 00:12:01 -04:00
• 5bdfaaf19a Bump react-i18next from 10.11.0 to 10.11.2 dependabot-preview[bot] 2019-06-23 04:02:27 +00:00
• 6e39aaba39 Merge pull request #294 from pi-hole/dependabot/npm_and_yarn/development/i18next-17.0.4 Mark Drobnak 2019-06-22 23:59:44 -04:00
• cd24974e07 Bump i18next from 17.0.3 to 17.0.4 dependabot-preview[bot] 2019-06-23 03:55:46 +00:00
• 22e94b1f7b Merge pull request #293 from pi-hole/dependabot/npm_and_yarn/development/@types/react-table-6.8.4 Mark Drobnak 2019-06-22 23:53:10 -04:00
• b31c274da5 Bump @types/react-table from 6.8.3 to 6.8.4 dependabot-preview[bot] 2019-06-23 03:49:13 +00:00
• 14100a83af Merge pull request #296 from pi-hole/dependabot/npm_and_yarn/development/@types/jest-24.0.15 Mark Drobnak 2019-06-22 23:46:30 -04:00
• 227d7dde65 Bump @types/jest from 24.0.14 to 24.0.15 dependabot-preview[bot] 2019-06-23 03:40:45 +00:00
• 7597c257ff Merge pull request #297 from pi-hole/dependabot/npm_and_yarn/development/@types/react-16.8.22 Mark Drobnak 2019-06-22 23:38:04 -04:00
• 686efcd27c Bump @types/react from 16.8.20 to 16.8.22 dependabot-preview[bot] 2019-06-23 03:34:10 +00:00
• f104bbe620 Merge pull request #295 from pi-hole/dependabot/npm_and_yarn/development/@types/node-12.0.10 Mark Drobnak 2019-06-22 23:31:54 -04:00
• d2912a27ae Bump @types/node from 12.0.8 to 12.0.10 dependabot-preview[bot] 2019-06-23 03:29:15 +00:00
• 4c64d6c53f Merge pull request #298 from pi-hole/dependabot/npm_and_yarn/development/@types/enzyme-3.9.4 Mark Drobnak 2019-06-22 23:26:35 -04:00
• 1613761056 Bump @types/enzyme from 3.9.3 to 3.9.4 dependabot-preview[bot] 2019-06-23 03:24:30 +00:00
• e89fa56408 Merge pull request #299 from pi-hole/dependabot/npm_and_yarn/development/@types/chart.js-2.7.54 Mark Drobnak 2019-06-22 23:22:12 -04:00
• d6c0b92b03 Bump @types/chart.js from 2.7.53 to 2.7.54 dependabot-preview[bot] 2019-06-23 03:20:28 +00:00
• 104e5d54e8 Merge pull request #292 from pi-hole/dependabot/npm_and_yarn/development/@types/fetch-mock-7.3.1 Mark Drobnak 2019-06-22 23:18:04 -04:00
• 47ecfba741 Bump @types/fetch-mock from 7.3.0 to 7.3.1 dependabot-preview[bot] 2019-06-22 10:14:19 +00:00
• 4e86f5126a Merge branch 'development' into feature/better-conditional-forwarding Mark Drobnak 2019-06-20 22:39:30 -04:00
• 934a160b47 Merge pull request #290 from rajannpatel/development Mark Drobnak 2019-06-20 22:39:03 -04:00
• fa9507b187 prettier formatting Rajan Patel 2019-06-20 00:35:51 -04:00
• 8fcb3c7c50 del inline css & form padding, wrong password fix Rajan Patel 2019-06-20 00:30:54 -04:00
• adc1cb4624 update tests to reflect our new changes Rajan Patel 2019-06-19 23:21:53 -04:00
• ca2213f847 remove unused class Rajan Patel 2019-06-19 23:17:43 -04:00
• 3f61e3400b resolve prettier error Rajan Patel 2019-06-19 23:10:37 -04:00
• 687082d8cb resize login button Rajan Patel 2019-06-19 22:29:44 -04:00
• 886427e347 delete stray commented code Rajan Patel 2019-06-19 22:16:45 -04:00
• c36714d6c4 revise forgot password button Rajan Patel 2019-06-19 22:13:00 -04:00
• 1549601eee deleted unused styles, added global overrides Rajan Patel 2019-06-19 22:12:33 -04:00
• 5c5d96cc73 Merge pull request #288 from pi-hole/tweak/misc Mark Drobnak 2019-06-19 11:10:42 -04:00
• ca7ef484d5 Add CIDR prefix length to the settings page Mcat12 2019-06-17 19:38:32 -07:00
• e513f94610 Update fake data with new conditional forwarding API Mcat12 2019-06-17 17:41:40 -07:00
• e692d271b7 Use another defaultProps method for NavButton Mcat12 2019-05-08 20:25:12 -07:00
• 87ad853e3d Export ClientsGraphContainer instead of using a default export Mcat12 2019-05-05 20:27:41 -07:00