1e348f4bcb
Fix CNFE by removal of optional resolution ( #1395 )
...
Move the service that needs packages from core.transform and
model.script bundle to model.script. The core.transform is a core bundle
and also part of the base target platform, so it should be available.
The model script bundle is optional.
PR: https://github.com/eclipse/smarthome/pull/1395
Bug: https://github.com/eclipse/smarthome/issues/1394
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-04-18 09:15:56 +02:00
4a8efc4476
drop lazy activation of automation modules ( #1369 )
...
PR: https://github.com/eclipse/smarthome/pull/1369
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-04-18 09:14:50 +02:00
ea706119bc
bump Xtext to 2.9.2 ( #1383 )
...
PR: https://github.com/eclipse/smarthome/pull/1383
Also-By: Roland Menznerowski <r.menznerowski@external.telekom.de>
Also-By: Kai Kreuzer <kai@openhab.org>
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-04-15 14:35:16 +02:00
399f0f6832
Send null instead of empty string in configurations ( #1380 )
...
PR: https://github.com/eclipse/smarthome/pull/1380
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-15 12:01:31 +02:00
f66dc675ac
reduced logging to debug, since it is irrelevant for users ( #1386 )
...
PR: https://github.com/eclipse/smarthome/pull/1386
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-15 09:40:20 +02:00
8d6c747839
Merge pull request #1389 from kaikreuzer/rule3
...
Also allow Double if the value is an integer number
2016-04-15 09:16:16 +03:00
a8166cd3d0
Merge pull request #1388 from kaikreuzer/rule2
...
also catch other exceptions besides ScriptException
2016-04-15 09:15:14 +03:00
d45f9d5867
removed obsolete code.
...
removed obsolete code.
2016-04-15 09:14:45 +03:00
0f2a554dc6
Also allow Double if the value is an integer number
...
JSON parses all integers to doubles, hence we have to deal with this situation as well.
It probably makes sense to merge all this validation logic with the ConfigValidation code soon.
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-14 17:37:17 +02:00
df1e704e55
also catch other exceptions besides ScriptException
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-14 17:33:19 +02:00
fe95a53f6e
removed obsolete code
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-14 17:31:59 +02:00
898f2e9172
moved persistence REST resource into io.rest.core bundle ( #1365 )
...
PR: https://github.com/eclipse/smarthome/pull/1365
Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
2016-04-13 14:50:17 +02:00
8da43527c7
avoid NPE if no config is set ( #1376 )
...
fixes #1374
PR: https://github.com/eclipse/smarthome/pull/1376
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-13 10:19:14 +02:00
9015e3c88e
updated jupnp version to 2.2.0 ( #1375 )
...
* updated jupnp version to 2.2.0
Signed-off-by: Kai Kreuzer <kai@openhab.org>
* changed sequence number
PR: https://github.com/eclipse/smarthome/pull/1375
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-13 09:49:55 +02:00
71a6b7942a
BasicUI: escape character data in XML output, fixes #1366 ( #1373 )
...
PR: https://github.com/eclipse/smarthome/pull/1373
Signed-off-by: Vlad Ivanov <vlad-mbx@ya.ru>
2016-04-12 21:58:22 +02:00
775dfae445
core.library has already been merged to core ( #1372 )
...
PR: https://github.com/eclipse/smarthome/pull/1372
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-04-12 21:04:43 +02:00
9336851450
fix automation integration test - filtering rules by correct tags ( #1371 )
...
Bug: https://github.com/eclipse/smarthome/issues/1370
PR: https://github.com/eclipse/smarthome/pull/1371
Signed-off-by: Vasil Ilchev <v.ilchev@prosyst.bg>
2016-04-12 19:27:53 +02:00
1a7473c662
Fix https://github.com/eclipse/smarthome/issues/862 ( #1364 )
...
PR: https://github.com/eclipse/smarthome/pull/1364
Signed-off-by: Karel Goderis <karel.goderis@me.com>
2016-04-11 15:44:44 +02:00
bf3f979f81
PR: https://github.com/eclipse/smarthome/pull/1363Fix https://github.com/eclipse/smarthome/issues/1280 and https://github.com/eclipse/smarthome/issues/1332
...
PR: https://github.com/eclipse/smarthome/pull/1363
Fix https://github.com/eclipse/smarthome/issues/1280 and https://github.com/eclipse/smarthome/issues/1332
2016-04-11 15:42:41 +02:00
1d2aae020d
Fix https://github.com/eclipse/smarthome/issues/1332
...
Signed-off-by: Karel Goderis <karel.goderis@me.com>
2016-04-11 14:26:49 +02:00
afaa4c72b6
Fix https://github.com/eclipse/smarthome/issues/1280
...
Signed-off-by: Karel Goderis <karel.goderis@me.com>
2016-04-11 14:20:01 +02:00
54893b0bb3
corrected script options (defined through mime-type) ( #1357 )
...
PR: https://github.com/eclipse/smarthome/pull/1357
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-11 09:52:18 +02:00
81bef19480
Set default values in rule template config ( #1361 )
...
PR: https://github.com/eclipse/smarthome/pull/1361
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-11 09:25:58 +02:00
0431ddbbbd
Support integers in select box ( #1360 )
...
PR: https://github.com/eclipse/smarthome/pull/1360
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-11 09:20:20 +02:00
f6470c7e7f
Fix concurrent modification exception when updating properties in configuration ( #1358 )
...
PR: https://github.com/eclipse/smarthome/pull/1358
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
2016-04-10 19:20:56 +02:00
f2022ef878
Implemented Complex Resolving feature ( #1317 )
...
PR: https://github.com/eclipse/smarthome/pull/1317
issue: https://github.com/eclipse/smarthome/issues/1247
Signed-off-by: Vasil Ilchev <v.ilchev@prosyst.bg>
2016-04-10 00:32:13 +02:00
989201cc1c
Show rule description in rule list ( #1354 )
...
https://github.com/eclipse/smarthome/pull/1354
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-09 20:48:22 +02:00
bd553f4c8d
Support html tags in config parameters ( #1355 )
...
PR: https://github.com/eclipse/smarthome/pull/1355
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-09 20:47:46 +02:00
63e29893b3
also accept Boolean values instead of Strings in the configuration ( #1351 )
...
fixes https://github.com/openhab/openhab-distro/issues/165
PR: https://github.com/eclipse/smarthome/pull/1351
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-08 18:37:15 +02:00
477f3c7f8c
Use monospace font only in script's text area ( #1348 )
...
PR: https://github.com/eclipse/smarthome/pull/1348
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-08 15:48:53 +02:00
14d090f471
fixes invalid configurations shown in modules ( #1347 )
...
PR: https://github.com/eclipse/smarthome/pull/1347
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-08 15:47:31 +02:00
2be0c09cff
ignore empty configurations on merge ( #1345 )
...
PR: https://github.com/eclipse/smarthome/pull/1345
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-08 11:40:40 +02:00
f23e26f49f
Show only module types with visibility 'visible' ( #1343 )
...
PR: https://github.com/eclipse/smarthome/pull/1343
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-07 22:32:30 +02:00
77ddac44d5
Improve test stability (related to #1334 )
...
PR: https://github.com/eclipse/smarthome/pull/1337
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-06 17:26:17 +02:00
90e1804a16
added visibility flag to module types and script meta-data to script condition
...
PR: https://github.com/eclipse/smarthome/pull/1335
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-06 15:39:22 +02:00
86f316b034
textarea for scripts
...
PR: https://github.com/eclipse/smarthome/pull/1330
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-06 12:19:32 +02:00
59ac2c7ad0
fix for R4 Compatibility
...
PR: https://github.com/eclipse/smarthome/pull/1331
Signed-off-by: Benedikt Niehues <b.niehues@external.telekom.de>
2016-04-05 21:11:04 +02:00
ccfc41686b
fix for R4 Compatibility
...
PR: https://github.com/eclipse/smarthome/pull/1331
Signed-off-by: Benedikt Niehues <b.niehues@external.telekom.de>
2016-04-05 21:01:07 +02:00
4453d76b4b
Merge pull request #1329 from qivicon/config-integer
...
Parse string to integer and boolean values
2016-04-05 14:45:52 +02:00
d55e0ca11a
Parse string to integer and boolean
...
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-04-05 14:31:04 +02:00
dd5716f69b
Merge pull request #1328 from kaikreuzer/cm
...
avoid IllegalArgumentException when storing complex objects (like Big…
2016-04-05 13:51:11 +02:00
a7a9db0d0d
avoid IllegalArgumentException when storing complex objects (like BigDecimal) as a configuration
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-05 13:44:39 +02:00
a705a951ab
Merge pull request #1326 from qivicon/binding-config
...
Bug fix for 'configure button in bindings not working'
2016-04-05 13:27:49 +02:00
6151023e31
Merge pull request #1324 from kaikreuzer/script
...
improved meta data of script action
2016-04-05 13:13:56 +02:00
6e5158eb56
improved meta data of script action
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-05 13:10:11 +02:00
4788bd917e
Merge pull request #1322 from kaikreuzer/ruledocs
...
added rule samples to documentation menu
2016-04-05 12:30:40 +02:00
d1c6efb97d
added rule samples to documentation menu
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-05 12:11:27 +02:00
c781e9dd61
Merge pull request #1321 from kaikreuzer/fixtests
...
fix tests for #1316
2016-04-05 11:58:27 +02:00
2130472f03
fix tests for #1316
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-04-05 11:48:19 +02:00
9f3b51c3e0
Return empty config instead of 404
...
Return empty config instead of 404
2016-04-05 11:27:07 +02:00
Markus Rathgeb
aounhaider1
Kai Kreuzer
Yordan Mihaylov
Simon Kaufmann
Vlad Ivanov
vilchev
Karel Goderis
Chris Jackson
BenediktNiehues
Aoun Bukhari