HomePhabricator
Diffusion openhab2-addons 0ab40274451a

Merge branch 'master' of https://github.com/openhab/openhab2-addons into zwave…
0ab40274451aUnpublished
Actions

Authored by Chris Jackson <chris@cd-jackson.com> on Feb 28 2016, 5:45 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 branch 'master' of https://github.com/openhab/openhab2-addons into zwave-master

Details

Committed
Chris Jackson <chris@cd-jackson.com>Feb 28 2016, 5:45 AM
Parents
R40:2b93e30ca561: ZWave Updates - Moved temperature conversion to base converter class - Added…
R40:fa7724e1c51a: Merge pull request #685 from digitaldan/zwave_thermo_fix
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

CommitAuthorDetailsCommitted
fa7724e1c51aChris Jackson
Merge pull request #685 from digitaldan/zwave_thermo_fix 
Feb 28 2016
6f02cca4cec5digitaldan
adds missing handleEvent methods. 
Feb 27 2016
bee04e0dd31bKai Kreuzer
Merge pull request #681 from digitaldan/hueemulator-fixes 
Feb 27 2016
e22a01ea1883Chris Jackson
Merge pull request #683 from cdjackson/zwave-master 
Feb 26 2016
04134ccb7414Dan Cunningham
Use the first non loopback ipv4 address 
Feb 26 2016
c26d14b33d2fChris Jackson
Merge pull request #679 from cdjackson/zwave-master 
Feb 24 2016
6a174d5baf86Kai Kreuzer
Merge pull request #654 from digitaldan/HueEmulator 
Feb 24 2016
4633899a4e0dKai Kreuzer
Merge pull request #677 from digitaldan/autelis-cache-fix 
Feb 24 2016
d6787da8dbd5digitaldan
Fixes an issue where values would be stored before channels were ready for them. 
Feb 23 2016
f20b867f794fDan Cunningham
Initial Commit of the Hue Emulator 
Feb 23 2016
7f051ba9fe56Chris Jackson
Merge pull request #676 from cdjackson/zwave-master 
Feb 22 2016
9871f3a3120eChris Jackson
Merge pull request #675 from cdjackson/zwave-master 
Feb 21 2016
ea5b96b7a836Kai Kreuzer
fixed z-wave feature name 
Feb 21 2016
505625563619Kai Kreuzer
added wave binding as a feature 
Feb 21 2016
babac0aeb519Kai Kreuzer
Merge branch 'zwave-master' of https://github.com/cdjackson/openhab2-addons… 
Feb 21 2016
6df69ddd9be1Kai Kreuzer
Merge pull request #650 from marcelrv/UDPCommands 
Feb 21 2016
f82d3a5237e2Marcel Verpaalen
UDP commands for MAX! Cube 
Feb 20 2016

Changes (42)

PathPackages
Maddons/binding/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/handler/AutelisHandler.java
Maddons/binding/org.openhab.binding.max/ESH-INF/thing/bridge.xml
Maddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/config/MaxCubeBridgeConfiguration.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/UdpCubeCommand.java
Maddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxCubeBridgeHandler.java
Daddons/binding/org.openhab.binding.zwave/ESH-INF/i18n
Daddons/binding/org.openhab.binding.zwave/ESH-INF/i18n/zwave_xx_XX.properties
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveThermostatFanStateConverter.java
Maddons/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveThermostatModeConverter.java
A(dir)addons/io/org.openhab.io.hueemulation/
Paddons/io/org.openhab.io.hueemulation/.classpath
Copied from addons/binding/org.openhab.binding.hdanywhere/.classpath
Paddons/io/org.openhab.io.hueemulation/.project
Copied from addons/binding/org.openhab.binding.autelis/.project
A(dir)addons/io/org.openhab.io.hueemulation/ESH-INF/
A(dir)addons/io/org.openhab.io.hueemulation/ESH-INF/config/
Aaddons/io/org.openhab.io.hueemulation/ESH-INF/config/config.xml
A(dir)addons/io/org.openhab.io.hueemulation/META-INF/
Paddons/io/org.openhab.io.hueemulation/META-INF/MANIFEST.MF
Copied from addons/binding/org.openhab.binding.lutron/META-INF/MANIFEST.MF
A(dir)addons/io/org.openhab.io.hueemulation/OSGI-INF/
Aaddons/io/org.openhab.io.hueemulation/OSGI-INF/hueemulation.xml
Aaddons/io/org.openhab.io.hueemulation/README.md
Paddons/io/org.openhab.io.hueemulation/build.properties
Copied from addons/binding/org.openhab.binding.astro/build.properties
Paddons/io/org.openhab.io.hueemulation/pom.xml
Copied from addons/io/org.openhab.io.myopenhab/pom.xml
A(dir)addons/io/org.openhab.io.hueemulation/src/
A(dir)addons/io/org.openhab.io.hueemulation/src/main/
A(dir)addons/io/org.openhab.io.hueemulation/src/main/java/
A(dir)addons/io/org.openhab.io.hueemulation/src/main/java/org/
A(dir)addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/
A(dir)addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/
A(dir)addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/
A(dir)addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/
Aaddons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationServlet.java
Aaddons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationUpnpServer.java
A(dir)addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/
Paddons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueCreateUser.java
Copied from addons/binding/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/config/SqueezeBoxPlayerConfig.java
Paddons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueDataStore.java
Copied from addons/binding/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/config/SqueezeBoxPlayerConfig.java
Aaddons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueDevice.java
Aaddons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueErrorResponse.java
Aaddons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueState.java
A(dir)addons/io/org.openhab.io.hueemulation/src/main/resources/
Aaddons/io/org.openhab.io.hueemulation/src/main/resources/discovery.xml
Maddons/io/pom.xml
Mfeatures/openhab-addons/src/main/feature/feature.xml

R40:0ab40274451a

View Options

addons/binding/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/handler/AutelisHandler.java

Loading...
View Options

addons/binding/org.openhab.binding.max/ESH-INF/thing/bridge.xml

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/config/MaxCubeBridgeConfiguration.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/command/UdpCubeCommand.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxCubeBridgeHandler.java

Loading...
View Options

addons/binding/org.openhab.binding.zwave/ESH-INF/i18n

Loading...
View Options

addons/binding/org.openhab.binding.zwave/ESH-INF/i18n/zwave_xx_XX.properties

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

addons/io/org.openhab.io.hueemulation/.classpath

Loading...
View Options

addons/io/org.openhab.io.hueemulation/.project

Loading...
View Options

addons/io/org.openhab.io.hueemulation/ESH-INF/config/config.xml

Loading...
View Options

addons/io/org.openhab.io.hueemulation/META-INF/MANIFEST.MF

Loading...
View Options

addons/io/org.openhab.io.hueemulation/OSGI-INF/hueemulation.xml

Loading...
View Options

addons/io/org.openhab.io.hueemulation/README.md

Loading...
View Options

addons/io/org.openhab.io.hueemulation/build.properties

Loading...
View Options

addons/io/org.openhab.io.hueemulation/pom.xml

Loading...
View Options

addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationServlet.java

Loading...
View Options

addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationUpnpServer.java

Loading...
View Options

addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueCreateUser.java

Loading...
View Options

addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueDataStore.java

Loading...
View Options

addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueDevice.java

Loading...
View Options

addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueErrorResponse.java

Loading...
View Options

addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueState.java

Loading...
View Options

addons/io/org.openhab.io.hueemulation/src/main/resources/discovery.xml

Loading...
View Options

addons/io/pom.xml

Loading...
View Options

features/openhab-addons/src/main/feature/feature.xml

Loading...