Commit Graph

259 Commits

Author SHA1 Message Date
WaLLy3K
60b5e36c32 Check for updates every two days
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-12 20:54:04 +11: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
WaLLy3K
0bafeabe49 Allow full stop in top list wildcard exclusions
* Fix #580
2017-09-22 18:19:04 +10:00
DL6ER
a18a45e6b8 Detect ${OVER} and mirror its effect properly on the web interface
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-21 20:23:38 +02:00
DL6ER
6eb450a3a6 Show detected number of cores not only when hovering the icon, but also when hovering the Load text
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-16 16:18:51 +02:00
J den Hartog
76891ef43d Whitelisting withOUT password not supported
*White*listing with password not supported
should be:
*White*listing without password not supported
in my opinion.
2017-09-16 10:39:21 +02:00
DL6ER
5ab4430ef0 halt -> poweroff
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-08 20:30:59 +02:00
DL6ER
f2b77c0bf4 Merge pull request #470 from gedetil/devel
Add shutdown option
2017-09-08 20:26:19 +02:00
Adam Warner
fb9bbd97e0 Merge branch 'devel' into elegantize-custom_time_modal 2017-08-28 20:16:58 +01:00
Adam Warner
194b00e783 Merge branch 'devel' into release/3.2 2017-08-28 08:46:16 +01:00
TheME
8ab2148437 footer.php: elegantize 'Disable Custom time' modal 2017-08-27 21:24:02 +02:00
Adam Warner
2390017f8a Merge branch 'devel' into tweak/blockpage 2017-08-27 11:30:16 +01:00
Mcat12
fdbd68b655 Merge pull request #565 from eddturtle/master
Fix arrow positions in sidebar to be vertically centered
2017-08-16 15:25:50 -04:00
Edd Turtle
41f5e3fe1b Fix final sidebar button (from devel branch) 2017-08-16 20:03:21 +01:00
Mcat12
4f959ab83f Merge branch 'devel' into master 2017-08-15 22:27:27 -04:00
Edd Turtle
fe35ca3f02 Fix arrow positions in sidebar to be vertically centered 2017-08-15 19:03:12 +01:00
DL6ER
7f33b102df Re-implement Teleporter with PharData. The advantage is that we don't have to rely on php-zip being installed.
This commit implements only the re-written Export. The import feature has still to be coded.

Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-08-06 17:56:59 +02:00
Mcat12
2b5a4d8989 Fix undefined variable $timestamp 2017-08-02 21:16:55 -04:00
Adam Warner
789f111348 Merge branch 'devel' into patch-1 2017-07-30 16:05:39 +01:00
Flo
60b11c376b Simplify info-box links 2017-07-30 16:50:32 +02:00
Adam Warner
f9f69cc19a Merge branch 'devel' into tweak/blockpage 2017-07-29 16:44:01 +01:00
DL6ER
849b987ad9 Move update checker from header into footer (#553)
* Move update checker from header into footer

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Remove version output in dropdown menu.

Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-07-27 23:13:33 +01:00
DL6ER
fe3e8fcb08 Ensure excess whitespace is split when white/blacklisting multiple domains 2017-07-28 00:01:18 +10:00
WaLLy3K
3a17f9da13 Rebase off devel to only add "-bp" functionality
* Included pcre.recursion_limit as a safety cutoff measure
2017-07-19 00:29:47 +10:00
DL6ER
40ae7fb0ca Add long-term graph page (#542)
* Add api_db.php?getGraphData

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Add new DB Graph page

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Adjust x-axis format

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Tweaks to long term stats (#543)

* add maxDate to Datepicker

* remove `GO` Button from datepicker input, instead hook into the apply event to update the graphs/charts when the date range is selected

* :codacy:

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Fix comment + another :codacy:

* Remove duplicated code

* Add click callback to DB graph that sends the user to the DB query log page. This required some re-write of the DB queries page.

* Remove uneeded global variable

* Remove minDate and MaxDate as it is causing issues on fresh installs

* Oh :codacy: ...
2017-07-08 23:42:21 +02:00
DL6ER
a540c851c9 Add hostname in header (#541)
* Add hostname in header

* Removed class attribute of <li> element and replaced <tt>
2017-07-08 20:24:26 +02:00
DL6ER
94bdb18fe1 Fix domain validation function (#538) 2017-07-01 21:38:04 +10:00
TheME
dd101b3b0a header.php: set 'Tools' menu active correctly 2017-06-30 12:07:34 +02:00
DL6ER
d4bcede042 Accept underscores when validating domain names (#533) 2017-06-30 17:43:30 +10:00
DL6ER
9f7fb18f31 Long-term statistics implementation (using FTL's database) (#521)
* - Add DB Top Lists
- Add DB Query Log
- Add DB API

* Allow to select only queries that are equal/newer than the oldest entry in the database
2017-06-29 20:57:09 +02:00
TheME
74a6dc3276 Fix glow effect (#528)
* index.js: fix glow effect

* header.php: fix glow effect rule
2017-06-28 23:26:47 +01:00
DL6ER
557ebbbc7c Merge pull request #479 from pi-hole/new/audit-log
Audit log
2017-06-27 10:53:31 +02:00
Adam Warner
f204b71707 [Staging] 3.1 (#514)
* Remove double click handler

* ~Today~ Over Last 24 Hours

* Rename Top Advertisers to Top Blocked Domains

* percentage should be a float instead of an integer

* Define $over_time as array. Fixes #501

* Add hover/hit radius for Forward Destinations over Time graph

* Add custom callback for tooltips and disable legend for Forward Destinations over Time graph

* Remove legend, add tooltips and increase hit/hover radius for Query Types over Time graph. Fixes #502

* Don't hide detailed graphs on small screens any longer

*  🌮 is the new :shipit: squirrel

* revise wording on main page

shorter text to fit in one line on smaller screens

* Show warning in browser when fopen() failed

* open links in new tab

* open links in new tab

* Update header.php

* select 'Login' in Navbar when showing loginpage

using the same term as it is already used to show up the loginpage (in line 565)

* set the mainbox wider on smaller screens

solves issue of overlapping text with loginbutton when using smaller screens

* also fix overlapping loginpage on footerbar

* remove border on logo

* add link feedback (on hover)

* sessiontimer in bold letters

* use AdminLTE function to toggle dropdown-menu

AdminLTE has already an implemented function to toggle the user menu.
So there is no need to use an own script in footer.js
 
Benefit: The dropdown-menu closes if you click on a blank Place

* align donate-url with url in footerbar

* remove function to open user menu

AdminLTE has already an implemented function to toggle the user menu.
So there is no need to use an own script in footer.js

Benefit: The dropdown-menu closes if you click on a blank Place

* Update LICENSE of the project to EUPL v1.2

* Major overhaul of update checker - checks only every 30 minutes to reduce number of GitHub API requests

* Add version info to dropdown menu (top right) for viewing on small screens. Addresses #333 partially

* Fix typo

* footer.php: improve and clean up

move animation-stylesheet to pi-hole.css (Have you noticed that there is even a text- and text-shadow animation set, but for webkit-browsers only)
added <!-- Version Infos -->
correct continuous hide of version info (AdminLTEs classed widths as `xs` > `sm` > `md` > `lg`)
display Donate-text alwas in one line (do not wrap in between when version info string gets very long)

* pi-hole.css: pasted animation stylesheet

and improved the text-shadow-animation to work correctly with and without -webkit-prefix
(for me this wasn't working until now)

* header.php: some corrections & improvements

pull dropdown-menu always to right side
changed <!-- Update alerts --> to <!-- Version Infos --> (just like it is in footer)
hide version infos in dropdown-menu if it gets shown in footer
repaired update-urls, they also should open up in new tab & gets underlined on hover
`background:none` is needed because AdminLTE adds dark bg on hover to links when using it on smallscreen (xs)

* Minor change to make the dashboard's javascript compatible with escaped characters (like apostrophe) in client names

* Add the same for the top domains

* ... and Top Ads

* Minor change to comments

* footer.php: edited as discussed

* header.php: edited as discussed

* Update queryads.js

* Update list.js

* queryads.js: codacy fixes

* list.js: codacy fixes

* list.js: small correction

* queryads.js: small correction

* Be able to interpret status 5

* Sort list entries (black-/whitelist) alphabetically before creating the table

* queryads.js: Update*

* removed double comment and updated code to center and separate the buttons on small screens, like in my last screenshot.

* list.js: update*

updated code to center and separate the buttons on small screens, like in my last screenshot.
2017-06-20 22:17:37 +01:00
TheME
2de0f4dfb3 header.php: edited as discussed 2017-06-04 18:43:48 +02:00
TheME
ceac8cf2d1 footer.php: edited as discussed 2017-06-04 18:41:04 +02:00
TheME
f2b4544929 header.php: some corrections & improvements
pull dropdown-menu always to right side
changed <!-- Update alerts --> to <!-- Version Infos --> (just like it is in footer)
hide version infos in dropdown-menu if it gets shown in footer
repaired update-urls, they also should open up in new tab & gets underlined on hover
`background:none` is needed because AdminLTE adds dark bg on hover to links when using it on smallscreen (xs)
2017-06-04 12:47:45 +02:00
TheME
6b1ecfc31c footer.php: improve and clean up
move animation-stylesheet to pi-hole.css (Have you noticed that there is even a text- and text-shadow animation set, but for webkit-browsers only)
added <!-- Version Infos -->
correct continuous hide of version info (AdminLTEs classed widths as `xs` > `sm` > `md` > `lg`)
display Donate-text alwas in one line (do not wrap in between when version info string gets very long)
2017-06-04 12:12:27 +02:00
DL6ER
58f6406f48 Merge pull request #515 from Th3M3/improve_dropdown-menu
Improve dropdown-menu
2017-06-03 18:57:43 +02:00
DL6ER
49fcaed05a Fix typo 2017-06-03 16:56:41 +02:00