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

v5.15 #2349

Merged
merged 21 commits into from
Sep 14, 2022
Merged

v5.15 #2349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dbd87d8
sync: master to devel (#2333)
PromoFaux Sep 4, 2022
e5ce534
Do not apply IDNA conversion to regex domains
yubiuser Sep 7, 2022
c958cc8
Do not apply IDNA conversion to RegEx domains (#2336)
DL6ER Sep 8, 2022
b75ec45
Add interpretation for Pi-hole message type ADLIST
yubiuser Sep 1, 2022
dff2939
Guard database data
yubiuser Sep 8, 2022
c013618
Set Samesite=Strict for PHP session cookie. The cookie is set manuall…
DL6ER Sep 8, 2022
eb83420
Set Samesite=Strict for PHP session cookie (#2285)
DL6ER Sep 8, 2022
d12ef01
Use constants in place of class constants
rdwebdesign Sep 9, 2022
9485353
Use constants in place of class constants (#2342)
rdwebdesign Sep 9, 2022
3235056
Add the ability to filter domains by type
rdwebdesign Sep 5, 2022
3ef3099
Move filter selector to header-box
rdwebdesign Sep 6, 2022
e3b4cd9
Fix LCARS visual and allow user selected checkbox theme
rdwebdesign Sep 7, 2022
4d8b19f
Address team decisions
rdwebdesign Sep 9, 2022
2c1db2c
Add the ability to filter domains by type (whitelist, blacklist, rege…
rdwebdesign Sep 10, 2022
2851996
Update browserlist
yubiuser Sep 11, 2022
23b0371
Update browserlist (#2344)
yubiuser Sep 11, 2022
43056fd
Update queries.js
jpgpi250 Sep 12, 2022
a73be14
Show link from query log to domain table for black/whitelisted domain…
yubiuser Sep 12, 2022
fcdde5c
Avoid message warnings if session was already started.
rdwebdesign Sep 13, 2022
ff92722
Avoid message warnings on Settings page, if session was already start…
yubiuser Sep 14, 2022
aa529a7
Add interpretation for Pi-hole message type ADLIST (#2320)
PromoFaux Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,22 +86,22 @@

switch ($_GET['list']) {
case 'black':
$_POST['type'] = ListType::blacklist;
$_POST['type'] = LISTTYPE_BLACKLIST;

break;

case 'regex_black':
$_POST['type'] = ListType::regex_blacklist;
$_POST['type'] = LISTTYPE_REGEX_BLACKLIST;

break;

case 'white':
$_POST['type'] = ListType::whitelist;
$_POST['type'] = LISTTYPE_WHITELIST;

break;

case 'regex_white':
$_POST['type'] = ListType::regex_whitelist;
$_POST['type'] = LISTTYPE_REGEX_WHITELIST;

break;

Expand Down
10 changes: 10 additions & 0 deletions groups-domains.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,16 @@
<h3 class="box-title">
List of domains
</h3>
<div class="filter_types">
<div class="line">
<span><input type="checkbox" name="typ" value="0" id="typ0" checked><label for="typ0">Exact whitelist</label></span>
<span><input type="checkbox" name="typ" value="2" id="typ2" checked><label for="typ2">Regex whitelist</label></span>
</div>
<div class="line">
<span><input type="checkbox" name="typ" value="1" id="typ1" checked><label for="typ1">Exact blacklist</label></span>
<span><input type="checkbox" name="typ" value="3" id="typ3" checked><label for="typ3">Regex blacklist</label></span>
</div>
</div>
</div>
<!-- /.box-header -->
<div class="box-body">
Expand Down
Loading