HomePhabricator
Diffusion openhab2-addons 29e6fcb79244

Merge remote-tracking branch 'openhab/master' into zwave-master
29e6fcb79244Unpublished
Actions

Authored by Chris Jackson <chris@cd-jackson.com> on Mar 15 2016, 5:24 AM.

Unpublished Commit · Learn More

  • Repository Importing: This repository is still importing.
  • Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge remote-tracking branch 'openhab/master' into zwave-master

Conflicts:
addons/binding/org.openhab.binding.zwave/ESH-INF/thing/yale_ykfcon_0_0.xml

Details

Committed
Chris Jackson <chris@cd-jackson.com>Mar 15 2016, 5:24 AM
Parents
R40:1c76662e5174: Merge pull request #728 from cdjackson/zwave-master-secure
R40:4cc19d85ed41: Z-Wave Updates - Add listed=false to all things - Updated handling of thing…
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

CommitAuthorDetailsCommitted
1c76662e5174Chris Jackson
Merge pull request #728 from cdjackson/zwave-master-secure 
Mar 14 2016
48f35a4a0028Markus Rathgeb
Merge pull request #734 from kaikreuzer/paper 
Mar 14 2016
0b66d8ac925bKai Kreuzer
removed md-icons as they are not part of ESH 
Mar 14 2016
0147a160bc9fKai Kreuzer
Merge pull request #733 from kaikreuzer/rfx 
Mar 14 2016
e177611219ddKai Kreuzer
adapted code to latest ESH changes 
Mar 14 2016
58ae90fbed50Chris Jackson
Z-Wave Add secure command classes 
Mar 12 2016

Changes (36)

PathPackages
Maddons/binding/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/handler/RFXComHandler.java
Maddons/binding/org.openhab.binding.zwave/ESH-INF/thing/_channels.xml
Maddons/binding/org.openhab.binding.zwave/ESH-INF/thing/_controller_serial.xml
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/ZWaveBindingConstants.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/handler/ZWaveControllerHandler.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/ZWaveConfigProvider.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveCommandClassConverter.java
Paddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveDoorLockConverter.java
Copied from addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveBasicConverter.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/SerialMessage.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/ZWaveController.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/ZWaveDeviceClass.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/ZWaveNode.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveCommandClass.java
Aaddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveDoorLockCommandClass.java
Aaddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveLockCommandClass.java
Aaddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveSecurityCommandClass.java
Aaddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveSecurityCommandClassWithInitialization.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/event/ZWaveInclusionEvent.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/initialization/ZWaveNodeInitStage.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/initialization/ZWaveNodeStageAdvancer.java
A(dir)addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/
Aaddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/SecurityEncapsulatedSerialMessage.java
Aaddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/ZWaveSecureInclusionStateTracker.java
Aaddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/ZWaveSecureNonceTracker.java
Aaddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/ZWaveSecurityPayloadFrame.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/serialmessage/ApplicationCommandMessageClass.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/serialmessage/SendDataMessageClass.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/serialmessage/ZWaveCommandProcessor.java
Daddons/ui/org.openhab.ui.paperui/patch/web/fonts
Daddons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons
Daddons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.css
Daddons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.eot
Daddons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.svg
Daddons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.ttf
Daddons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.woff
Maddons/ui/org.openhab.ui.paperui/patch/web/js/constants.js

R40:29e6fcb79244

View Options

addons/binding/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/handler/RFXComHandler.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/ESH-INF/thing/_channels.xml

Loading...
View Options

addons/binding/org.openhab.binding.zwave/ESH-INF/thing/_controller_serial.xml

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/ZWaveBindingConstants.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/handler/ZWaveControllerHandler.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/ZWaveConfigProvider.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveCommandClassConverter.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveDoorLockConverter.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/SerialMessage.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/ZWaveController.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/ZWaveDeviceClass.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/ZWaveNode.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveCommandClass.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveDoorLockCommandClass.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveLockCommandClass.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveSecurityCommandClass.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveSecurityCommandClassWithInitialization.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/event/ZWaveInclusionEvent.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/initialization/ZWaveNodeInitStage.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/initialization/ZWaveNodeStageAdvancer.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/SecurityEncapsulatedSerialMessage.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/ZWaveSecureInclusionStateTracker.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/ZWaveSecureNonceTracker.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/security/ZWaveSecurityPayloadFrame.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/serialmessage/ApplicationCommandMessageClass.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/serialmessage/SendDataMessageClass.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/serialmessage/ZWaveCommandProcessor.java

Loading...
View Options

addons/ui/org.openhab.ui.paperui/patch/web/fonts

Loading...
View Options

addons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons

Loading...
View Options

addons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.css

Loading...
View Options

addons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.eot

Loading...
View Options

addons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.svg

Loading...
View Options

addons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.ttf

Loading...
View Options

addons/ui/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.woff

Loading...
View Options

addons/ui/org.openhab.ui.paperui/patch/web/js/constants.js

Loading...