fa6f0a42a5
Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into devel
...
Conflicts:
api.php
index.php
2016-01-27 23:03:58 -06:00
c6c227de43
Added most recent queries
2016-01-25 21:20:53 -06:00
740f69f7a7
Removed advertising domains from top domains list
2016-01-25 20:56:39 -06:00
6cafb226d5
Fixed bugs in over-time graph
2016-01-25 20:41:46 -06:00
4b0e1d9ca2
Resolving conflicts
2016-01-25 20:10:51 +00:00
b67db0573e
More contributor tips
2016-01-24 21:35:18 -05:00
45e7166c23
Contributor tips++
2016-01-23 23:51:06 -05:00
2738feafb1
Contributor tips
2016-01-23 19:13:18 -05:00
a5e2f53ee6
Update to reflect new version
2016-01-21 10:45:31 -06:00
07eb397f06
Update README.md
2016-01-21 08:25:27 -05:00
1fa759909d
Update README.md
2016-01-21 08:21:49 -05:00
2721328c1d
Update README.md
2016-01-21 08:20:43 -05:00
88372a6b19
Merge Conflict Resolution
...
Merging frequent_queries into devel
2016-01-21 07:55:37 -05:00
14dfa0bc42
fixed conflicts
2016-01-21 11:29:23 +01:00
19ae85a7c8
Merge pull request #19 from jacobsalmela/whitelist
...
Merge whitelist into devel
2016-01-20 15:10:42 -08:00
f6e4e49a3d
Merge conflict resolution
2016-01-20 20:56:10 +00:00
c9786bc95e
Merge pull request #18 from jacobsalmela/master
...
Bring devel up to date
2016-01-20 12:00:09 -08:00
db9b9fa7e4
Merge pull request #9 from Mcat12/whitelist
...
Added advanced whitelist/blacklist site
2016-01-18 22:07:41 -06:00
6b89b27bd3
Merge pull request #15 from PromoFaux/PendingChronometerChanges
...
Pending chronometer.sh changes
2016-01-18 20:16:00 -06:00
6b645d1f88
Merge pull request #14 from OkashiOdayakana/master
...
Update version number on the web UI.
2016-01-18 17:16:21 -06:00
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
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
00f68a1142
Update index.php
2016-01-18 12:55:21 -05:00
7495ee5fd8
matched colors
2016-01-18 16:13:12 +01:00
af6ec1cf26
Added frequent queries table
2016-01-18 16:05:04 +01:00
84d11b570e
Changed line endings
...
- Also changed return to die
2016-01-17 17:07:49 -05:00
8f150e634e
Removed old whitelist feature
2016-01-17 16:55:54 -05:00
581494d4c5
Updated adding/subtracting to/from lists
2016-01-17 16:34:43 -05:00
96d4254e8b
Changed "Percentage" to Frequency
2016-01-15 23:42:00 -06:00
81a81c517e
Added chart of queries over time
2016-01-15 23:40:15 -06:00
f018e0f6f9
Added lists of top domains/ads. Moved data collection to separate file.
2016-01-15 22:29:18 -06:00
c24c853d53
Merge branch 'master' of https://github.com/bricej13/AdminLTE
2016-01-15 07:06:42 -06:00
293d2e7d21
Added top domains for queries and ads
2016-01-14 23:26:58 -06:00
e61a28642a
Changed return to die
...
A little Java slipped there...
2016-01-14 20:06:16 -05:00
1341671c3a
Forgot this change to sub.php
2016-01-13 20:40:09 -05:00
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
e36ced86d4
fixes #8
2016-01-10 21:58:33 -06:00
f79a4a8ebc
Made button more descriptive
2016-01-10 16:46:42 -05:00
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
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
fc33965906
Added documentation for API
2016-01-09 20:10:02 -06:00
8479530c67
Added basic read-only api
2016-01-09 20:04:24 -06:00
48952c50ce
script to run whitelist.sh
2016-01-03 15:36:31 -06:00
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
96e0d1bff6
jquery.min
...
For use with sidebar whitelister.
2016-01-03 15:08:56 -06:00
a99fd6552f
Merge pull request #4 from OmgImAlexis/master
...
Project cleanup
2015-12-28 20:06:51 -06:00
d59f0fefeb
Merge pull request #1 from OmgImAlexis/dev
...
Dev
2015-12-28 16:57:59 +10:30
3acde44969
fix index
2015-12-28 16:56:08 +10:30
2e0e62306d
fix index
2015-12-28 16:55:44 +10:30
53cd9bc15c
add app.js back
2015-12-28 16:54:41 +10:30
Brice Johnson
Promofaux
Mcat12
Jacob Salmela
Matej Bellus
Dan Schaper
Dan Schaper
OkashiOdayakana
Jacob Salmela
X O