Promofaux
|
4fcf8fd23f
|
Merge in development branch - resolve conflict in update.sh
|
2017-02-05 19:39:02 +00:00 |
|
Promofaux
|
10a30344e5
|
No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.
|
2017-02-05 19:29:56 +00:00 |
|
Promofaux
|
1206dda347
|
testing putting runGravity at a different part of the script
|
2017-02-05 19:23:04 +00:00 |
|
Promofaux
|
b764d17c64
|
comment
|
2017-02-05 19:18:27 +00:00 |
|
Promofaux
|
ba0abdb88d
|
wrap update logic in admin_installed bool check
|
2017-02-05 19:12:09 +00:00 |
|
Promofaux
|
1428b58dde
|
source setupVars and only check admin repo if it is enabled
|
2017-02-05 19:07:04 +00:00 |
|
Promofaux
|
e57425df5f
|
0.0.0.0 instead of pi-holes IP address for redirect purposes
|
2017-02-04 15:25:11 +00:00 |
|
Jacob Salmela
|
5e7dfaf220
|
Merge pull request #1214 from pi-hole/tweak/readme-updates
Update README with latest version screenshots and remove Raspberry references
|
2017-02-03 15:43:31 -06:00 |
|
Jacob Salmela
|
ad5c011b6c
|
Add new screenshots from latest version
|
2017-02-03 15:33:44 -06:00 |
|
Jacob Salmela
|
fcdd33b585
|
Update and remove old FAQ links
|
2017-02-03 15:21:42 -06:00 |
|
Jacob Salmela
|
f767f066ad
|
Update outdated text and describe features from recent versions
|
2017-02-03 15:18:28 -06:00 |
|
Dan Schaper
|
b8d0e5e5a1
|
Merge pull request #1210 from pi-hole/fix/dhcpcd_int
Remove comment leaders from DHCPCD interface
|
2017-02-02 12:48:29 -08:00 |
|
Dan Schaper
|
26ad23f01e
|
Remove comment leaders from DHCPCD interface
We need to set the interface in DHCPCD, comments were inadvertently added a while ago.
|
2017-02-01 18:33:42 -08:00 |
|
DL6ER
|
21d771e171
|
Merge pull request #1207 from r0ckarong/master
Fix output for wildcards in gravity.sh
|
2017-02-01 20:13:47 +01:00 |
|
Markus Napp
|
66616eb0f0
|
Rename missing plurals check
|
2017-02-01 19:55:33 +01:00 |
|
Mcat12
|
18eb8a2159
|
Merge pull request #1185 from pi-hole/cleanup/git_functions
Move git functions to one script
|
2017-01-31 19:05:53 -05:00 |
|
Markus Napp
|
72a1fc3f64
|
Fix output for wildcards in gravity.sh
|
2017-02-01 00:07:47 +01:00 |
|
Dan Schaper
|
96eea32a9d
|
Merge pull request #1205 from pi-hole/master
Sync master and development
|
2017-01-31 12:35:08 -08:00 |
|
DL6ER
|
3239c7023a
|
Merge pull request #1170 from pi-hole/new/DHCPstaticleases
Backend changes for static DHCP leases
|
2017-01-31 21:07:36 +01:00 |
|
Dan Schaper
|
5333895a9f
|
Merge pull request #1201 from pi-hole/development
[RELEASE] Pi-hole Core 2.12.1
|
2017-01-31 11:37:05 -08:00 |
|
DL6ER
|
da05491992
|
Merge pull request #1192 from pi-hole/fix/regex
Remove misplaced start of string expression
|
2017-01-30 21:25:45 +01:00 |
|
DL6ER
|
b9f5d79f3d
|
Merge pull request #1203 from pi-hole/master
Sync development and master
|
2017-01-30 20:46:12 +01:00 |
|
DL6ER
|
fddc515ee1
|
Merge pull request #1195 from pi-hole/fix/logrotate
Change how user and group are stored in the logrotate config file
|
2017-01-29 21:35:31 +01:00 |
|
DL6ER
|
3d4516dc95
|
Improve regex
|
2017-01-29 20:27:20 +01:00 |
|
DL6ER
|
509c864cc3
|
Merge branch 'development' into fix/regex
|
2017-01-29 20:27:04 +01:00 |
|
DL6ER
|
8b22f435ad
|
Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)
|
2017-01-29 19:58:53 +01:00 |
|
Adam Warner
|
55d39595e1
|
Merge pull request #1194 from pi-hole/fix/chronometer-summary
Fix chronometer interpreting summaryRaw
|
2017-01-29 18:35:51 +00:00 |
|
Mcat12
|
f8944177a0
|
Fix chronometer interpreting summaryRaw
|
2017-01-29 13:32:48 -05:00 |
|
Mcat12
|
3060c4d887
|
Merge pull request #1184 from pi-hole/fix/updater-debugging
Stay in repo directory until we error check
|
2017-01-29 12:02:55 -05:00 |
|
Mcat12
|
13ee5dc728
|
Merge pull request #1190 from pi-hole/tweak/gravity_showwildcards
Show number of wildcard blocked domains in gravity's summary
|
2017-01-29 11:57:47 -05:00 |
|
DL6ER
|
06873fe69e
|
Remove misplaced start of string expression. Fixes #1191
|
2017-01-29 13:54:39 +01:00 |
|
DL6ER
|
a8ac212ee6
|
Show number of wildcard blocked domains in gravity's summary
|
2017-01-29 13:46:27 +01:00 |
|
Dan Schaper
|
3d9d13222b
|
Use constants for leading paths.
|
2017-01-28 17:42:55 -08:00 |
|
Dan Schaper
|
745adabb05
|
Path to source basic-install.sh
|
2017-01-28 17:38:14 -08:00 |
|
Dan Schaper
|
3861b57dc6
|
Start moving reused utility functions to one script.
|
2017-01-28 17:32:42 -08:00 |
|
Dan Schaper
|
99a4a80017
|
Spelling
|
2017-01-28 17:08:38 -08:00 |
|
Mcat12
|
033ba26041
|
Stay in repo directory until we error check
|
2017-01-28 20:00:02 -05:00 |
|
Mcat12
|
8cb4304c13
|
Merge pull request #1158 from pi-hole/development
[RELEASE] Pi-hole Core 2.12
|
2017-01-28 19:19:18 -05:00 |
|
Promofaux
|
c31b4383e6
|
add back in code to stop dnsmasq and lighttpd during install.
|
2017-01-28 21:37:21 +00:00 |
|
DL6ER
|
0375a3caa3
|
Merge pull request #1178 from pi-hole/fix/validation
Use perl instead of grep for domain validation
|
2017-01-28 22:14:02 +01:00 |
|
DL6ER
|
08cddba200
|
There should be no echo here
|
2017-01-28 21:49:31 +01:00 |
|
DL6ER
|
1bf43b0425
|
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
|
2017-01-28 21:48:19 +01:00 |
|
Promofaux
|
35828f9cea
|
Source setupvars earlier in update/repair process
|
2017-01-28 19:05:55 +00:00 |
|
Promofaux
|
90af12fdb8
|
Remember the [@]
|
2017-01-28 18:41:37 +00:00 |
|
Dan Schaper
|
dc63182647
|
Merge pull request #1180 from pi-hole/fix/web_install_css
Install blockingpage.css on new installation.
|
2017-01-28 10:40:31 -08:00 |
|
Promofaux
|
5fede23cf7
|
trying another tactic
|
2017-01-28 18:39:15 +00:00 |
|
Promofaux
|
bc4762f270
|
no need to stop dnsmasq/lighttpt if we're going to reload them at the end anyway.
|
2017-01-28 16:27:02 +00:00 |
|
Promofaux
|
01429d59bd
|
more web checks
|
2017-01-28 15:45:14 +00:00 |
|
Promofaux
|
731d15f9b5
|
don't display web admin info in final dialog if it's not selected
|
2017-01-28 15:43:33 +00:00 |
|
Promofaux
|
f0bd7fae5c
|
) not }
|
2017-01-28 15:32:07 +00:00 |
|