demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-11 05:41:52 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
84 Commits 1 Branch 0 Tags 39 MiB
a1bc0ce877
Commit Graph

84 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Kreuzer
a1bc0ce877 removed rule engine (to be added as experimental feature to distro for now) (#40) 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-25 18:16:04 +02:00
Kai Kreuzer
d33e3bb7be Merge pull request #38 from kaikreuzer/esh-addons 
moved esh addons from distro to core
 2016-04-22 19:34:15 +02:00
Kai Kreuzer
7e1e3de9eb moved esh addons from distro to core 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-22 19:33:06 +02:00
Kai Kreuzer
c6d56c74a3 Merge pull request #37 from maggu2810/karaf-features 
use ESH Karaf target platform
 2016-04-18 11:47:51 +02:00
Markus Rathgeb
f3696aa823 use ESH Karaf target platform 
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
 2016-04-17 20:09:54 +02:00
Kai Kreuzer
be3a691e39 Merge pull request #36 from kaikreuzer/feat 
fixes https://github.com/openhab/openhab-distro/issues/176
 2016-04-16 09:20:47 +02:00
Kai Kreuzer
8209e72ba6 fixes https://github.com/openhab/openhab-distro/issues/176 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-16 09:20:38 +02:00
Kai Kreuzer
4acce34de7 Merge pull request #35 from kaikreuzer/ext 
improved robustness of feature/package installer
 2016-04-15 21:39:02 +02:00
Kai Kreuzer
667df5ceca improved robustness of feature/package installer 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-15 21:36:24 +02:00
Kai Kreuzer
c9650f149f Merge pull request #34 from kaikreuzer/packagemgr 
registered feature installer as a service so that it appears in the P…
 2016-04-15 17:57:49 +02:00
Kai Kreuzer
99f2502d05 Merge pull request #33 from maggu2810/oh-xtext-bump 
changes for Xtext 2.9.2 usage (ESH / OH)
 2016-04-15 17:57:27 +02:00
Kai Kreuzer
a1bda50055 registered feature installer as a service so that it appears in the Paper UI 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-14 18:03:36 +02:00
Markus Rathgeb
c5870a9349 drop shk, use KAT, bump Xtext 
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
 2016-04-13 21:20:52 +02:00
Markus Rathgeb
7b0651ccde drop multiple karaf version declarations 
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
 2016-04-13 18:31:57 +02:00
Kai Kreuzer
589f47727a Merge pull request #32 from kaikreuzer/upnp 
updated jupnp to 2.2.0
 2016-04-12 21:41:38 +02:00
Kai Kreuzer
50b3fe9268 updated jupnp to 2.2.0 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-12 20:59:13 +02:00
Kai Kreuzer
e6107153e2 Merge pull request #30 from reitermarkus/master 
Add signal icon to script to avoid duplicates.
 2016-03-27 23:27:28 +02:00
Kai Kreuzer
2c0b3a68a8 Merge pull request #31 from kaikreuzer/license 
applied updated and neutral copyright header
 2016-03-27 23:27:05 +02:00
Kai Kreuzer
04cfa9cee3 applied updated and neutral copyright header 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-03-27 22:14:00 +02:00
Markus Reiter
9aae7b3c01 Add signal icon to script to avoid duplicates. 
Signed-off-by: Markus Reiter <me@reitermark.us>
 2016-03-27 06:43:48 +02:00
Kai Kreuzer
dc79b2a815 Merge pull request #26 from digitaldan/backport_of_1460 
Backport of https://github.com/openhab/openhab/pull/1460
 2016-03-14 22:36:49 +01:00
Kai Kreuzer
56a96a237d Merge pull request #28 from kaikreuzer/tts 
adapted to new tts interface location in ESH
 2016-03-14 22:36:07 +01:00
Kai Kreuzer
485f7a26df adapted to new tts interface location in ESH 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-03-14 19:05:04 +01:00
Kai Kreuzer
d54fc5551f Merge pull request #27 from clinique/Issue1034 
In order to study and correct Issue #1034, I felt on some missing cat…
 2016-03-01 16:12:01 +01:00
Gaël L'hopital
3e51a8071d In order to study and correct Issue #1034, I felt on some missing category icons. 
Signed-off-by: Gaël L'hopital <glhopital@gmail.com>
 2016-03-01 15:58:35 +01:00
Kai Kreuzer
c81749a0a2 changed jmdns version to 3.5.0 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-23 16:15:37 +01:00
digitaldan
8c15096a10 Backport of https://github.com/openhab/openhab/pull/1460 
This allows group items who are not exactly the same base item to be included in logic operations, for example a dimmer can now be included in a group switch item.
 2016-02-22 15:13:10 -08:00
Kai Kreuzer
c24e2da913 changed version of uploaded p2 repo to 2.0.0.x 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-22 20:51:15 +01:00
Kai Kreuzer
98cdac709c added new jmdns version and repo 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-22 20:10:39 +01:00
Kai Kreuzer
51d1e95150 removed logging of version on bundle start&stop 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-22 19:45:36 +01:00
Kai Kreuzer
ae4046990f added script for publishing of p2 repo to bintray 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-22 19:45:35 +01:00
Kai Kreuzer
a06982b442 Merge pull request #25 from kaikreuzer/npe 
fixes NPE if parameters are null and removed toString calls in loggin…
 2016-02-22 19:34:30 +01:00
Kai Kreuzer
1b9af5d70e fixes NPE if parameters are null and removed toString calls in logging statements 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-22 19:33:09 +01:00
Kai Kreuzer
615e822480 Merge pull request #23 from reitermarkus/master 
Fix office icon.
 2016-02-19 17:21:10 +01:00
Markus Reiter
87670943a3 Fix office icon. 
Signed-off-by: Markus Reiter <me@reitermark.us>
 2016-02-19 17:19:21 +01:00
Kai Kreuzer
d40b86cd5d Merge pull request #22 from reitermarkus/master 
Add new icons and delete legacy icons.
 2016-02-19 10:20:46 +01:00
Markus Reiter
b6ed251c88 Add new icons and delete legacy icons. 
- Camera
- CO2
- Flow
- Gas
- Line (decline/incline/stagnation)
- Microphone
- Motion
- Move
- Pressure
- Rain
- Signal (0-4)
- Smoke
- Television (on/off)
- Zoom
 2016-02-18 19:43:24 +01:00
Kai Kreuzer
49ef22b90c Merge pull request #20 from kaikreuzer/agbp 
Introduced concurrency fixes as done in https://github.com/openhab/op…
 2016-02-17 09:47:21 +01:00
Kai Kreuzer
6f0a7acbf6 Introduced concurrency fixes as done in https://github.com/openhab/openhab/pull/3016 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-17 09:46:30 +01:00
Kai Kreuzer
ab2eebdbd7 Merge pull request #18 from kaikreuzer/loc 
added location item support in config reader delegate
 2016-02-16 18:27:55 +01:00
Kai Kreuzer
6d04f2d042 added location item support in config reader delegate 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-16 18:27:00 +01:00
Kai Kreuzer
c7c6e2965f updated to jUPnP 2.1.0 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-15 20:14:48 +01:00
Kai Kreuzer
d1dc14dcb0 Merge pull request #17 from kaikreuzer/datetype 
Improved mapping of DateTimeType
 2016-02-11 13:09:45 +01:00
Kai Kreuzer
0f19cc341f map the types by cloning the internal calendar 
fixes #16

Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-07 22:25:33 +01:00
Kai Kreuzer
e43106ab87 apply code formatter 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-02-07 22:21:43 +01:00
Kai Kreuzer
290cc11a15 Merge pull request #15 from kaikreuzer/jupnp 
upgraded jupnp to 2.1.0.RC1
 2016-01-30 22:54:30 +01:00
Kai Kreuzer
af116347c5 upgraded jupnp to 2.1.0.RC1 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-01-30 22:52:50 +01:00
Kai Kreuzer
a4d630423f Merge pull request #14 from dvanherbergen/master 
Update openhab-deps-repo url to new location
 2016-01-22 16:59:28 +01:00
Davy Vanherbergen
8b4736dfa7 Update openhab-deps-repo url to new location 
Signed-off-by: Davy Vanherbergen <davy.vanherbergen@gmail.com>
 2016-01-22 16:54:33 +01:00
Kai Kreuzer
e7edd529ad Merge pull request #13 from dvanherbergen/master 
Update to new p2 repository
 2016-01-21 11:55:16 +01:00