Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-23 19:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,780 Commits 24 Branches 113 Tags
773fed0f214616bbc55ee2b3dd70797bccbb9bbc
Commit Graph

371 Commits

Author SHA1 Message Date
marank
b597a0fcbb Merge branch 'devel' into devel 2020-06-21 12:20:33 +02:00
Adam Warner
c949516ee1 make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 18:50:36 +01:00
Adam Warner
557bd85814 change button type on dhcp static lease removal back to submit (#1456) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-09 09:28:45 +03:00
DL6ER
a4a678b584 Revert "Add per-browser boxed layout setting" 
This reverts commit c2683fb87bc50369753b279e179e7b5d0d1e60a9.

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
2e0a261c47 No not use per-browser settings for the theme to avoid flashing pages on navigation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
6ed0f056c6 Simplify code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:19:00 +01:00
DL6ER
3c793581b7 Add per-browser temp unit selection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:19:00 +01:00
DL6ER
6e52ee4307 Add per-browser theme selection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:18:36 +01:00
DL6ER
7ff5764f95 Add per-browser boxed layout setting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
0e4d1e4e7f Implement per-browser checkbox and radio button styling using icheck-material. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
621e65b9bb Merge pull request #1367 from pi-hole/clean-table-classes 
Clean table classes
 2020-05-25 20:33:48 +02:00
DL6ER
b6ad648842 Merge pull request #1329 from pi-hole/new/somepeoplelikecurves 
Add checkbox (save state in localstorage) to toggle between bar and smooth
 2020-05-25 20:08:42 +02:00
XhmikosR
b7540de7d0 Revert "Remove the invalid width="100% attribute" 
This reverts commit 59ea121e07.

Apparently, we are doing something weird in the settings tables and this doesn't work. We should revisit this later.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 17:14:04 +03:00
XhmikosR
59ea121e07 Remove the invalid width="100% attribute 
Also, add the missing `table` class in a network table.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 16:13:43 +03:00
XhmikosR
d3cd52b992 Remove the obsolete cellspacing="0" attribute. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 16:07:46 +03:00
XhmikosR
de71dd0fb5 Clean up table classes. 
These are DataTables classes which we don't use since we use Bootstrap.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 16:05:24 +03:00
Adam Warner
3957e9eef1 Move some duplicated code to utils.js 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-23 11:04:30 +03:00
Matthias rank
212da94228 Added token verification 
Moved CNAME functions to func.php
Added teleporter support
Fixed CNAME and DNS file declaration (filename was declarated in seperate file, therefore trying to read those files from func.php failed)
Fixed error and success response functions in func.php (calling addCustomDNSEntry and addCustomCNAMEEntry repeatedly from teleporter failed because of error function defined inside of those functions)

Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-05-21 14:48:13 +02:00
Adam Warner
3a549e1aae Move this checkbox to it's own section 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-19 17:17:40 +01:00
Adam Warner
c4091a7b3b Add checkbox (save state in localstorage) to toggle between bar and smooth charts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-18 20:56:21 +01:00
XhmikosR
10f6318ec6 System tab: remove "Danger Zone!" header 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 21:32:34 +03:00
XhmikosR
d22ee164b1 Move the system tab first in code. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 21:30:29 +03:00
XhmikosR
43559f2650 settings.php: remove moot form 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 21:28:24 +03:00
XhmikosR
b33c7def10 Improve nav-tabs accessibility 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 21:28:24 +03:00
XhmikosR
1ce87b127b Remove moot justify-content-md-center class 
That's a Bootstrap 4.x class.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-18 21:28:24 +03:00
XhmikosR
13335f7ae8 Settings: fix IPv6 overflowing on mobile 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 11:03:18 +03:00
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