diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4e79bbdb..a04aea68 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -220,18 +220,8 @@ jobs: make xz-utils cpio wget zip unzip p7zip git mercurial bzr texinfo help2man cmake --no-install-recommends sudo ln -s /usr/include/asm-generic/ /usr/include/asm - - name: Install MacOSX compiler - run: | - cd / - git clone https://github.com/tpoechtrager/osxcross.git - cd osxcross && git checkout 88cb6e8d0d7675cae7c8a2d66c11f58237101df0 && cd ../ - wget https://s3.dockerproject.org/darwin/v2/MacOSX10.11.sdk.tar.xz - mv MacOSX10.11.sdk.tar.xz /osxcross/tarballs/ - OSX_VERSION_MIN=10.10 UNATTENDED=1 LD_LIBRARY_PATH=/osxcross/target/lib /osxcross/build.sh - - name: Setting ENV's run: | - echo "::add-path::/osxcross/target/bin" echo "::add-path::$(go env GOPATH)/bin" echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin" echo ::set-env name=VERSION::$(cat version.txt) diff --git a/CHANGELOG.md b/CHANGELOG.md index ded78cd3..d9e4476c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.90.39 (05-15-2020) +- Modified some SCSS designs for services failures in group +- Fixed Twilio notifier and tests + # 0.90.38 (05-10-2020) - Added service timeframe/interval on index charts - Added --config flag to specify config.yml file diff --git a/Makefile b/Makefile index c7d3e9b4..30b9ac1f 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,6 @@ build-win: build-darwin: GO111MODULE="on" GOOS=darwin GOARCH=amd64 go build -a -ldflags "-s -w -X main.VERSION=${VERSION}" -o releases/statping-darwin-amd64/statping --tags "darwin" ./cmd - GO111MODULE="on" GOOS=darwin GOARCH=386 go build -a -ldflags "-s -w -X main.VERSION=${VERSION}" -o releases/statping-darwin-386/statping --tags "darwin" ./cmd build-linux: CGO_ENABLED=1 GO111MODULE="on" GOOS=linux GOARCH=amd64 \ diff --git a/frontend/src/assets/scss/base.scss b/frontend/src/assets/scss/base.scss index ae4cca9e..5686eb10 100644 --- a/frontend/src/assets/scss/base.scss +++ b/frontend/src/assets/scss/base.scss @@ -168,6 +168,22 @@ HTML,BODY { background-color: #efefef; } +.service_day { + height: 20px; + margin-right: 2px; + border-radius: 4px; + max-width: 25px; +} + +.service_day SPAN { + font-size: 6pt; + color: white; + margin: auto; + display: flex; + justify-content: center; + margin-top: 4px; +} + .service_scale { width: 60pt; float: left !important; diff --git a/frontend/src/components/Index/GroupServiceFailures.vue b/frontend/src/components/Index/GroupServiceFailures.vue index 96c5d2ab..8aff79a5 100644 --- a/frontend/src/components/Index/GroupServiceFailures.vue +++ b/frontend/src/components/Index/GroupServiceFailures.vue @@ -1,7 +1,9 @@