Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 04:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,314 Commits 19 Branches 112 Tags
b844c20ad5114b4587816ff0f9ffc8f4ee9a8325
Commit Graph

273 Commits

Author SHA1 Message Date
TheME
b844c20ad5 Merge branch 'devel' into clean_up_style-rules 2017-11-07 21:36:53 +01: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
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
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
WaLLy3K
60b5e36c32 Check for updates every two days 
Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-10-12 20:54:04 +11:00
Andres Rey
a3aecbf15a Remove unused sprintf function 2017-10-10 18:42:32 +01: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
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