Commit Graph

2506 Commits (cf6a1ac9adb4e26570cc5da7c8be628080f37e0f)
 

Author SHA1 Message Date
DL6ER 140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
7 years ago
DL6ER b961b13d60
Small bugfix
7 years ago
DL6ER febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
7 years ago
DL6ER 1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
7 years ago
Dan Schaper 41e1e4cb68
Rearrange pull logic, some optimization.
7 years ago
Dan Schaper d5b88e0df8
Get the right name for the options.
7 years ago
Dan Schaper 20fd61468d
Require branch to check out
7 years ago
Dan Schaper 0a0d25dff4
Script runs in subshell, no need to cd back to pwd.
7 years ago
DL6ER 38ba079baa
Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
7 years ago
Dan Schaper 33f7979359
Merge pull request #1293 from pi-hole/fix/version
7 years ago
Dan Schaper 8460b2544b
Merge pull request #1295 from pi-hole/tweak/pullapprove
7 years ago
Dan Schaper bc514ea955
Merge pull request #1296 from pi-hole/fix/debugVersion
7 years ago
DL6ER 6f8893d950
Merge pull request #1301 from pi-hole/fix/removewildcard
7 years ago
DL6ER de6aaf18ab
Merge pull request #1302 from pi-hole/fix/nowildcardlistfile
7 years ago
DL6ER 0fe64cf5cc
Merge pull request #1300 from pi-hole/fix/deletehostrecord
7 years ago
DL6ER 9a95531fb9
Merge pull request #1310 from pi-hole/new/piholecheckout
7 years ago
Mcat12 9df6a8dd06 Merge pull request #1311 from pi-hole/tweak/ascii-berry
7 years ago
raincoats 1590a179fa Change 302 redirect to 301
7 years ago
Jacob Salmela 5e16487ef6
add ascii berry to beginning of installer
7 years ago
DL6ER 2b3afbfef8 Merge pull request #1310 from pi-hole/new/piholecheckout
7 years ago
Dan Schaper c3c7dcc9f5
Merge remote-tracking branch 'origin/new/piholecheckout' into new/piholecheckout
7 years ago
Dan Schaper 273728b481
One more argument to shift.
7 years ago
DL6ER 81a1057cac
Fix something Dan has overlooked
7 years ago
DL6ER fd310c6445
Back to how we had it before, because --unshallow does not work at all
7 years ago
Dan Schaper a9b52518bf
Shift numbers for argument identifiers, functions are called after `shift`
7 years ago
Dan Schaper 87da40068c
Always `exit`ed with value 1, now exits with proper value.
7 years ago
Dan Schaper b8f1eadb7f
Shift off `checkout` from being passed to script from `pihole`
7 years ago
Dan Schaper b522d8eaf6
Source and reuse existing variables, centralize code.
7 years ago
Dan Schaper 89ff99322d
Don't need to remember `pwd` inside a function, calling function doesn't change directories.
7 years ago
Dan Schaper 56e17d1010
Source functions and variables from basic-install.sh
7 years ago
DL6ER 708067e875 Merge pull request #1309 from pi-hole/new/FTLChronometer
7 years ago
DL6ER d2ab0694b7
Add "master" shortcut
7 years ago
DL6ER 8a14a63d5d
Pi-hole checkout feature
7 years ago
DL6ER 8235b18854
Remove duplicated line
7 years ago
DL6ER e0e9ebbe74 Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
7 years ago
DL6ER 6e6259975e Merge pull request #1308 from pi-hole/new/FTLChronometer
7 years ago
DL6ER 10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
7 years ago
DL6ER 4e25e0dc5c
Add missing } to JSON output
7 years ago
DL6ER b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
7 years ago
DL6ER 6dea00668e
Don't try to obtain version of web interface it it is not installed. Fixes #1303
7 years ago
DL6ER ae9182c92e Merge pull request #1301 from pi-hole/fix/removewildcard
7 years ago
DL6ER af17355fe7 Merge pull request #1302 from pi-hole/fix/nowildcardlistfile
7 years ago
DL6ER dce3e50a00
Check for existence of wildcard blocking list before trying to acces it
7 years ago
DL6ER cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
7 years ago
DL6ER a97f0b1298 Merge pull request #1300 from pi-hole/fix/deletehostrecord
7 years ago
Dan Schaper d1e0f3ae18 Merge pull request #1294 from pi-hole/tweak/debugDNS
7 years ago
DL6ER 47a6786e8f
Use proper test syntax
7 years ago
DL6ER a69fcbb91e
Bugfix for when deleting host-record
7 years ago
Dan Schaper 8e2b51b391 Merge pull request #1296 from pi-hole/fix/debugVersion
7 years ago
Dan Schaper 560af43204 Merge pull request #1293 from pi-hole/fix/version
7 years ago