vhad/web
1
0
Fork 0
mirror of https://github.com/gosticks/web.git synced 2026-10-06 14:47:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,242 Commits 11 Branches 0 Tags
dcb82e8d1b0e6bf97905356a930e12dd5e6aecb4
Commit Graph
1242 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Drobnak dcb82e8d1b Merge pull request #306 from pi-hole/dependabot/npm_and_yarn/development/ionicons-4.6.1 
Bump ionicons from 4.5.8 to 4.6.1
 2019-06-29 18:29:47 -04:00
Mark Drobnak 0d8302a455 Merge branch 'development' into dependabot/npm_and_yarn/development/ionicons-4.6.1 2019-06-29 18:27:36 -04:00
Mark Drobnak 7abfce6b79 Merge pull request #305 from pi-hole/dependabot/npm_and_yarn/development/fs-extra-8.1.0 
Bump fs-extra from 8.0.1 to 8.1.0
 2019-06-29 18:25:49 -04:00
dependabot-preview[bot] 342894302a Bump ionicons from 4.5.8 to 4.6.1 
Bumps [ionicons](https://github.com/ionic-team/ionicons) from 4.5.8 to 4.6.1.
- [Release notes](https://github.com/ionic-team/ionicons/releases)
- [Commits](https://github.com/ionic-team/ionicons/compare/v4.5.8...v4.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-29 10:15:38 +00:00
dependabot-preview[bot] 69784e3498 Bump fs-extra from 8.0.1 to 8.1.0 
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 8.0.1 to 8.1.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/commits/8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-29 10:14:40 +00:00
Mark Drobnak 20813863d3 Merge pull request #303 from pi-hole/tweak/better-withTranslation-mock 
Properly mock withTranslation to wrap the provided component
 2019-06-28 13:17:55 -04:00
Mark Drobnak 0f032ca8ef Merge branch 'development' into tweak/better-withTranslation-mock 2019-06-28 11:35:18 -04:00
Mark Drobnak ee5c5455b7 Merge pull request #302 from pi-hole/feature/fakeAPI-preferences 
Allow preferences to be modified and persisted in fakeAPI mode
 2019-06-28 11:35:09 -04:00
Mcat12 74173d7deb Fix test errors after rebase 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-06-27 23:09:02 -07:00
Mcat12 1755037ca3 Properly mock withTranslation to wrap the provided component 
Also improved some test suites to use a custom render method to reduce
duplicate code. The render method provides default props and
automatically dives and casts the wrapper.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-06-27 23:01:28 -07:00
Mcat12 7b15f45a6a Allow preferences to be modified and persisted in fakeAPI mode 
Fixes #301

Removed the preference loading code in PreferenceSettings, as it already
gets the preference data from the PreferencesContext provider.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-06-27 22:55:49 -07:00
Mark Drobnak 8e0d79fdb1 Merge pull request #300 from pi-hole/dependabot/npm_and_yarn/development/react-i18next-10.11.2 
Bump react-i18next from 10.11.0 to 10.11.2
 2019-06-23 00:12:01 -04:00
dependabot-preview[bot] 5bdfaaf19a Bump react-i18next from 10.11.0 to 10.11.2 
Bumps [react-i18next](https://github.com/i18next/react-i18next) from 10.11.0 to 10.11.2.
- [Release notes](https://github.com/i18next/react-i18next/releases)
- [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/react-i18next/compare/v10.11.0...v10.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-23 04:02:27 +00:00
Mark Drobnak 6e39aaba39 Merge pull request #294 from pi-hole/dependabot/npm_and_yarn/development/i18next-17.0.4 
Bump i18next from 17.0.3 to 17.0.4
 2019-06-22 23:59:44 -04:00
dependabot-preview[bot] cd24974e07 Bump i18next from 17.0.3 to 17.0.4 
Bumps [i18next](https://github.com/i18next/i18next) from 17.0.3 to 17.0.4.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next/compare/v17.0.3...v17.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-23 03:55:46 +00:00
Mark Drobnak 22e94b1f7b Merge pull request #293 from pi-hole/dependabot/npm_and_yarn/development/@types/react-table-6.8.4 
Bump @types/react-table from 6.8.3 to 6.8.4
 2019-06-22 23:53:10 -04:00
dependabot-preview[bot] b31c274da5 Bump @types/react-table from 6.8.3 to 6.8.4 
Bumps [@types/react-table](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-table) from 6.8.3 to 6.8.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-table)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-23 03:49:13 +00:00
Mark Drobnak 14100a83af Merge pull request #296 from pi-hole/dependabot/npm_and_yarn/development/@types/jest-24.0.15 
Bump @types/jest from 24.0.14 to 24.0.15
 2019-06-22 23:46:30 -04:00
dependabot-preview[bot] 227d7dde65 Bump @types/jest from 24.0.14 to 24.0.15 
Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 24.0.14 to 24.0.15.
- [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-23 03:40:45 +00:00
Mark Drobnak 7597c257ff Merge pull request #297 from pi-hole/dependabot/npm_and_yarn/development/@types/react-16.8.22 
Bump @types/react from 16.8.20 to 16.8.22
 2019-06-22 23:38:04 -04:00
dependabot-preview[bot] 686efcd27c Bump @types/react from 16.8.20 to 16.8.22 
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 16.8.20 to 16.8.22.
- [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-23 03:34:10 +00:00
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