261e20f33c
Remove circle filter on one of the logos
2016-08-19 19:03:49 -04:00
05112cdd9b
Switch to new icon
2016-08-19 18:46:58 -04:00
23f958eed6
Merge pull request #119 from tsenovIvan/devel
...
Make "Top Dom/Advert/Clients" tables 'responsive'
2016-08-19 00:17:51 -07:00
bb7f10d8ba
Merge remote-tracking branch 'upstream/devel' into devel
...
Sync AdminLTE to local devel
2016-08-19 09:49:46 +03:00
d573aace4a
Merge pull request #123 from pi-hole/fix-get-php-file-param
...
Fix possible list param exploit
2016-08-16 16:11:38 -04:00
62feb36640
Merge devel
2016-08-16 16:08:28 -04:00
c41d377eb3
Fix always returning invalid parameter
2016-08-16 15:55:41 -04:00
1208af8277
Merge pull request #120 from pi-hole/get-list-XSS-fix
...
Fix possible XSS attack through white/black lists
2016-08-16 15:33:36 -04:00
7265405424
Fix possible list param exploit
...
Sanitize list parameter, so that only the whitelist or blacklist are able to be read.
2016-08-16 15:17:28 -04:00
122f1d4bd0
Merge branch 'devel' into get-list-XSS-fix
2016-08-02 11:58:41 -04:00
8cc9c613b1
Make "Top Dom/Advert/Clients" tables 'responsive'
...
This makes these 3 tables scroll horizontally if content is wide, but screen is narrow.
2016-07-21 14:13:56 +03:00
9f6fac65cb
Fix possible XSS attack through white/black lists
2016-07-20 20:43:18 -04:00
2e02fc412a
Merge branch 'master' into devel
2016-07-20 13:39:39 +01:00
c9472bf526
Devel out of sync with master ( #117 )
...
* Added Gitter badge
* Update README.md
Update main page screenshot. (It was still showing white/blacklist links!)
2016-07-20 13:34:53 +01:00
e948f688c6
Merge pull request #108 from diginc/logging_and_refactor_CORS
...
Logging of whitelist/blacklist failures and slight refactor
2016-07-20 08:22:52 -04:00
e64abd6ff7
Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into logging_and_refactor_CORS
2016-07-18 21:53:52 -05:00
f460607bde
semicolon because php
2016-07-18 21:38:48 -05:00
b6e177de6c
Set a default error log when empty
2016-07-18 21:04:17 -05:00
dd2de6cfe6
Merge branch 'temp-icon' into devel
2016-07-17 17:46:04 -04:00
7cc2cfaad0
Fix bad image links
2016-07-17 17:29:43 -04:00
9a2f3fdcc1
Changed icon to temporary icon
2016-07-17 17:11:06 -04:00
246599a0ba
Don't need docker server IP in here anymore
2016-07-08 08:23:12 -05:00
d1ef51a358
cleanup and tested on alpine/debian
2016-07-07 23:30:58 -05:00
657fb7badc
Fixes and refactoring WL/BL files more
...
* CORS was required to auth (bug) - fixed
* Logging defaults to the default lighttpd error log
* Overridable error log location to support alpine/nginx container or power users
* Put the repeated code into a include for sub/add, auth.php
* Error logs say what failed much better now
* VIRTUAL_HOST should theoretically allow custom hostnames for CORS
2016-07-07 00:28:28 -05:00
77395a3e72
gitignore vim swap files
2016-07-05 23:36:02 -05:00
18d96f300f
merge logic change from devel
2016-07-05 23:35:18 -05:00
0fdd006b33
Merge pull request #112 from pi-hole/secure-CORS
...
Fix up CORS
2016-07-03 22:52:42 -04:00
cb32c5572a
Fix up CORS
...
Previously had been checking Origin AND Host header, but we should not
check Host header... Removed Host check and only check if Origin header
is set, because otherwise CORS doesn't apply (could be a same-origin
request).
2016-07-03 16:29:19 -04:00
2fef2bab07
Merge pull request #111 from tsenovIvan/queriesTableRespo
...
Queries table is now "responsive"
2016-07-02 16:40:05 -04:00
f4b52452e6
Queries table is now "responsive"
...
The queries table now scrolls horizontally if opened on small mobile screens.
2016-06-30 17:16:25 +03:00
9f8060f108
re-add -d flag that got lost somehow
2016-06-28 13:28:26 -05:00
435ba91d18
thought of a better variable name
2016-06-28 12:27:44 -05:00
fb18e6b535
whitespace begone
2016-06-28 12:22:10 -05:00
5d0a399796
Remove SERVER_NAME var because of lighttpd bug
...
lighttpd suffers from the same same bug/feature apache does, it fills
SERVER_NAME in with the requested URL if connonical names and server
side server name is not configured. No thanks.
Nginx seems to have secure defaults.
2016-06-28 12:21:16 -05:00
8ce2c28919
same changes to sub as last add commit
2016-06-28 12:21:15 -05:00
b4938b0a73
Added SERVER_NAME var check for CORS and refactor
2016-06-28 12:21:15 -05:00
c383b67d90
Skip version checks if on dev branch
2016-06-26 14:07:52 -04:00
4d47bda041
Merge pull request #106 from viemmsakh/devel
...
Add CPU temp to header
2016-06-22 13:41:06 +01:00
82632bf09a
Cleaned up spacing
...
Spacing was combination of tabs and spaces. Changed to all spaces to
make it a bit cleaner.
2016-06-21 07:46:43 -04:00
342c1426d4
Moved temp to sidebar from header
2016-06-20 14:27:35 -04:00
900c1c4b14
Add CPU temp to header
...
shell_exec contents of /sys/class/thermal/thermal_zone0/temp to $output
variable
Add <li> to line 68 and echo $output variable (temp of CPU in celsius)
2016-06-20 10:59:40 -04:00
4f45f81dbf
Update to require header.php instead of header.html
2016-06-20 10:57:59 -04:00
92944dba97
Rename header.html to header.php
2016-06-20 10:57:26 -04:00
6df054b36f
Merge pull request #104 from Lewiscowles1986/devel
...
updated version output
2016-06-18 19:46:51 -04:00
771741f2dd
updated closing tags DOH...
2016-06-19 00:44:03 +01:00
2b2d35e040
updated version output
...
* removed cd from `AdminLTE` as footer.php lives in same folder and causes inconsistent behaviour if web-root changed
* changed `div style="display: inline-block"` to `span` (virtually same thing)
2016-06-19 00:07:50 +01:00
507f4fa791
Merge pull request #93 from pi-hole/devel
...
Next Release 1.3
2016-06-11 13:52:25 -05:00
b3dfd41ae5
Echo output of exec command
2016-06-10 20:26:19 -05:00
0cab80cf91
parse output of add.php, decide whether to show error or success.
2016-06-10 20:25:58 -05:00
c75f167392
update version check to 2.7
2016-06-10 18:39:10 -05:00
Mcat12
Dan Schaper
Ivan Cenov
Ivan Tsenov
Adam Warner
diginc
Aaron K. Henderson
Lewis Cowles
Jacob Salmela
Promofaux