Commit Graph
590 Commits
Author SHA1 Message Date
Mcat12 b67db0573e More contributor tips 2016-01-24 21:35:18 -05:00
Mcat12 45e7166c23 Contributor tips++ 2016-01-23 23:51:06 -05:00
Mcat12 2738feafb1 Contributor tips 2016-01-23 19:13:18 -05:00
Jacob Salmela a5e2f53ee6 Update to reflect new version 2016-01-21 10:45:31 -06:00
Mcat12 1fa759909d Update README.md 2016-01-21 08:21:49 -05:00
Mcat12 2721328c1d Update README.md 2016-01-21 08:20:43 -05:00
Jacob Salmela 6b89b27bd3 Merge pull request #15 from PromoFaux/PendingChronometerChanges
Pending chronometer.sh changes
2016-01-18 20:16:00 -06:00
Jacob Salmela 6b645d1f88 Merge pull request #14 from OkashiOdayakana/master
Update version number on the web UI.
2016-01-18 17:16:21 -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
Adam Warner 46a7bac6e4 Update api.php
Consume JSON output of chronometer.sh

Relies on [this pull](https://github.com/jacobsalmela/pi-hole/pull/193) being merged.
2016-01-18 23:04:03 +00:00
OkashiOdayakana 00f68a1142 Update index.php 2016-01-18 12:55:21 -05:00
Jacob Salmela e36ced86d4 fixes #8 2016-01-10 21:58:33 -06:00
Jacob Salmela af58d24030 Merge pull request #7 from bricej13/master
Added a basic API to get stats via JSON
2016-01-10 10:01:57 -06:00
Brice Johnson fc33965906 Added documentation for API 2016-01-09 20:10:02 -06:00
Brice Johnson 8479530c67 Added basic read-only api 2016-01-09 20:04:24 -06:00
Jacob Salmela a99fd6552f Merge pull request #4 from OmgImAlexis/master
Project cleanup
2015-12-28 20:06:51 -06:00
X O d59f0fefeb Merge pull request #1 from OmgImAlexis/dev
Dev
2015-12-28 16:57:59 +10:30
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 4c67864fd0 remove unused skins 2015-12-28 16:47:43 +10:30
X O 4df9ddb74b removed unneeded files 2015-12-28 16:43:56 +10:30
X O d79675f570 removed unneeded code 2015-12-28 16:43:01 +10:30
X O 6da455b909 removed uneeded files 2015-12-28 16:42:43 +10:30
Jacob Salmela a024151d65 Merge pull request #3 from OmgImAlexis/master
Massive project cleanup
2015-12-26 10:58:44 -06:00
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
Jacob Salmela a3c9b7953b Merge pull request #2 from Fourdee/master
Patch 3 - Dont use /etc/hosts
2015-07-30 18:49:17 -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
Jacob Salmela 6302722148 Merge pull request #1 from Fourdee/patch-1
Update index.php
2015-07-29 18:03:18 -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 1ba18fa70e Describing the project 2015-07-26 18:27:15 -05:00
jacobsalmela 70277eb565 changing to PHP file 2015-07-26 18:23:26 -05:00
jacobsalmela ae091462de added working PHP code for 3 of the 4 boxes
It's pretty slow on the original B, but it does work.  I also added
code to run gravity.sh when you click update, but I'm not quite sure
how to use the font awesome icons to show a spinner while it is
working...

All of the PHP snippets are based off of the chroniton.sh script that
is used to display data on a 2.8" touchscreen.
2015-07-26 18:07:38 -05:00
jacobsalmela a7b32264ae initial commit of demo pile dashboard 2015-07-25 13:50:25 -05:00
Abdullah Almsaeed 6676c7d068 formatted core.less 2015-07-24 19:39:42 -04:00
Abdullah Almsaeed 2296534d36 Fixed issue with active nav-stacked background 2015-07-24 19:36:51 -04:00
Abdullah Almsaeed 6bf4e63c44 Fixed issue with user menu on small screens 2015-07-24 19:33:52 -04:00
Abdullah Almsaeed efd38d62be Updated changelog 2015-07-24 19:27:21 -04:00
Abdullah Almsaeed a081021a9d Updated changelog 2015-07-24 19:26:57 -04:00
Abdullah Almsaeed 0bd8306502 Update boxwidget and tree to activate ajax loaded elements 2015-07-24 19:26:15 -04:00
Abdullah Almsaeed 8f1173b340 Fixed issue #590 2015-07-23 14:58:16 -04:00