Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PADD v3.10.0 #285

Merged
merged 49 commits into from Dec 29, 2022
Merged

PADD v3.10.0 #285

merged 49 commits into from Dec 29, 2022

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Dec 11, 2022 •
edited

@yubiuser yubiuser changed the title PADD vNex PADD vNext Dec 11, 2022
@yubiuser
Add merge conflict workflow
48f51b8 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Sync master back into development (#294)
c276702
@yubiuser
Try to reduce flickering
11d4748 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Try to reduce flickering (#300)
cfca04c
@yubiuser
Bump version to v3.9.1
3ff2c36 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser changed the title PADD vNext PADD v3.9.1 Dec 17, 2022
yubiuser and others added 22 commits December 17, 2022 13:49
@yubiuser
Bump version to v3.9.1 (#301)
280cdd1
@dependabot @yubiuser
Bump actions/checkout from 3.1.0 to 3.2.0
05a2765 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump actions/checkout from 3.1.0 to 3.2.0 (#298)
432d9f3
@DL6ER
Check if this is a Pi-hole instead of throwing a random error
5f5c20d 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@yubiuser
Fix typo
284e8eb 
Signed-off-by: yubiuser <ckoenig@posteo.de>
@yubiuser
Check if this is a Pi-hole instead of throwing a random error (#297)
d117cb4
@yubiuser
Don't use hashed to check for updates on master
c153ad8 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Don't use hashes to check for updates on master (#302)
3ffbcf5
@DL6ER
Fix check if FTL is running
5b14547 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@yubiuser
Fix check if FTL is running (#304)
0520a95
@yubiuser
Add merge conflict workflow (#291)
1cf30ee
@DL6ER @yubiuser
Explicitly test for files instead assuming they exist
5487906 
Signed-off-by: DL6ER <dl6er@dl6er.de>
@rdwebdesign @yubiuser
Show docker tag, if it's run inside a container
41ce1c5 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@yubiuser
Add "Docker tag" and use ${DOCKER_VERSION}
9434f0a 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Test for board_vendor and board_name independently
1fde2f1 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Explicitly test for sysinfo files (#296)
1e83792
@dependabot
Bump actions/stale from 6.0.1 to 7.0.0
11ebc43 
Bumps [actions/stale](https://github.com/actions/stale) from 6.0.1 to 7.0.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](actions/stale@v6.0.1...v7.0.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump actions/stale from 6.0.1 to 7.0.0 (#311)
23aa762
@yubiuser
Shorten no merge conflict message
4bfc4c5 
Signed-off-by: Christian König <ckoenig@posteo.de>
@PromoFaux
Shorten no merge conflict message (#309)
ce2d9d5
@yubiuser
Separate Pi-hole and PADD version check
948fcd4 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Fix setting status message
03e0768 
Signed-off-by: Christian König <ckoenig@posteo.de>
yubiuser and others added 12 commits December 27, 2022 17:44
@yubiuser
Add comments
a92fe23 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Use condensed style
c445584 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Fix status message (#312)
8ca9311
@rdwebdesign
Using a function to remove undesired text from sys_model
9a70db5 
to improve code readability.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign
Add comment to describe awk command.
321b3f2 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign
Add IGNORECASE=1 and remove unused from FILTERLIST
c37ea6b 
NOTE: We couldn't find these strings in any tested hardware

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@yubiuser
Using a function to remove undesired text from sys_model to improve c…
cd0ad3a 
…ode readability (#317)
@yubiuser
Use ps instead of pidof
1b356b9 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Use pihole-FTL.pid file
1c1bca0 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Catch error response
795f1c1 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Don't use zero to signal failure
5fb896e 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Don't print cpu and mem usage when FTL is not running
5ea33f6 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser changed the title PADD v3.9.1 PADD v3.10.0 Dec 29, 2022
DL6ER and others added 5 commits December 29, 2022 08:06
@yubiuser yubiuser marked this pull request as ready for review December 29, 2022 07:20
@yubiuser yubiuser requested a review from a team December 29, 2022 07:20
@yubiuser
Decouple DNS status from blocking status
eb354d4 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser mentioned this pull request Dec 29, 2022
Merged
1 task
@yubiuser yubiuser merged commit 1933bd3 into master Dec 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rdwebdesign rdwebdesign rdwebdesign approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@yubiuser @rdwebdesign @DL6ER @PromoFaux