Merge branch 'master' into release/v5.0

.github/workflows/build.yml

@@ -2,6 +2,7 @@ name: Build and Deploy
 
 env:
   CI: true
+  PYTHON_VERSION: '3.7'
 
 on: [push, pull_request]
 
@@ -16,15 +17,15 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '${{ env.PYTHON_VERSION }}'
           architecture: 'x64'
 
       - name: Cache dependencies
         uses: actions/cache@v1
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ env.PYTHON_VERSION }}-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: ${{ runner.os }}-pip-${{ env.PYTHON_VERSION }}-${{ hashFiles('**/requirements.txt') }}
 
       - name: Install Python dependencies
         run: python3 -m pip install -r requirements.txt

.github/workflows/test.yml

@@ -16,9 +16,6 @@ jobs:
         with:
           node-version: '12'
 
-      - run: node --version
-      - run: npm --version
-
       - name: Install npm dependencies
         run: npm ci
 

docs/main/projects.md

@@ -1,7 +1,7 @@
 ---
 title: Community Projects
 description: Things built with Pi-hole
-last_updated: Sun Jan 13 19:45:40 2019 UTC
+last_updated: Mon Apr 20 19:45:40 2019 UTC
 ---
 
 - [The Big Blocklist Collection](https://firebog.net/)
@@ -20,3 +20,4 @@ last_updated: Sun Jan 13 19:45:40 2019 UTC
 - [Pi-hole Droid: Android client](https://github.com/friimaind/pi-hole-droid)
 - [Windows DNS Swapper](https://github.com/tryallthethings/DNS-Swapper), see [#1400](https://github.com/pi-hole/pi-hole/issues/1400)
 - [Pi-hole Visualizer](https://www.reddit.com/r/pihole/comments/82ikgb/pihole_visualizer_update/)
+- [Enable/Disable Pi-Hole from your iPhone Home Screen](https://codeopolis.com/posts/how-to-control-pi-hole-from-your-iphone/)

mkdocs.yml

@@ -2,7 +2,7 @@ site_name: 'Pi-hole documentation'
 site_url: 'https://docs.pi-hole.net/'
 repo_url: 'https://github.com/pi-hole/pi-hole'
 edit_uri: '../docs/blob/master/docs/'
-copyright: 'Copyright © 2019 Pi-hole LLC'
+copyright: 'Copyright © 2020 Pi-hole LLC'
 remote_branch: gh-pages
 theme:
   name: 'material'
@@ -123,8 +123,10 @@ extra:
   social:
     - icon: fontawesome/solid/globe-americas
       link: https://pi-hole.net/
+      name: Website
     - icon: fontawesome/brands/github
       link: https://github.com/pi-hole
+      name: GitHub
 
 extra_css:
   - extra.css

requirements.txt

@@ -1,4 +1,4 @@
 markdown-include==0.5.1
 mkdocs==1.1
 mkdocs-git-revision-date-localized-plugin==0.5.0
-mkdocs-material==5.1.1
+mkdocs-material==5.1.5