424 Commits

Author	SHA1	Message	Date
DL6ER	fd0764d92c	Codacy	2017-01-20 17:40:20 +01:00
DL6ER	9d09d61b7f	Make selectable what should be imported from the uploaded archive	2017-01-20 16:43:33 +01:00
DL6ER	4633f800ab	Import of whitelist / blacklist / wildcard list added	2017-01-20 16:43:31 +01:00
DL6ER	21a5b2af69	Add only files that exist (no empty files if the source is not there, e.g. no blacklist.txt) and don't backup adlists.default	2017-01-20 16:43:29 +01:00
DL6ER	cd12288625	Backup also setupVars.conf	2017-01-20 16:43:27 +01:00
DL6ER	db9f224ad9	Export wildcard blocked domains	2017-01-20 16:43:25 +01:00
DL6ER	4d6fa7db44	Removed debug statements	2017-01-20 16:43:23 +01:00
DL6ER	0826ae911b	Added box to Settings page + added reading routines to takeout.php ... Conflicts: scripts/pi-hole/php/takeout.php	2017-01-20 16:43:03 +01:00
DL6ER	ed8790736b	Create zip file which contains whitelist, blacklist and setupVars.conf	2017-01-20 16:41:36 +01:00
DL6ER	57c99cb04d	Extend CORS check to IPv6. Fixes #1109	2017-01-18 13:28:25 +01:00
DL6ER	09f5bfdea8	Added cookie test of login page	2017-01-16 15:45:44 +01:00
DL6ER	a6b3bc1cb4	Add IE mode to PHP scripts	2017-01-14 15:29:23 +01:00
Mcat12	b96fc9ca73	Merge pull request #356 from pi-hole/tweak/Pi-hole-style ... Add pi-hole.css file	2017-01-13 17:26:10 -05:00
DL6ER	6760ba80a7	Allow multiple upstream DNS server selection	2017-01-13 17:49:16 +01:00
DL6ER	0924f20214	Required backend changes in savesettings.php	2017-01-13 13:47:06 +01:00
DL6ER	a7261bd157	Merge pull request #355 from pi-hole/DNSSEC ... Add DNSSEC to web UI	2017-01-12 21:40:23 +01:00
DL6ER	8ff6c77ad4	Make statistics not selectable	2017-01-12 17:15:13 +01:00
DL6ER	225c2791fe	Remove debug statement	2017-01-12 16:30:18 +01:00
DL6ER	99fb6ad8ce	Add DNSSEC to web UI	2017-01-12 16:02:09 +01:00
DL6ER	e24c35a528	Merge branch 'devel' into wildcard_blacklisting	2017-01-11 18:26:10 +01:00
DL6ER	bd36baa18b	Merge branch 'devel' into wildcard_blacklisting	2017-01-09 14:51:54 +01:00
donmahallem	f8dc8f0ccb	Unused variable $tmp ... This variable is in its current form never used	2017-01-08 22:26:11 +01:00
Mcat12	b2279add88	Merge pull request #343 from pi-hole/tweak/multiadd ... Add multiple domains separated by whitespace	2017-01-08 10:57:36 -05:00
DL6ER	9db9eff3d8	Ensure that $auth is always set	2017-01-08 11:01:26 +01:00
DL6ER	3808f74d4d	Change function check_domain() to validate multiple domains separated by spaces	2017-01-08 10:37:20 +01:00
Mcat12	bac5bd7fcd	Preserve <a> but take off href ... Need the styling provided by <a>	2017-01-07 19:03:37 -05:00
Promofaux	f53ea25bd4	These don't need to be links	2017-01-07 22:40:04 +00:00
Mcat12	79f7d93c52	Sanitize error output	2017-01-07 14:34:30 -05:00
DL6ER	c32b3c2925	Merge pull request #340 from pi-hole/fix/leaked-token ... Only show token when authorized and sanitize list action output	2017-01-07 20:15:12 +01:00
Mcat12	ed496afc1e	Do not hide the session info ... The JS will handle that	2017-01-07 14:10:42 -05:00
Mcat12	7765eeea34	Only show token when authorized	2017-01-06 10:53:01 -05:00
DL6ER	d7afada93c	Fix overTime algorithms	2017-01-06 10:19:41 +01:00
Mcat12	23149709db	Merge pull request #327 from pi-hole/tweaks ... Tweaks for the webUI	2017-01-03 17:26:20 -05:00
Mcat12	c1f997cb11	Merge pull request #328 from pi-hole/new/ipv6settings ... Make IPv6 features of the Pi-hole DHCP server switchable	2017-01-03 17:23:23 -05:00
DL6ER	c6d98a88e4	Tell if IPv6 has been enabled or not in success message	2017-01-03 14:29:20 +01:00
DL6ER	a04c89f12f	Pass true/false to backend	2017-01-03 14:25:38 +01:00
DL6ER	645aab6571	Add option to disable IPv6 part of the DHCP server	2017-01-03 14:07:16 +01:00
DL6ER	9221d8a5e7	Avoid double "	2017-01-03 13:44:24 +01:00
DL6ER	ae9a2ad616	Fix responsive icon on Gecko engine (Firefox + derivatives)	2017-01-03 10:57:39 +01:00
Mcat12	3e139b1b96	Merge pull request #318 from pi-hole/tweak/loginpage ... Ctrl+Return on login page -> Go immediately to Settings page	2017-01-02 15:31:23 -05:00
DL6ER	1438a9d71a	Display which page will be shown when hitting Return + Logout always goes to the very same URL	2017-01-02 17:13:54 +01:00
DL6ER	fba19e66cf	Rephrase explaination what the code is doing because it is doing more than we expected	2017-01-02 16:46:13 +01:00
DL6ER	06cc3ca550	Logout -> Go to Settings page instead of Main page (will show log in page again)	2017-01-02 16:33:27 +01:00
DL6ER	b41e4e0a0a	Add infotext	2017-01-02 16:29:53 +01:00
DL6ER	6da6805c5c	Fix three codacy issues	2017-01-02 16:17:37 +01:00
DL6ER	3c3f6ef916	Merge branch 'devel' into wildcard_blacklisting ... Conflicts: scripts/pi-hole/js/queries.js	2017-01-02 16:04:58 +01:00
DL6ER	4b3173b434	Merge branch 'devel' into customizeadlists	2017-01-02 14:43:38 +01:00
DL6ER	ed01434506	Strg+Return -> Go immediately to Settings page	2017-01-02 13:24:48 +01:00
DL6ER	33d6f6da8f	Exit TopLists loop early, but not too early	2017-01-02 11:29:30 +01:00
DL6ER	3cf00165ba	Merge branch 'devel' into TopItems	2017-01-02 11:25:05 +01:00