Commit Graph

4340 Commits (9e96ff37de2e0e2c1f4d2af76360fffc42c65026)
 

Author SHA1 Message Date
Adam Warner 9e96ff37de
Fix merge conflicts
4 years ago
Adam Warner 1b41a5d59a
Merge pull request #3347 from pi-hole/tweak/binary_detection
4 years ago
Adam Warner 987ae3810d
binary, here, should be l_binary
4 years ago
Adam Warner 4d25f69526
Merge pull request #3321 from pi-hole/release/v5.0
4 years ago
DL6ER e728d7f761
Merge pull request #3318 from pi-hole/tweak/default_group
4 years ago
DL6ER 7cc35d3b04
Add update to gravity database version 12, renaming the Unassociated group to Default group.
4 years ago
DL6ER 78469ee58d
Merge pull request #3255 from pi-hole/tweak/emailregex
4 years ago
Adam Warner 369288cc48
Update advanced/Scripts/webpage.sh
4 years ago
Dan Schaper 742d802940
Merge pull request #3027 from XhmikosR/patch-1
4 years ago
DL6ER fdaf815f42
Merge pull request #3203 from MichaIng/patch-1
4 years ago
DL6ER 988b1ff02f
Merge pull request #3204 from MichaIng/patch-3
4 years ago
Dan Schaper df13b9c32a
Merge pull request #3283 from pi-hole/tweak/remove_firewall_config
4 years ago
Adam Warner 4710963ccf
Merge pull request #3312 from subdavis/development
4 years ago
Brandon Davis 1540e5bfda Remove dead code
4 years ago
Dan Schaper 017d405b28
Merge pull request #3307 from pi-hole/tweak/debugger_type_display
4 years ago
DL6ER ddb354f78b
Add enable indentation for the domainlist
4 years ago
Dan Schaper 393c7730ec
Merge pull request #3299 from pi-hole/tweak/allow_()_in_urls
4 years ago
DL6ER 4f0e47e927
Merge pull request #3296 from pi-hole/fix/remove_hostrecord
4 years ago
DL6ER f4965d8493
Merge pull request #3135 from pvogt09/development
4 years ago
DL6ER c0cf8dba87
Merge pull request #3226 from MichaIng/patch-6
4 years ago
DL6ER a9136d752a
Merge pull request #3246 from pvogt09/fix/user_exists
4 years ago
MichaIng d7bac21149 Dot not add pihole user to web server group
4 years ago
MichaIng dc6c53b6a3 Revert using hardcoded php-intl meta package
4 years ago
MichaIng 86d4c9b1e0 Failsafe checks for available APT package
4 years ago
DL6ER 288d487fc0
Allow ( and ) in adlist URLs.
4 years ago
pvogt09 462457fe7f
Merge branch 'development' into development
4 years ago
DL6ER 20ef5e0264
Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation.
4 years ago
DL6ER ad5802715e
enabled field: Center 0, right-align 1
4 years ago
DL6ER 989bbad37e
Remove pihole -a hostrecord
4 years ago
DL6ER 63f6c6a894
Add indentation for enabled and type fields
4 years ago
Adam Warner d42785a3bf
Merge pull request #3271 from pi-hole/tweak/version
4 years ago
DL6ER 401c029dc4
Improve else condition of branch determination
4 years ago
DL6ER ed9d74593d
Merge pull request #3289 from pi-hole/tweak/boldify_uniques
4 years ago
Adam Warner 9286965ee2
Merge pull request #3287 from pi-hole/tweak/remove-deprecated-list
4 years ago
DL6ER fa57c457f3
Boldify number of unique domains as this is the actually interesting number
4 years ago
DL6ER 0343171703
Add correct displaying for detached HEAD state.
4 years ago
DL6ER 176fbaf83b
Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present.
4 years ago
Adam Warner 94a4f844a8
Remove deprecated list
4 years ago
Adam Warner d18a8b1b8a
Merge pull request #3205 from MichaIng/patch-5
4 years ago
Adam Warner a37dba2c81
remove configureFirewall function, the call to it, and related tests
4 years ago
Adam Warner 471006676c
Merge pull request #3227 from pi-hole/new/CLI_domain_comments
4 years ago
Adam Warner 0155d42650
Merge pull request #3252 from yubiuser/patch-1
4 years ago
Adam Warner e80990c27a
Merge pull request #3282 from pi-hole/revert-3276-feature/support_for_new_cloudflare_dns_for_families
4 years ago
Adam Warner e6dcccc7bd Revert "- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors (#3276)"
4 years ago
Adam Warner 3cc9ba4ee8
stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk>
4 years ago
Adam Warner 6dc85c3527
Don't display branch name if it is on master.
4 years ago
Mohammed Swillam 7e1a8c1ceb
- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors (#3276)
4 years ago
Dan Schaper 4f01daf5bc
Merge pull request #3244 from atenart/remove-hosts-file-ads-list
4 years ago
Dan Schaper 0f20470a38
Merge pull request #3269 from pi-hole/tweak/hosts-comments
4 years ago
Adam Warner 851947bbf2
Add branch name to version output
4 years ago