Commit Graph

35 Commits

Author SHA1 Message Date
Mcat12 67934591fe Dynamic versions in footer
- Shows Pi-hole and Web Interface versions
2016-01-30 13:05:28 -05:00
Dan Schaper 589165a42a Update Version in Admin 2016-01-26 08:36:04 -08:00
PromoFaux 62bd7a845f Revert "Update from devel" 2016-01-25 21:12:21 +00:00
Promofaux 4b0e1d9ca2 Resolving conflicts 2016-01-25 20:10:51 +00:00
Jacob Salmela a5e2f53ee6 Update to reflect new version 2016-01-21 10:45:31 -06:00
Mcat12 88372a6b19 Merge Conflict Resolution
Merging frequent_queries into devel
2016-01-21 07:55:37 -05:00
Matej Bellus 14dfa0bc42 fixed conflicts 2016-01-21 11:29:23 +01:00
Jacob Salmela 6b89b27bd3 Merge pull request #15 from PromoFaux/PendingChronometerChanges
Pending chronometer.sh changes
2016-01-18 20:16:00 -06:00
Adam Warner 6685d7bde0 Update index.php
Consume JSON output of chronometer.sh

Relies on [this pull](jacobsalmela/pi-hole#193) being merged.
2016-01-18 23:04:37 +00:00
OkashiOdayakana 00f68a1142 Update index.php 2016-01-18 12:55:21 -05:00
Matej Bellus 7495ee5fd8 matched colors 2016-01-18 16:13:12 +01:00
Matej Bellus af6ec1cf26 Added frequent queries table 2016-01-18 16:05:04 +01:00
Mcat12 3f3ebef42f Integrated list managment with admin site
- Made favicon work across pages
- No longer needs root access to tee command, still needs root access for gravity.sh and whitelist.sh
- Added call to gravity.sh when you remove an item
- Moved header and footer into separate files
- Moved files from list into the main folder
- Got rid of extra dependencies from the old list setup
- Added home button to sidebar
- Renamed original whitelist to "Old Whitelist"
- Added buttons to sidebar for Whitelist and Blacklist
2016-01-13 20:34:43 -05:00
Jacob Salmela e36ced86d4 fixes #8 2016-01-10 21:58:33 -06:00
Mcat12 f79a4a8ebc Made button more descriptive 2016-01-10 16:46:42 -05:00
Mcat12 4dff31a6de Added advanced whitelist/blacklist site
- Accessed under the "Whitelist" tab
- Added "Add: " in front of the text box for the simple whitelist
- Added "ad.example.com" as a placeholder in the text box

Currently www-data needs root access to gravity.sh (for adding to the blacklist). If we get a blacklist.sh, we may be able to get rid of the need for root.
2016-01-10 16:31:41 -05:00
Jacob Salmela 48952c50ce script to run whitelist.sh 2016-01-03 15:36:31 -06:00
Jacob Salmela b1b43512e9 expandable whitelist sidebar menu
Script output will display when the user presses enter without the need
to load a different page.
2016-01-03 15:31:15 -06:00
X O 3acde44969 fix index 2015-12-28 16:56:08 +10:30
X O 2e0e62306d fix index 2015-12-28 16:55:44 +10:30
X O 53cd9bc15c add app.js back 2015-12-28 16:54:41 +10:30
X O 8a1e7a2bfe remove unused images 2015-12-28 16:50:05 +10:30
X O d79675f570 removed unneeded code 2015-12-28 16:43:01 +10:30
X O ed185c604c removed unused assets 2015-12-26 17:19:18 +10:30
X O 7feb7dbf6d remove uneeded plugins, cleaned up PHP 2015-12-26 17:14:40 +10:30
Jacob Salmela 46c440948a improve accuracy of ads blocked
Fixes Pi-hole  #99
2015-12-01 19:56:11 -06:00
Jacob Salmela 5886a443df reflect v2.1 change in the interface 2015-11-27 13:55:33 -06:00
Jacob Salmela 5eaf1c0392 branding and spacing
Changed to a lowercase "h" in the logo for brand continuity.  I removed
the options on the sidebar since they don't really work that well and
there is no visual feedback for the user.

Also made some minor spacing/formatting changes.
2015-09-12 13:00:47 -05:00
Dan 6cfc729e69 Update index.php
Missed changes  /\/etc\/pihole\/gravity.list/
2015-07-30 18:04:56 +01:00
Fourdee 981e875477 Patch 3 - Dont use /etc/hosts 2015-07-30 17:24:09 +01:00
Jacob Salmela 08a9a7942c print $6th field instead of $7th
When the `log-facility` was change to `/var/log/pihole.log` the 6th field actually contains the domain name.
2015-07-29 18:16:46 -05:00
Dan 30a9be3fd6 Log file change
https://github.com/jacobsalmela/pi-hole/pull/27
2015-07-29 12:24:51 +01:00
Dan 1f443bb16f Update index.php
To reflect the logfile change in https://github.com/jacobsalmela/pi-hole/pull/27
2015-07-28 19:37:47 +01:00
jacobsalmela a05575d8e1 php for percentage. minor formatting
Also changed the Pi-hole logo text to point to pi-hole.net.
2015-07-27 12:33:20 -05:00
jacobsalmela 70277eb565 changing to PHP file 2015-07-26 18:23:26 -05:00