Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FTL v2.12 #165

Merged
merged 66 commits into from
Dec 7, 2017
Merged

FTL v2.12 #165

Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
7a0ce6b
Add overTime/clients data structure
DL6ER Sep 22, 2017
199fccf
Add ">ClientsoverTime" request
DL6ER Sep 22, 2017
a14167f
Return absolute instead of relative data in client over time requests
DL6ER Sep 23, 2017
42c0dcc
Apply API_EXCLUDE_CLIENTS filtering to algorithm that returns clients…
DL6ER Sep 29, 2017
88e5e29
Merge branch 'development' into new/clientsovertime
DL6ER Sep 29, 2017
0748a14
Merge branch 'development' into new/clientsovertime
DL6ER Sep 29, 2017
2baad5c
Fix that API is expecting a different format of FTL's answer in FTL i…
DL6ER Sep 30, 2017
e5847f7
Added RESOLVEIPV6 config flag + extended comments in source
DL6ER Sep 30, 2017
7e8e061
Merge branch 'development' into tweak/IPv6resolverflag
DL6ER Oct 1, 2017
0689f2c
Changed name to `RESOLVE_IPV6`
DL6ER Oct 1, 2017
95f76ad
Detect pihole blocking status and return this on API request
DL6ER Oct 5, 2017
94b08d8
Adjust test suite to account for the extra return "status ..." in ">s…
DL6ER Oct 5, 2017
2c47ab5
dnsmasq's log output is lacking the year probably as a filesize reduc…
DL6ER Oct 10, 2017
1adaa78
Merge pull request #138 from pi-hole/tweak/IPv6resolverflag
DL6ER Oct 10, 2017
06efbdf
Merge pull request #134 from pi-hole/new/clientsovertime
DL6ER Oct 10, 2017
cbeb6a2
Merge pull request #146 from pi-hole/fix/newyearissue
DL6ER Oct 11, 2017
e939dad
Add RESOLVE_IPV4 config flag
DL6ER Oct 21, 2017
4f7a36d
Use short-circuit evaluation
DL6ER Oct 22, 2017
d59ac0d
Use short-circuit evaluation in config.c
DL6ER Oct 22, 2017
6486dcf
Merge pull request #149 from pi-hole/tweak/short-circuit
DL6ER Oct 23, 2017
ee355d0
Merge pull request #148 from pi-hole/new/RESOLVE_IPv4
DL6ER Oct 23, 2017
84e92df
Re-parse gravity data when receiving SIGHUP
DL6ER Oct 25, 2017
c3546c6
Fix a small typo
DL6ER Oct 25, 2017
71d86aa
Update SQLite 3.20.0 -> 3.21.0
DL6ER Oct 25, 2017
fbc5c6d
Merge pull request #143 from pi-hole/new/pihole_status_stats
DL6ER Oct 25, 2017
1178c80
armhf musl build
diginc Oct 25, 2017
f93ddbb
sudo pip
diginc Oct 26, 2017
666957e
show more
diginc Oct 26, 2017
7137562
enable qemu, emulated file cmd
diginc Oct 26, 2017
b593c42
Merge pull request #151 from pi-hole/fix/dnsmasq_reload
DL6ER Oct 26, 2017
6a68e4a
Merge pull request #152 from pi-hole/update/SQLite/3.21.0
DL6ER Oct 26, 2017
68d1356
Add "branch" command (returns branch FTL is compiled from)
DL6ER Oct 28, 2017
c01898c
Merge pull request #154 from pi-hole/tweak/GIT_BRANCH
DL6ER Oct 30, 2017
a216c86
optimize by docker pulling manually pushed prebuilt image
diginc Oct 31, 2017
3fc7322
optimize pt2-remove docker-compose requirement
diginc Oct 31, 2017
657ffc4
Update .travis.yml
diginc Oct 31, 2017
1b78641
Update .travis.yml
diginc Oct 31, 2017
666fd87
Update .travis.yml
diginc Oct 31, 2017
3e4c1a4
Update .travis.yml
diginc Oct 31, 2017
86d370e
Return special version if compiled on a branch != master
DL6ER Nov 3, 2017
ff6af26
Apply the same logic for the API request ">version"
DL6ER Nov 3, 2017
33132c7
Use GIT_BRANCH not GIT_TAG ...
DL6ER Nov 3, 2017
d2191c1
Merge pull request #156 from pi-hole/tweak/vDev
AzureMarker Nov 3, 2017
38ab54d
Implement "invalid option" and "help" in argument checker
DL6ER Nov 4, 2017
7517e21
Remove extra newlines at the end of the invalid option and help outputs
DL6ER Nov 4, 2017
5fcb629
Set ok = true also for "test" to be able to pass the parse_args() rou…
DL6ER Nov 4, 2017
9975f61
Add two tests for "invalid option" and "help"
DL6ER Nov 4, 2017
172fe7a
Remove "d" from help text
DL6ER Nov 4, 2017
cd8a63e
Merge pull request #158 from pi-hole/twea/invalid_option
DL6ER Nov 4, 2017
90de89f
Use FTL uploader
DL6ER Nov 10, 2017
54cdcdb
Also upload checksum files
DL6ER Nov 10, 2017
cad87aa
Upload only if this is not a pull request build
DL6ER Nov 11, 2017
54a97a7
Add missing "then"
DL6ER Nov 11, 2017
a88cd54
Merge pull request #160 from pi-hole/new/travis-deployment
DL6ER Nov 17, 2017
bccc189
Merge pull request #153 from diginc/development
DL6ER Nov 17, 2017
683fd4a
Revert "Musl ARM build"
DL6ER Nov 17, 2017
dce2377
Merge pull request #161 from pi-hole/revert-153-development
DL6ER Nov 17, 2017
174ce9e
Use case insensitive string comparison for wildcards
DL6ER Nov 22, 2017
3ec7f59
Adjust Travis tests as the hostname for 127.0.0.1 changed ... don't r…
DL6ER Nov 22, 2017
5da14ff
Syntax error in test
DL6ER Nov 22, 2017
0848420
Also test case insensitive against exact match of domain to wildcard
DL6ER Nov 22, 2017
daf20aa
Merge pull request #162 from pi-hole/tweak/wildcards_caseinsensitive
DL6ER Nov 22, 2017
1a0f051
Convert forward destinations, clients and domains to lower case
DL6ER Nov 22, 2017
f82eac0
Merge pull request #163 from pi-hole/tweak/lowercasedomains
DL6ER Nov 22, 2017
797acd5
Update debugging instructions: we have to ignore `SIGHUP` as this is …
DL6ER Nov 26, 2017
c63cd5e
Merge pull request #164 from pi-hole/fix/README2
AzureMarker Nov 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update .travis.yml 
how do you quote quoted variables travis
  • Loading branch information
@diginc
diginc authored Oct 31, 2017
commit 666fd87d46dc082ba2111a7fac55c4f8ebe8799b
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ matrix:
- BUILD_CC="musl-gcc"
- BIN_NAME="pihole-FTL-musl-armhf"
- DOCKER_INIT="docker run --rm --privileged multiarch/qemu-user-static:register --reset"
- DOCKER=docker run --rm -it -v "$TRAVIS_BUILD_DIR:/build" diginc/multiarch-deb-debootstrap:armhf-musl-jessie
- DOCKER='docker run --rm -it -v "$TRAVIS_BUILD_DIR:/build" diginc/multiarch-deb-debootstrap:armhf-musl-jessie'
sudo: true
before_script:
- mkdir -p "${DEST_DIR}"
Expand Down