Commit Graph

465 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
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
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
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
1a707a081f Rearragne buttons on the system tabs
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 13:53:34 +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
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
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
eced0d2ef9 Merge pull request #600 from pi-hole/fix/client-graph-empty-error
Fix client graph empty overtime data error
2017-10-19 09:34:47 -04:00
Mcat12
37e9b692cb Merge pull request #599 from andreskrey/prg-method-during-login
Redirect the user to home after successful login
2017-10-19 09:04:20 -04:00
DL6ER
903cb2a4f4 Make DNS the default tab
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-19 10:55:02 +02:00
DL6ER
1e105f1df6 Change hash for save and reload
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-19 10:45:12 +02:00
DL6ER
37313bf400 Go to specified tab on save or hyperlink
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-19 10:41:03 +02:00
WaLLy3K
60b5e36c32 Check for updates every two days
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-12 20:54:04 +11:00
Mcat12
ff82895be8 Fix error when no client over time data is available 2017-10-11 15:00:51 -04:00
Andres Rey
a3aecbf15a Remove unused sprintf function 2017-10-10 18:42:32 +01:00
DL6ER
d6262a083e Merge pull request #585 from pi-hole/tweak/query_log_clickfiltering
Allow one-click filtering in Query Log
2017-10-10 19:18:30 +02:00
DL6ER
89af9880c1 Merge pull request #583 from pi-hole/new/clientsovertime
Add "Clients (over time)" graph
2017-10-10 19:17:39 +02:00
Andres Rey
33db4f2842 Redirect the user in a POST-Redirect-GET fashion after a successful login 2017-10-10 10:40:18 +01:00
Mcat12
c60b703680 Appease codacy 2017-10-07 17:09:49 -04:00
Mcat12
cea17a4766 Allow whitelisting/blacklist even if there is no password set 2017-10-07 16:51:22 -04:00
DL6ER
688e3f8665 Merge branch 'devel' into tweak/Teleporter_v2.0 2017-10-07 17:49:05 +02:00
DL6ER
b6caf5878f Ensure we restart dnsmasq only once (at the end of importing stuff)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 17:34:10 +02:00
DL6ER
bfad6d8fcb Add nuke option before importing new list to be sure the content is being replaced instead of appended
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 17:25:43 +02:00
WaLLy3K
c6b98655b1 Link to pi-hole.net/donate instead of PayPal
* Give users the option to choose their preferred donation method
* Use the heart symbol as the icon

Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-08 00:54:56 +11:00
WaLLy3K
619f115660 Remove GitHub link in footer 2017-10-07 23:42:14 +11:00
DL6ER
02807730ee We don't have to test for the php-zip extension anymore. Instead, we test for "Phar" (which seems to be there by default on most systems)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 14:36:16 +02:00
DL6ER
5b47e9caa5 Fix a typo
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 23:49:04 +02:00
DL6ER
d1d9d7faff Use htmlentities() to mitigate XSS (this function is identical to htmlspecialchars() in all ways, except with htmlentities(), all characters which have HTML character entity equivalents are translated into these entities)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 23:47:06 +02:00
DL6ER
a50525d72b Clean up after import
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 23:43:19 +02:00
DL6ER
67855df5c5 Minor corrections
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 23:42:49 +02:00
DL6ER
6bb6c6d29f Finished Teleporter 2.0
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-06 21:13:07 +02:00
DL6ER
80b37a7c81 Merge branch 'devel' into tweak/Teleporter_v2.0 2017-10-06 20:26:21 +02:00
DL6ER
2f3dc0befe Oh :codacy: ...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-02 12:27:42 +02:00
DL6ER
fcf2eb663f Specify one common place for defining the IP of a non-local FTL instance. Fixes #589
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-02 12:19:24 +02:00
DL6ER
1e89f12d18 Merge branch 'new/clientsovertime' of github.com:pi-hole/AdminLTE into new/clientsovertime 2017-09-30 11:10:03 +02:00
DL6ER
6a75cc2751 Prevent overshoots in the graphs caused by cubic interpolation (just like we do it already for the main graph)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-30 11:09:13 +02:00
WaLLy3K
1ba190bfa2 Merge branch 'devel' into new/clientsovertime 2017-09-30 13:29:36 +10:00
WaLLy3K
2789b69460 Decrease doughnut animation time on first load 2017-09-29 23:12:20 +10:00
DL6ER
0ed1901a8e Apply proper sorting whilst preserve the color order for the doughnut forward destinations chart
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-27 17:03:00 +02:00
DL6ER
b70993368b Change color from "blue" to "#72afd2"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-24 11:53:13 +02:00
DL6ER
dcdec7ca48 Add some dynamic color experiment
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-24 11:48:00 +02:00