vhad/web
1
0
Fork 0
mirror of https://github.com/gosticks/web.git synced 2026-10-06 22:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
426 Commits 11 Branches 0 Tags
08967692b8b0c313bd511595f1348d46bbcb9735
Commit Graph
426 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Drobnak 08967692b8 Merge pull request #77 from pi-hole/fix/settings-strings 
WEB-CR-6 Fix missing translation string errors in settings
 2018-08-18 15:21:12 -04:00
Mcat12 4aa9c715e0 Fix missing translation string errors in settings 
This also fixes an HTML error where there was a missing `<tbody>` tag
in the version cards.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-18 15:18:31 -04:00
Mark Drobnak 436b621b25 Merge pull request #76 from pi-hole/update/translations 
WEB-CR-5 Update Translations 8/18/2018
 2018-08-18 14:53:19 -04:00
Mcat12 e036c770cf Update Translations 8/18/2018 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-18 14:26:49 -04:00
Mark Drobnak bdcf521600 Merge pull request #75 from pi-hole/tweak/version-card 
WEB-CR-3 Improve version cards with general version and detailed version info
 2018-08-18 14:15:55 -04:00
Mcat12 e9641b03bd Improve version cards with general version and detailed version info 
The versions page is more responsive as well.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-18 14:02:43 -04:00
Mark Drobnak a6be8ade04 Merge pull request #74 from pi-hole/tweak/restructure-components 
Organize components into folders based on where they are used
 2018-08-18 11:40:09 -04:00
Mark Drobnak c1b01e419f Merge branch 'development' into tweak/restructure-components 2018-08-18 11:36:23 -04:00
Mcat12 61cc62306e Organize components into folders based on where they are used 
For example, dashboard components go into the dashboard folder,
settings components go into the settings folder, and components
used in multiple places go into the common folder.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-18 11:34:35 -04:00
Mark Drobnak bd6e7ee518 Merge pull request #73 from pi-hole/fix/ci-tag 
Use the correct env variable when checking if this is a tag build
 2018-08-18 11:16:40 -04:00
Mcat12 93fa41cfad Store tag builds in folder named after tag 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-16 11:13:42 -04:00
Mcat12 2751b09ef0 Use the correct env variable when checking if this is a tag build 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-16 10:55:29 -04:00
Mark Drobnak 2683c6be13 Merge pull request #71 from pi-hole/fix/deploy-workflow 
Fix deploy job not running on master branch
 2018-08-01 22:04:42 -04:00
Mcat12 52b45832ac Remove old filter from deploy job 
It was moved to the workflow, and is now obsolete.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-01 22:00:16 -04:00
Mcat12 462bab4b2e Fix deploy job not running on master branch 
Without a workflow, only the "build" job is run.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-01 21:53:17 -04:00
Mark Drobnak 9d824d7ff6 Merge pull request #69 from pi-hole/update/translations 
Update translations
 2018-07-31 22:01:11 -04:00
Mcat12 8e0034ec70 Update translations 
New are Bulgarian, Portuguese, and Spanish

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-31 21:58:40 -04:00
Mark Drobnak bb12677671 Merge pull request #68 from pi-hole/feature/tests 
Add tests
 2018-07-23 17:24:21 -04:00
Mcat12 35bbda41d7 Add tests for ListPage 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-22 14:25:49 -04:00
Mcat12 243213f9df Merge remote-tracking branch 'origin/development' into feature/tests 2018-07-08 18:22:01 -04:00
Mcat12 1a13f56cd4 Add title test for GenericDoughnutChart 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 18:21:32 -04:00
Mcat12 78e6706e31 Add title and API callback tests for GenericDoughnutChart 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 18:11:04 -04:00
Mcat12 0ef14714cf Use forward destinations tests for GenericDoughnutChart 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 18:06:18 -04:00
Mcat12 625ccbd2e6 Combine forward destinations and query types charts into one component 
Named GenericDoughnutChart.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 18:05:54 -04:00
Mcat12 e653bf1211 Add ForwardDestinationsChart tests 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 17:44:31 -04:00
Mcat12 3816cabbbd Add ClientsGraph tests 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 17:39:31 -04:00
Mark Drobnak 2f42bcea84 Merge pull request #66 from pi-hole/fix/fake-data-settings 
Allow fake settings data to be deployed
 2018-07-08 17:02:41 -04:00
Mcat12 a8a181f49d Allow fake settings data to be deployed 
If it is ignored, then the deploy commit would not include the data.

Also made it explicit that the folders are not ignored, not a file with
the same name as the folder.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 16:57:00 -04:00
Mcat12 2739d9b015 Rename util.test.js to match utils.js 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 22:34:53 -04:00
Mcat12 93a68243d3 Add StatusBadge tests 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 22:34:33 -04:00
Mcat12 5e6c5eee01 Add SummaryStats test and fix incorrect error 
Switched "Lost" and "Connection" so it reads "Lost Connection" now.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 21:43:06 -04:00
Mcat12 b32cdd5a2a Add Sidebar tests 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 18:50:29 -04:00
Mcat12 097409e5a2 Improve sidebar active dropdown detection 
Dropdown routes require a URL prefix so that we can determine if the
dropdown should be active. Example: "/blacklist/exact" triggers the
blacklist dropdown because it has the "/blacklist" prefix.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 18:50:18 -04:00
Mcat12 80db76f9da Ensure all .nav-item elements have a pointer cursor 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 17:54:39 -04:00
Mcat12 5797e5816c Fix incorrect Sidebar prop in Full 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 17:54:00 -04:00
Mcat12 439ed09411 Update package-lock.json 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 17:41:22 -04:00
Mcat12 7c0b0657b7 Merge branch 'development' into feature/tests 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 17:39:04 -04:00
Rob Gill ae0d295068 Merge pull request #62 from rrobgill/info 
Settings - Information pages
 2018-07-05 12:27:58 +10:00
Mcat12 63e0616289 Updated translations 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-04 15:40:49 -04:00
Rob Gill f16f4f195f Props required 
Formatting

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Rob Gill 2128e6ec55 Code formatting 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Rob Gill 6cc22d89a6 Formatting, translation namespaces 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Rob Gill 6be8b9255e Translate tags added 
Code formatting

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Rob Gill 8a611a627c Changed paths /settings 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Rob Gill ead087d375 Paths changed to /settings 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Rob Gill ebe2cbb315 Hash length increased to 7 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Rob Gill ad7ec23b17 Aligned with CoreUI update 
Information 1 & 2 renamed to "Versions" and "Networking", contents adjusted
Faker : "vDev" for git tags, first word of multi-word returns used for domain, hostname etc.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Rob Gill 0cfd9a28a0 Settings - Information pages 
All changes from conflicted/mangled pull request.

Network Information
Pi-Hole component versions, branches
DNS Upstream & Settings information
DHCP settings information
FTLdb size information

Displayed in two pages, available in drop down from
settings in the sidebar.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-07-04 15:24:49 -04:00
Mark Drobnak 0ac44278a2 Merge pull request #65 from pi-hole/feature/fake-data-auth 
Allow logging in with fake data
 2018-07-03 13:20:39 -04:00
Mark Drobnak 0336f18e3a Merge branch 'development' into feature/fake-data-auth 2018-07-03 13:15:40 -04:00