3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
2017-01-08 11:17:25 +01:00
d9e949b27c
Merge pull request #1096 from pi-hole/fix/updater
...
Fix updater failing on non-English systems
2017-01-06 23:36:42 +01:00
168397e90d
Fixed typo in webpage.sh
2017-01-05 21:45:06 +01:00
e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
...
Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user
2017-01-05 13:10:19 +01:00
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
2017-01-03 14:24:33 +01:00
3a90c1c192
Source setupVars.conf before trying to access variables
2017-01-03 13:34:01 +01:00
12bec1df68
Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
...
Major simplification of webpage.sh + extend DHCP to IPv6
2017-01-02 14:28:26 +00:00
ad61852804
Test against empty string
2017-01-02 11:10:38 +01:00
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
2017-01-02 11:08:54 +01:00
677694b01a
Set 24h lease time if settings was empty before
2017-01-02 11:05:40 +01:00
85f0241c0d
Reprocess DHCP settings after update
2017-01-02 10:50:59 +01:00
ebf0db4bbf
Typo fixed
2016-12-31 17:17:46 +00:00
9ac265980f
Add .conf to filename
2016-12-31 13:41:19 +00:00
40798da6b1
Add blacklisting wildcard support
2016-12-31 12:49:04 +00:00
fc596e41d4
All scripts set executable
2016-12-30 18:35:16 -08:00
7bcc15e416
Adjust blocking page paths from admin restructure
2016-12-30 15:36:53 -05:00
1a3bdbaabf
Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
...
Allow whitelisting from blocking page
2016-12-30 21:07:34 +01:00
5e35fdbc52
Save blocking page CSS to pihole directory instead of admin
2016-12-30 14:42:15 -05:00
ab2c486f25
Fix password Enter handling
...
Also remove extranious form information, since JS handles that
2016-12-30 14:13:15 -05:00
7fd7430d38
Use pi.hole when getting js and css
...
If a user is able to get to this page, they must be using Pi-hole
2016-12-30 13:43:29 -05:00
089b98430f
Fix formatting
2016-12-30 12:59:05 -05:00
5c7fc05a32
Enable DHCP logging by default
2016-12-30 16:31:57 +00:00
09bbc81470
Add notice that the user might have to flush his DNS cache
2016-12-30 12:27:33 +00:00
f7274addcd
Delete swapfile generator, haven't used this in a long time.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-30 04:08:32 -08:00
09bfa2ef77
Add whitelisting on blocking page feature
2016-12-30 12:03:45 +00:00
9181a4a1d8
Apply dhcp lease time also for IPv6
2016-12-29 14:26:23 +00:00
3268e1611a
Backend accept and apply dhcp lease time
2016-12-29 14:19:44 +00:00
cf724176dc
Do stateful DHCPv6 and SLAAC
2016-12-28 20:02:48 +00:00
1e627c7e8f
Make webpage.sh fully library style
2016-12-28 16:25:14 +00:00
9af26cbaac
Major simplification of webpage.sh
2016-12-28 02:14:47 +00:00
321ea8a3a9
Merge branch 'development' into webUIprivacymode
2016-12-27 21:27:11 +01:00
ef8292d371
Merge branch 'development' into updater_rewrite
2016-12-27 11:59:52 -08:00
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
62d001225a
Merge pull request #1040 from pi-hole/fix/updater_git-C
...
Remove git -C from update.sh
2016-12-25 12:28:42 -08:00
e50947eb58
mend
2016-12-25 21:26:06 +01:00
ca056d32d2
Remove git -C
2016-12-25 21:22:59 +01:00
a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
...
This reverts commit ff3c36a7a29355a8ad0e
2016-12-25 17:32:59 +01:00
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
2016-12-25 01:18:58 +01:00
5e28e6b9ac
Removed remaining git -C
2016-12-25 01:17:46 +01:00
3365ef7aaa
is_repo() returns values to caller, silence function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-24 11:54:04 -08:00
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-24 11:41:42 -08:00
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-24 11:24:20 -08:00
15db1ffdd5
Remove variables not needed any more
2016-12-24 15:48:43 +01:00
4632b0f797
Updated updater logic
2016-12-24 15:40:31 +01:00
65c35a5530
Use new subroutine to determine if updates are available
2016-12-24 15:32:25 +01:00
c449a1c0e0
Added GitCheckUpdateAvail()
2016-12-24 15:19:39 +01:00
b020010f0d
Removed some of the &> /dev/null
2016-12-24 15:08:30 +01:00
0276c72fe2
replace 'git -C' with long version (see #1009 )
2016-12-24 15:05:57 +01:00
04a9791be2
Save empty password
2016-12-23 23:41:40 +01:00
c1982c04ff
Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries
...
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:32:13 +00:00
DL6ER