2234 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
raincoats	1590a179fa	Change 302 redirect to 301 ... Change "302 Found" response to "301 Moved Permanently", as "302 Found" is meant for temporary redirects. Was asked to do so in this comment: https://github.com/pi-hole/pi-hole/pull/1297#issuecomment-284335421	2017-03-09 17:38:56 +11:00
raincoats	eb763d2dc2	Redirect to admin panel when accessing 'http://pi.hole/' ... If someone tries to access 'http://pi.hole/', it will take them to the "Website blocked" page. Very confusing if you don't know to go to 'http://pi.hole/admin/'. This just redirects them to the admin panel.	2017-03-05 16:58:21 +11:00
Dan Schaper	05640f9a6b	Merge pull request #1295 from pi-hole/tweak/pullapprove ... Require 4 approvals instead of five for merging into master	2017-03-04 15:17:25 -08:00
DL6ER	112ddb3c77	Require 4 approvals instead of five for merging into master	2017-03-04 22:57:37 +01:00
DL6ER	f2fe84c9d3	Merge pull request #1292 from pi-hole/master ... Merge patches back into devel	2017-03-03 23:45:29 +01:00
DL6ER	051f463350	Merge pull request #1291 from pi-hole/fix/defaultlisteningbehavior ... Fix default listening behavior of dnsmasq	2017-03-03 23:33:44 +01:00
DL6ER	f626406685	Revert #1273	2017-03-03 23:14:12 +01:00
DL6ER	dd971b6ee5	Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)	2017-03-03 22:58:41 +01:00
Dan Schaper	8776b822db	Merge pull request #1287 from pi-hole/fix/update_fail ... Exit script immediately if we can't update package cache.	2017-03-03 12:20:29 -08:00
DL6ER	fc76b1a6a3	Merge pull request #1244 from pi-hole/new/FTL-binary ... FTL	2017-03-03 13:41:27 +01:00
DL6ER	9183200b6f	Merge pull request #1286 from pi-hole/tweak/dpkg_lock ... Test for dpkg lock before using apt-get	2017-03-03 13:39:40 +01:00
DL6ER	f1b8abf503	Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked ... [FTL] Show most recently blocked domain in chronometer	2017-03-03 12:20:43 +01:00
DL6ER	9502356980	Move test_dpkg_lock to initial UPDATE_PKG_CACHE. There was unpredictable interference with debconf-apt-progress	2017-03-03 11:55:15 +01:00
DL6ER	a535ca9db4	Some tweaks to the new dpkg lock detector	2017-03-03 11:55:13 +01:00
DL6ER	2c762899de	Add loop to wait if package manager is blocked externally	2017-03-03 11:55:10 +01:00
Dan Schaper	24fd23493d	Exit script immediately if we can't update package cache. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-02 15:54:58 -08:00
Dan Schaper	6f1ed28d0a	Merge pull request #1274 from pi-hole/development ... Pi-hole Core v2.13	2017-03-02 14:34:43 -08:00
DL6ER	66b7d04b82	Merge branch 'development' into new/FTL-binary	2017-03-01 12:42:48 +01:00
DL6ER	044afa838c	Merge pull request #1284 from pi-hole/new/dnsmasqListeningBehavior ... Setup interface listening behavior of dnsmasq	2017-03-01 12:20:59 +01:00
DL6ER	7ba47f504c	Add special "except-interface" line in case of listening on all interfaces	2017-03-01 12:15:04 +01:00
DL6ER	0be1717ff4	Fix config error	2017-03-01 11:46:48 +01:00
DL6ER	189a4e0078	Add option to skip restarting of dnsmasq	2017-03-01 11:26:06 +01:00
DL6ER	3adf8785d8	Move "all" down in help text to not suggest that it is the default	2017-03-01 11:07:05 +01:00
DL6ER	b74862bfc5	Actually apply new setting by restarting dnsmasq	2017-03-01 11:02:08 +01:00
DL6ER	01273124ea	Change to -i, interface	2017-03-01 10:59:55 +01:00
DL6ER	721ada7e16	Fix typo	2017-03-01 10:52:21 +01:00
DL6ER	bd9dc91396	Add response for users manually setting this up via CLI	2017-03-01 10:50:13 +01:00
DL6ER	de6c43a8d3	Setup interface listening behavior of dnsmasq	2017-03-01 10:46:20 +01:00
Dan Schaper	f6fc6a5e56	Merge pull request #1281 from pi-hole/tweak/web_debug ... Back end changes for Web based debug calls.	2017-02-27 12:21:33 -08:00
Dan Schaper	ca24f7c143	Merge pull request #1273 from pi-hole/new/no_fixed_interface ... Don't save `interface=` line to `dnsmasq`s config file	2017-02-27 11:50:28 -08:00
Dan Schaper	17b0db6515	Fix for calling -w without -a. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-27 11:40:20 -08:00
Dan Schaper	83b0600863	Carriage return or newline based webcalls. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-27 11:03:57 -08:00
Dan Schaper	38961fb31b	Help text clarification and addition of the automated debuggin flag. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-27 10:49:25 -08:00
Dan Schaper	6c130b7960	Vebiage and highligh the token, also ::: ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-27 10:27:11 -08:00
Dan Schaper	7244d44a1d	Notify user that log is being uploaded. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-27 10:02:00 -08:00
Dan Schaper	9b060aab34	Debug auto mode engaged ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-26 18:22:06 -08:00
Dan Schaper	ba5bbf3523	Modify pihole for -d -a arguments.	2017-02-26 15:36:53 -08:00
Mcat12	66d7ebd6c3	Merge pull request #1276 from pi-hole/fix/INSTALL_WEB ... Bugfix: Delete INSTALL_WEB line before adding new one	2017-02-25 10:50:09 -05:00
DL6ER	ae24f1255f	Bugfix: Delete INSTALL_WEB line before adding new one	2017-02-25 11:29:12 +01:00
DL6ER	ec7e75a6e3	Don't save interface= line to dnsmasqs config file	2017-02-24 16:02:24 +01:00
DL6ER	aee106ae69	Merge pull request #1272 from flokX/patch-1 ... Update old install command to new	2017-02-24 13:32:20 +01:00
Flo	2a881a90ac	Update old install command to new	2017-02-24 11:29:19 +01:00
DL6ER	ce6c465942	Merge pull request #1266 from pi-hole/new/host-record ... Add host-record option	2017-02-23 17:32:10 +01:00
Jacob Salmela	3748a0ed33	Merge pull request #1267 from pi-hole/tweak/license ... update license to EUPL on core files	2017-02-22 15:51:54 -06:00
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	2017-02-22 11:55:20 -06:00
DL6ER	7ed1bbad49	Add host-record option	2017-02-22 14:43:07 +01:00
DL6ER	078cc7660e	Improved updater logic	2017-02-22 11:00:45 +01:00
DL6ER	af2893d2ce	Updater implementation for FTL	2017-02-22 10:43:13 +01:00
Jacob Salmela	0fe5efba76	Merge pull request #1265 from ProtoFoo/ProtoFoo-redirect ... Redirect pi.hole to pi.hole/admin/	2017-02-21 15:49:19 -06:00
ProtoFoo	fb6631d317	Removed a line that did nothing.	2017-02-21 22:22:30 +01:00