forked from openhab/openhab1-addons
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dbadia-security-mmerge
* master: (178 commits) Fix the generateDeviceId method. (openhab#4498) [modbus] Add support for int32_swap, uint32_swap and float32_swap data types (openhab#4251) Extend error logging on retry failure (openhab#4477) Changed timestamp of item insert from MySql server time to local Java… (openhab#4503) [mochadx10] Add binding to OH2 distro (openhab#4502) [mqtt] Add openhab-action-mqtt feature for OH2 install (openhab#4499) ZWave database update (openhab#4497) Fixes openhab#1003 (openhab#4162) [WeatherBinding] Add log messages for invalid configurations (openhab#4458) Network Health - Made log message more clear (openhab#4425) Update ZMNHSD (openhab#4490) Update clock command class and converter (openhab#4489) Updated modbus config template with serial example. Documented advanced connection parameters (openhab#4487) ZWave update WA105DBZ (openhab#4485) Zwave database 180616 (openhab#4483) Zwave database 180616 (openhab#4479) Add Aeon ZW112 - Door/Window Sensor 6 (openhab#4472) Include Aeon ZW112 - Door/Window Sensor 6 (openhab#4471) Z-Wave: Added support for CENTRAL_SCENE (openhab#4431) ZWave database update (openhab#4476) ... # Conflicts: # bundles/binding/org.openhab.binding.zwave/database/products.xml # bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveConverterHandler.java # bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveCommandClass.java
- Loading branch information
Showing
3,970 changed files
with
33,312 additions
and
50,065 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
<!--- Provide a general summary of the issue in the Title above --> | ||
<!--- If the issue is related to a binding, please include it in the title. --> | ||
<!--- For example, "[astro] My issue..." --> | ||
<!--- For questions or requests for assistance please use community.openhab.org instead. --> | ||
<!--- Feel free to delete any comment lines in the template (starting with <!--) --> | ||
## Expected Behavior | ||
<!--- If you're describing a bug, tell us what should happen --> | ||
<!--- If you're suggesting a change/improvement, tell us how it should work --> | ||
|
||
## Current Behavior | ||
<!--- If describing a bug, tell us what happens instead of the expected behavior --> | ||
<!--- When possible, include related log information (preferably debug level) and related configs. --> | ||
<!--- Use file attachment for log and config information longer than a few lines --> | ||
<!--- If suggesting a change/improvement, explain the difference from current behavior --> | ||
<!--- For improvements, discuss in at community.openhab.org first and include link to topic --> | ||
|
||
## Possible Solution | ||
<!--- Not obligatory, but suggest a fix/reason for the bug, --> | ||
<!--- or ideas how to implement the addition or change --> | ||
|
||
## Steps to Reproduce (for bugs) | ||
<!--- Provide a link to a live example, or an unambiguous set of steps to --> | ||
<!--- reproduce this bug. Include code to reproduce, if relevant --> | ||
1. | ||
2. | ||
3. | ||
4. | ||
|
||
## Context | ||
<!--- How has this issue affected you? What are you trying to accomplish? --> | ||
<!--- Providing context helps us come up with a solution that is most useful in the real world --> | ||
|
||
## Your Environment | ||
<!--- Include as many relevant details about the environment you experienced the bug in --> | ||
* Version used: (e.g., openhab and addon versions) | ||
* Environment name and version (e.g. Chrome 39, node.js 5.4, Java 8, ...): | ||
* Operating System and version (desktop or mobile, Windows 10, Raspbian Jessie, ...): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ction/org.openhab.action.astro/src/main/java/org/openhab/action/astro/internal/Astro.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...nhab.action.astro/src/main/java/org/openhab/action/astro/internal/AstroActionService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
....openhab.action.astro/src/main/java/org/openhab/action/astro/internal/AstroActivator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...org.openhab.action.astro/src/main/java/org/openhab/action/astro/internal/AstroConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ab.action.dscalarm/src/main/java/org/openhab/action/dscalarm/internal/DSCAlarmAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...on.dscalarm/src/main/java/org/openhab/action/dscalarm/internal/DSCAlarmActionService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...action.dscalarm/src/main/java/org/openhab/action/dscalarm/internal/DSCAlarmActivator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...b.action.ecobee/src/main/java/org/openhab/action/ecobee/internal/EcobeeActionService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...enhab.action.ecobee/src/main/java/org/openhab/action/ecobee/internal/EcobeeActivator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
bundles/action/org.openhab.action.harmonyhub/OSGI-INF/action.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ab.action.harmonyhub/src/main/java/org/openhab/action/harmonyhub/internal/HarmonyHub.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...monyhub/src/main/java/org/openhab/action/harmonyhub/internal/HarmonyHubActionService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
....harmonyhub/src/main/java/org/openhab/action/harmonyhub/internal/HarmonyHubActivator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
bundles/action/org.openhab.action.homematic/OSGI-INF/action.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...enhab.action.homematic/src/main/java/org/openhab/action/homematic/internal/Homematic.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...homematic/src/main/java/org/openhab/action/homematic/internal/HomematicActionService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ion.homematic/src/main/java/org/openhab/action/homematic/internal/HomematicActivator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Oops, something went wrong.