Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
softhack007 committed Nov 1, 2022
2 parents c483a91 + 086b516 commit 47be839
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 27 deletions.
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,18 @@ body:
label: Install Method
description: How did you install WLED?
options:
- From SoundReactive Release Page https://github.com/atuline/WLED/releases
- From https://wled-install.github.io/
- Binary from WLED.me
- Self-Compiled
- Self-Compiled or other
validations:
required: true
- type: input
id: version
attributes:
label: What version of WLED?
description: You can find this in by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message"
placeholder: "e.g. SR WLED 0.13.2 (build 2207281)"
label: What version of Soundreactive WLED?
description: You can find this in the Info Page, or by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message"
placeholder: "e.g. SR WLED 0.13.3 (build 2210301)"
validations:
required: true
- type: dropdown
Expand All @@ -54,7 +56,6 @@ body:
label: Which microcontroller/board are you seeing the problem on?
multiple: true
options:
- ESP8266
- ESP32
- Other
validations:
Expand Down
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
blank_issues_enabled: false
contact_links:
- name: Soundreactive WLED Discord community
url: https://discord.gg/4CQRmfR
about: Please ask and answer questions and discuss setup issues here!
- name: WLED community forum
url: https://wled.discourse.group/
about: For issues and ideas that might need longer discussion.
- name: WLED kno.wled.ge base
url: https://kno.wled.ge/basics/faq/
about: Take a look at the frequently asked questions and documentation, perhaps your question is already answered!
- name: SoundReactive WLED Wiki
url: https://github.com/atuline/WLED/wiki
about: Take a look at our well-maintained documentation and guides, maybe your answer is there already !
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature request
about: Suggest an improvement idea for WLED!
about: Suggest an improvement idea for Soundreactive WLED!
title: ''
labels: enhancement
assignees: ''
Expand Down
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

3 changes: 1 addition & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

</p>

# Super Development Branch
This is a conflict and I like it.
# Development Branch
This is the SR `dev`elopment branch, where we test new features and enhancements. The code may or may not work - it is work in progress.

- *Pull Requests* should be created against this `dev` branch.
Expand Down

0 comments on commit 47be839

Please sign in to comment.