Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
DewGew authored Jan 24, 2020
2 parents e990d1b + e476965 commit bd39f62
Show file tree
Hide file tree
Showing 7 changed files with 244 additions and 211 deletions.
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: https://paypal.me/dzga
28 changes: 16 additions & 12 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,26 @@ assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.
**Describe the bug:**
<!-- A clear and concise description of what the bug is. -->

**Expected behavior**
A clear and concise description of what you expected to happen.
**Expected behavior:**
<!-- A clear and concise description of what you expected to happen. -->

**Screenshots**
If applicable, add screenshots to help explain your problem.
**Logs:**
<!-- Turn on debug logs in setting -->

```
Paste the dzga logs here.
```

**Desktop (please complete the following information):**
- Domoticz version [e.g. Stable 4.10717]
- Dzga version [e.g. 1.3.1]
- Python Version [e.g. 3.5.3]
- Domoticz version <!-- e.g. Stable 4.10717 -->
- Dzga version <!-- e.g. 1.3.1 -->
- Python Version <!--e.g. 3.5.3 -->

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- Device: <!-- e.g. iPhone6 -->

**Additional context**
Add any other context about the problem here.
**Additional context, screenshot:**
<!-- Add any other context or screenshot about the problem here. -->
15 changes: 15 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: "Close stale issues"
on:
schedule:
- cron: "0 0 * * *"

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days'
days-before-stale: 30
days-before-close: 5
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/config.py
/config.yaml
/travis.yml
env/
/__pycache__
/dzga.log
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Domoticz-Google-Assistant
[![Build Status](https://travis-ci.com/DewGew/Domoticz-Google-Assistant.svg?branch=master)](https://travis-ci.com/DewGew/Domoticz-Google-Assistant) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/dewgew/Domoticz-Google-Assistant) [![Discord](https://img.shields.io/discord/664815298284748830?label=Chat%20on%20Discord)](https://discordapp.com/invite/AmJV6AC)
# Domoticz-Google-Assistant

<img src="dzga_UI.png" alt="drawing" width="600"/>

Expand Down Expand Up @@ -34,4 +35,4 @@ bash <(curl -s https://raw.githubusercontent.com/DewGew/dzga-installer/master/in
### [Installation and configuration](https://github.com/DewGew/Domoticz-Google-Assistant/wiki)
<!--stackedit_data:
eyJoaXN0b3J5IjpbNjY2NTI2ODUyXX0=
-->
-->
Loading

0 comments on commit bd39f62

Please sign in to comment.