Commit Graph

2290 Commits

Author SHA1 Message Date
DL6ER 86bcda8418 Use versions/branches from external file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 13:35:21 +02:00
Mcat12 11ac1d642b Merge pull request #608 from JamieMagee/remote-tt-tags
Remove <tt> tags
2017-10-25 16:11:19 -04:00
Jamie Magee 6fd0c5eff8 Replace <tt> tags with <samp> tags 2017-10-25 12:56:18 +00:00
DL6ER abdd226456 Merge pull request #607 from pi-hole/fix/dhcp-settings
Add form tag back to DHCP settings
2017-10-23 08:47:33 +02:00
DL6ER fd766dfdbb Merge pull request #593 from pi-hole/fix/non-local-FTL
Explicitly allow non-local FTL installations
2017-10-23 08:47:02 +02:00
JamieMagee a12e1bf304 Replace deprecated tt tag with kbd tag 2017-10-22 23:57:16 +02:00
Mcat12 19f18b30b6 Add form tag back 2017-10-22 17:55:26 -04:00
Mcat12 b02d752efa Merge pull request #552 from pi-hole/tweak/DB_trytoreconnect
Try to reconnect to FTL's database if first attempt failed
2017-10-22 17:30:02 -04:00
DL6ER 62e3e2219e Merge pull request #605 from pi-hole/tweak/settings_tabs
Multi-Tab Settings page
2017-10-22 16:06:22 +02:00
DL6ER e206c3cdf3 Fix forms on combined API / web interface
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 15:17:43 +02:00
DL6ER 06d601a0ee 3 seconds before starting auto-dismissal
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 15:10:22 +02:00
DL6ER 618a046b64 Auto dismissal for info and error notifications
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 15:07:17 +02:00
DL6ER 1cbd2ea9bd Remove logging sub-tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 14:52:37 +02:00
DL6ER 72a5ee0556 Add missing table properties
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 14:48:44 +02:00
DL6ER dbea4c9ef6 Remove empty column in blocking lists table
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 14:45:49 +02:00
DL6ER bb0bd458f5 Added some missing class "row" div's
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 14:34:34 +02:00
DL6ER 786d40baa5 Added missing row to "Advanced DNS settings" sub tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 14:15:48 +02:00
DL6ER 6ba394ebe2 Added missing border on DNS tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 14:04:10 +02:00
DL6ER 20e7d9d338 Improve mobile design of system tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-22 13:40:17 +02:00
DL6ER 8b61ea5c05 Another small arrangement
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 14:33:16 +02:00
DL6ER 1a707a081f Rearragne buttons on the system tabs
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 13:53:34 +02:00
DL6ER a2f0905712 Combine API and web interface tabs
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 13:19:14 +02:00
DL6ER 8eddb5abba Make system tab rather than the blocking lists tab the first (and default) tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 13:09:06 +02:00
DL6ER 1ae65f28de Modify the buttons on the systems tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 13:05:17 +02:00
DL6ER 445569a2bd Put logging disable/enable/flush buttons on systems tab into box footer
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:59:18 +02:00
DL6ER 9684c368d5 Put save button on web interface into box footer
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:56:11 +02:00
DL6ER d516c63262 Put buttons on API tabs into box footer
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:55:20 +02:00
DL6ER be78c38f37 Put buttons on block lists tab into a box footer
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:53:09 +02:00
DL6ER a9e4feb74a Fix block lists HTML
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:51:26 +02:00
DL6ER 9235a6fb20 Adjust Teleporter boxes for smaller screens
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:46:44 +02:00
DL6ER 1202ad5335 Split Teleporter into two boxes: Export and Import
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:45:37 +02:00
DL6ER 0c70ad5895 Add Teleporter box
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:40:08 +02:00
DL6ER 1e1a8ac080 Add Web interface settings box
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:37:26 +02:00
DL6ER 1f320b0264 Add box for API settings
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:35:04 +02:00
DL6ER 89e4bf8902 Fix layouting in blocking lists tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:12:43 +02:00
DL6ER a1d96e4e63 Improve Javascript (allow toggling of deletion and highlight "Save and Update" button on deletion) and :codacy:
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 12:08:00 +02:00
DL6ER b70e43f8ba Fix blocking list Javascript
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 11:52:35 +02:00
DL6ER 852f0a733a Fix Javascript error that appears when there is no hash part on the URL
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 11:24:52 +02:00
Adam Warner ec4b43961c Merge remote-tracking branch 'origin/tweak/settings_tabs' into tweak/settings_tabs 2017-10-20 22:30:31 +01:00
Adam Warner 7bd0fb1e56 Sort out system tab. Start sorting out blocklists tab... but it's very broken! Duplicates disabled lists....
Signed-off-by: Adam Warner <adamw@rner.email>
2017-10-20 22:29:53 +01:00
DL6ER 3640867942 :codacy:
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-20 19:30:17 +02:00
Adam Warner f6a05a00b3 tidy up some experimenting
Signed-off-by: Adam Warner <adamw@rner.email>
2017-10-19 23:09:13 +01:00
Adam Warner 62b8c0d733 fix dhcp lease table headers/footers.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-10-19 23:06:38 +01:00
DL6ER 5ef9fe73cd Move IPv6 DHCP check box to the bottom of the Adv. DHCP settings tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-19 19:26:21 +02:00
DL6ER a604a49be4 Move interface listening behavior to the top right void of the DNS settings tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-19 19:24:46 +02:00
DL6ER 97b7c2458d Put buttons on Query Logging out of the box (this is how it is also done on the other tabs)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-19 19:11:53 +02:00
DL6ER 7bbf04547c Change buttons on System tab to one per row
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-19 19:10:17 +02:00
DL6ER 2a5422cbae Fix FTL diagnostic data display by removing erroneously added indentation
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-19 19:07:48 +02:00
Mcat12 d70084b60c Merge pull request #597 from pi-hole/fix/whitelist-no-password
Fix whitelisting when no password is set
2017-10-19 10:38:37 -04:00
Mcat12 1b59d8eb7f Merge pull request #606 from BrokenCommander/patch-1
Small change
2017-10-19 09:35:04 -04:00