Commit Graph

345 Commits

Author SHA1 Message Date
DL6ER
3b43fc6f36 Fix a small glitch and rename Blocklists to Adlists
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-14 18:32:16 +02:00
DL6ER
1fe6d18838 Fix failed auto-merge.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:52:18 +02:00
DL6ER
05d5f02a36 Add theme chooser to Setting -> Web interface.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00
DL6ER
064a0aae9c Use the iCheck library for input box styling.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00
DL6ER
170e9d37a7 Add custom checkboxes.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:49:33 +02:00
DL6ER
08d2676489 Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 21:14:18 +02:00
DL6ER
d2838f3d04 Improve arrangement of check boxes in the Teleporter Import box.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 20:32:51 +02:00
DL6ER
ac3c178ce9 Add import for Local DNS Records.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 20:23:26 +02:00
DL6ER
f831b1755b Rename Teleporter Ex-/Import to Backup and Restore to highlight that they are meant for being done on one and the same device rather than for transporting stuff between different installations (even when this is and will stay possible).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 20:23:26 +02:00
DL6ER
ad4a10c01e Add import for missing tables: group, client + the group linking tables.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 20:23:26 +02:00
DL6ER
e96acc415d Merge pull request #1262 from pi-hole/xmr-button-type
Add `type="button"` to all buttons.
2020-05-11 22:05:34 +02:00
XhmikosR
8db0957a28 Minor tweaks
* use the background-color property instead of the background shorthand
* add multiple classes with one `addClass` call
* rename `underline` to `text-underline`
* use the CSS class `pointer` instead of adding CSS via JS
* change `border-color: transparent` to `border: 0` in the navbar right dropdown image
* add image dimensions in the dropdown donate image
* remove the obsolete and unneeded `center` element from network.php
* remove commented out PHP code from header.php
* fix wrong `form-control` class used in buttons

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-11 21:49:48 +03:00
XhmikosR
43151d3c43 Add type="button" to all buttons.
The default is `type="submit"`.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-11 21:40:26 +03:00
DL6ER
73ee91a024 Merge branch 'master' into master-to-development-v5.0
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-10 22:00:07 +02:00
DL6ER
a64810e00e Merge branch 'release/v5.0' into devel
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-08 12:25:18 +02:00
DL6ER
43b45d3da7 Merge pull request #1100 from Ghalid/patch-1
Disable text correction features, change types to make input fields easier to type in (especially for mobile devices)
2020-04-07 13:59:44 +02:00
TheME
ff5e4eec86 fix input fields spacing issues
Signed-off-by: Th3M3 <the_me@outlook.de>
2020-04-06 20:52:17 +02:00
XhmikosR
6f17d7c4ea Teleporter: reword export text
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-03-15 21:55:29 +02:00
DL6ER
13b7b3d1a9 Remove redundant adlist management on settings page. This is still using CLI callbacks instead of working directly on the database.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-11 20:07:43 +01:00
Adam Warner
519e2771f1 Merge pull request #1124 from pi-hole/master-xmr-fa
Switch to using Font Awesome
2020-02-08 12:31:07 +00:00
Ghalid
050fdb1c34 Merge branch 'devel' into patch-1
Signed-off-by: Ghalid <24234921+Ghalid@users.noreply.github.com>
2020-01-19 12:49:36 -05:00
Samu Voutilainen
b7e9bd492c Use piholeFTLConfig() to resolve pihole-FTL.conf contents
Signed-off-by: Samu Voutilainen <smar@smar.fi>
2020-01-19 16:07:33 +02:00
Samu Voutilainen
e70b9305bb Whitespace cleanup
Signed-off-by: Samu Voutilainen <smar@smar.fi>
2020-01-19 16:07:33 +02:00
XhmikosR
dee16f6c7a Switch to using Font Awesome
This should be more consistent.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-01-19 13:53:48 +02:00
Ghalid
c720cce675 Disable autocorrect on top list exclusion textareas
Signed-off-by: Ghalid <24234921+Ghalid@users.noreply.github.com>
2019-12-20 16:14:42 -05:00
Ghalid
c7f56df0a6 Disable spellcheck for some text fields, changed some input field types
Signed-off-by: Ghalid <24234921+Ghalid@users.noreply.github.com>
2019-12-20 12:18:52 -05:00
DL6ER
52f5be0c8f Merge pull request #992 from trimalcione/devel
Add DHCP leases export/import from teleporter
2019-12-16 11:22:28 +01:00
XhmikosR
5275faacb1 Lowercase hex colors.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-09 16:53:21 +02:00
trimalcione
6c04b8cb39 add DHCP static leases import from teleporter
Signed-off-by: trimalcione <okchtioui@gmail.com>
2019-12-02 16:21:19 +01:00
Adam Warner
fff357acee Merge branch 'devel' into noopener 2019-11-25 19:18:03 +00:00
XhmikosR
e68e7719fc Specify rel=noopener for external links.
See https://developers.google.com/web/tools/lighthouse/audits/noopener for more information

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-11-24 23:00:02 +02:00
Ghalid
9173304773 Use HTTPS in DNSSEC resolver test link
Signed-off-by: Ghalid <24234921+Ghalid@users.noreply.github.com>
2019-11-21 19:51:38 -05:00
trimalcione
72af77eef9 Merge branch 'devel' into devel 2019-10-19 01:13:35 +02:00
Adam Warner
8311a0aefc Add ability for user to include comment when adding a blocklist
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-10-14 22:59:05 +01:00
Adam Warner
b7d3ddd2b0 Merge branch 'devel' into release/v4.3.2 2019-09-22 00:58:42 +01:00
Mcat12
d23df61a49 Fix some XSS issues in settings.php
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-09-18 17:16:39 -04:00
TheME
e816c28fd0 fix broken Icons
Signed-off-by: Th3M3 <the_me@hotmail.de>
2019-09-12 21:11:12 -04:00
DL6ER
d2ff1f9093 Clarify that the router does not always have to be the DHCP server. Fixes #893
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-12 21:05:53 -04:00
DL6ER
fb17a8536c Extend description of regex lists (they also contain the wildcard-style rules)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-05 19:08:05 +02:00
DL6ER
bc4f508970 Merge pull request #986 from pi-hole/new/whitelist-regex-support
Add whitelist regex support
2019-09-01 14:23:50 +02:00
DL6ER
4743228a86 Allow domains to be added by hitting return (add them as exact domains).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-27 17:19:05 +02:00
trimalcione
9d32aa6489 Add DHCP leases export/import from teleporter
Signed-off-by: trimalcione <okchtioui@gmail.com>
2019-08-20 18:12:16 +02:00
TheME
5ea4e6d185 fix broken Icons
Signed-off-by: Th3M3 <the_me@hotmail.de>
2019-08-04 21:11:32 +02:00
DL6ER
72c0233436 Add option to flush tables during import (defaults to true). By unchecking this box, users can import (= only add) other lists without loosing the present content. Conflict management is done through INSERT OR IGNORE which will silently skip entries that violate the UNIQUE constraint.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-24 21:15:32 +02:00
DL6ER
1ddf36a752 Archive and restore full tables instead of only domains. Use JSON as backup file format.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-24 21:10:19 +02:00
Mark Drobnak
4e1df1664c Merge pull request #951 from pi-hole/new/arp-flush
Add button for pihole arpflush on Pi-hole settings page
2019-07-04 14:10:29 -04:00
DL6ER
2f5f95dba1 Clarify that the router does not always have to be the DHCP server. Fixes #893
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-15 17:47:07 +02:00
DL6ER
72abc5dad4 Add button for pihole arpflush on Pi-hole settings page
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30 22:05:13 +02:00
Dan Schaper
a25195636c Merge pull request #939 from pi-hole/release/v4.3
Update Dev with v4.3 fixes
2019-05-21 17:45:25 -07:00
Mcat12
d0b0eb8822 Fix wording on blocklist text field placeholder and fix empty input tag
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-01 20:53:34 -07:00