Merge branch 'master'

Conflicts: database.cpp database.h de_web.pro de_web_plugin.cpp de_web_plugin_private.h event.cpp event.h event_queue.cpp light_node.cpp light_node.h resource.cpp resource.h
devWaves · Aug 20, 2021 · c5fed6d · c5fed6d
2 parents 6a35c03 + d129893
commit c5fed6d
Show file tree

Hide file tree

Showing 63 changed files with 4,886 additions and 746 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,7 +9,8 @@ assignees: ''
 
 <!--
   - Use this issue template to report a bug in the deCONZ REST-API.
-  - If you want to report a bug for the Phoscon App, please head over to: https://github.com/dresden-elektronik/phoscon-app-beta
+  - Anything that is not clearly a bug can implicate manual closure. For support we recommend the forum: https://forum.phoscon.de 
+  - If you want to report a bug for the Phoscon App, please head over to: https://forum.phoscon.de
   - Make sure not to remove any headers and fill the template completely. If you remove the headers, the issue will be auto-closed.
   - If you're unsure if the bug fits into this issue tracker, please ask for advise in our Discord chat: https://discord.gg/QFhTxqN
   - Please make sure sure you're running the latest version of deCONZ: https://github.com/dresden-elektronik/deconz-rest-plugin/releases

diff --git a/.github/ISSUE_TEMPLATE/device-request.md b/.github/ISSUE_TEMPLATE/device-request.md
@@ -8,6 +8,7 @@ assignees: ''
 ---
 
 <!--
+  !!!!! READ THIS FIRST: https://forum.phoscon.de/t/read-me-device-request-read-me/23/2 !!!!!!
   - Before requesting a device, please make sure to search the open and closed issues for any requests in the past.
   - Make sure not to remove any headers and fill the template completely. If you remove the headers, the issue will be auto-closed.
   - Sometimes devices have been requested before but are not implemented yet due to various reasons.

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/user-question.md b/.github/ISSUE_TEMPLATE/user-question.md
diff --git a/.github/issue-close-app.yml b/.github/issue-close-app.yml
@@ -10,6 +10,7 @@ comment: "Hi there. </br>
           - everything enclosed by `<!-- -->` is intended to give you guidance and should be replaced by your input specific to the issue </br>
           - Listings regarding your environment must be filled out completely where applicable (bug reports and user questions).</br>
           - Not following the template or providing insufficient information can still implicate manual closure.</br>
+          - Anything that is not clearly a bug can still implicate manual closure. For support we recommend the forum: https://forum.phoscon.de</br>
           </br>
           So please, first help us a bit to help you! </br>"
 issueConfigs:
@@ -27,18 +28,18 @@ issueConfigs:
 # Example 2: Device Request
   - "Device"
   - "Screenshots"
-- content:
+#- content:
 # Example 3: Feature Request
-  - "Feature request type"
-  - "Description"
-  - "Considered alternatives"
-  - "Additional context"
-- content:
+  #- "Feature request type"
+ # - "Description"
+ # - "Considered alternatives"
+ # - "Additional context"
+#- content:
 # Example 4: User Question
-  - "Describe the question or issue you are having"
-  - "Screenshots"
-  - "Environment"
-  - "deCONZ Logs"
-  - "Additional context"
+#  - "Describe the question or issue you are having"
+#- "Screenshots"
+#  - "Environment"
+#  - "deCONZ Logs"
+#  - "Additional context"
 # The issue is judged to be legal if it includes all keywords from any of these configs.
 # Or it will be closed by the app.
diff --git a/.github/workflows/verify-button-maps.yml b/.github/workflows/verify-button-maps.yml
@@ -36,3 +36,11 @@ jobs:
       # Verify button maps JSON schema
       - name: Verify button maps JSON schema
         run: npx ajv -s button_maps.schema.json -d button_maps.json
+
+      # Install jsonlint
+      - name: Install jsonlint
+        run: sudo apt install jsonlint
+
+      # Basic JSON checking
+      - name: Verify button maps has valid JSON
+        run: jsonlint-php button_maps.json
diff --git a/README.md b/README.md
@@ -20,11 +20,11 @@ The Phoscon App is a browser based web application and supports lights, sensors
 
 deCONZ beta releases are scheduled roughly once per week. After 2–3 betas a stable version is released and a new beta cycle begins. The stable release is usually published between 1st — 15th of the month.
 
-Current Beta: **v2.12.0-beta**  
-Current Stable: **v2.11.5**
+Current Beta: **v2.12.6-beta**  
+Current Stable: **v2.12.6**
 
-Next Beta: [v2.12.1-beta](https://github.com/dresden-elektronik/deconz-rest-plugin/milestone/14).
-Next Stable: **v2.12.x** expected in June.
+Next Beta: **v2.13.0-beta**  
+Next Stable: **v2.13.x** expected in October.
 
 Installation
 ============