Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-25 13:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,980 Commits 19 Branches 112 Tags
f87a94de33225e23ad7d49c27a9088bb5e5c6a72
Commit Graph

47 Commits

Author SHA1 Message Date
Mcat12
acc83345fd Merge pull request #252 from pi-hole/customizeadlists 
Manage adlists
 2017-04-06 16:16:05 -04:00
DL6ER
7e68fdecff Make sure license comment is only outputted after header.php has prepared all the stuff that need to be done beforehand. Fixes #450 2017-04-03 10:17:05 +02:00
DL6ER
e169f1086e Proposed change 2017-03-28 22:11:06 +02:00
Adam Warner
00885265de Add a note about where the default whitelist entries come from, and what they mean. 2017-03-28 19:35:12 +01:00
Dan Schaper
309a6a10a1 Clarify conditions of whitelist/wildcard 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-06 10:34:49 -08:00
Dan Schaper
302a8a89b4 Can now whitelist wildcard domains. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-06 09:04:08 -08:00
DL6ER
4f70973cbc EUPL license (#402) 
* Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/

* Added header to main PHP files

* Modified scripts in scripts/pi-hole/php

* Added header to scripts/pi-hole/js files

* Added license header to our custom style script

* Slight reformulation
 2017-02-18 14:20:51 +01:00
Mcat12
f53f2e8836 Move buttons out of the way on small screens 2017-01-30 16:52:24 -05:00
DL6ER
b521a8de96 Show notice that whitelisting of wildcard blocking is not possible 2017-01-11 16:50:46 +01:00
DL6ER
bd36baa18b Merge branch 'devel' into wildcard_blacklisting 2017-01-09 14:51:54 +01:00
DL6ER
b6695f9882 Show failure response in error message (e.g. abd<>.de is not a valid domain) 2017-01-08 10:40:21 +01:00
DL6ER
a33301911a Made everything working 2016-12-31 16:24:10 +00:00
DL6ER
05f2df720e Put wildcard blocking entries into their own table 2016-12-31 16:06:21 +00:00
DL6ER
5735a5b9a2 Merge branch 'devel' into customizeadlists 2016-12-30 20:43:07 +00:00
DL6ER
3e8e153cfd Add notice on whitelist page that list domains are automatically added 2016-12-27 20:04:31 +00:00
DL6ER
e5a9826078 Moved more private files out of the root directory 2016-12-21 21:10:21 +01:00
Mcat12
2f65430a4d Move PHP scripts to scripts folder 2016-12-21 21:09:58 +01:00
Promofaux
d0553ef169 Organise folder structure a bit better... Seperates vendor packages from self-written scripts. 2016-12-21 21:09:45 +01:00
DL6ER
e188cb6fbc Revert "Merge pull request #267 from pi-hole/folderStructure" 
This reverts commit fba3d10fa4, reversing
changes made to 4ee75f4167.
 2016-12-21 17:16:52 +01:00
DL6ER
bb2c2e2244 Moved more private files out of the root directory 2016-12-20 12:52:19 +01:00
Mcat12
d1da1de597 Move PHP scripts to scripts folder 2016-12-19 19:44:51 -05:00
Promofaux
6a13796d99 Organise folder structure a bit better... Seperates vendor packages from self-written scripts. 2016-12-19 18:30:16 +00:00
Mcat12
0dec4b8aa0 Protect Enable/Disable with a CSRF token check 
The token is now added for all pages.
 2016-12-04 13:16:45 -05:00
Adam Warner
3e6955d4a0 Update list.php 2016-10-30 02:26:08 +00:00
Mcat12
3917000e9b Die on an invalid list parameter 
Only accepts "white" and "black"
 2016-10-19 19:22:25 -04:00
viemmsakh
4f45f81dbf Update to require header.php instead of header.html 2016-06-20 10:57:59 -04:00
Mcat12
a80d752720 Adjust to CSP 2016-05-21 12:10:27 -04:00
Mcat12
2ef1e3a8c2 Fix fade in bug on empty list 
If the list became empty, the "Your $list is empty!"
message would not pop up, since the fadeIn call is
out of that scope.
 2016-05-20 16:29:35 -04:00
Mcat12
82e92e99cc Fade alerts and add animation to refresh 2016-05-20 16:08:46 -04:00
Mcat12
0aabc01924 Add close button to alerts 
They will pop back up again if you add another domain.
 2016-05-19 20:49:32 -04:00
Mcat12
c69b434a8a Add domain on enter button keypress 
Only activates when the input has focus.
 2016-05-19 20:37:30 -04:00
Mcat12
a9512594ca Clear domain input on success 2016-05-19 20:21:58 -04:00
Mcat12
3a6e6b1199 Convert commands to jQuery 
Mainly changed from `document.getElementById("something")` to
`$(#something)`. Also changed the html and hide/show functions
as a result of the change.
 2016-05-19 20:17:56 -04:00
Mcat12
66d354d210 Turn off caching for jQuery AJAX calls 
IE would cache the list contents, so that if you
updated the list it would not show up as changed.
 2016-05-11 16:35:32 -04:00
Mcat12
d38486fbd6 Possible fix for incorrect token 
It appears that sometimes the first time you open the page,
the token is not synced correctly or something, causing
the CSRF check to fail. Starting the session before any
HTML is outputted seems to be a recommended first step to
troubleshooting PHP session errors. I have tried to test
this fix, but right now I don't know exactly what triggers
the error.
 2016-05-10 16:47:22 -04:00
Mcat12
283f4b7978 Implement CSRF token for list editing 2016-05-02 20:33:29 -04:00
Mcat12
4d6ec1c5a5 Remove password functionality 
After the change to 0.0.0.0 there will
be no need for a password
 2016-04-18 22:07:37 -04:00
Mcat12
5d1761b19d Implemented password checking 
Currently allows anything for the password. This will be updated when I implment passwords on the main repo.
 2016-02-28 14:52:54 -05:00
Mcat12
ac5b43c5e7 Fixed getting password 
Now doesn't do anything if there is no domain entered
 2016-02-28 12:20:36 -05:00
Mcat12
76ee22be4c Removed debug modal button 2016-02-24 20:27:11 -05:00
Mcat12
7a7d08ea89 Shows a dialog for Pi-hole password 
Currently doesn't check it, everything still works.
Only asks once, then remembers it until you reload the page.
 2016-02-24 20:04:24 -05:00
Mcat12
020f9a433b Add back in list functionality 2016-02-24 18:42:06 -05:00
Mcat12
18a44efd95 Disable Whitelist/Blacklist feature for release 
See #39 for why this is needed
 2016-02-21 15:02:48 -05:00
Mcat12
e19b584e29 Dynamic versions in footer 
- Shows Pi-hole and Web Interface versions
 2016-01-30 11:26:18 -05:00
Mcat12
d6fd5fb109 Added highlight effect when removing an item from a list 
- Uses jQuery UI
 2016-01-27 19:46:10 -05:00
Mcat12
84d11b570e Changed line endings 
- Also changed return to die
 2016-01-17 17:07:49 -05: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