mozilla
/
smarthome
зеркало из https://github.com/mozilla/smarthome.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
2 067 коммитов 3 Ветки 30 Теги 22 MiB
Граф коммитов

2067 Коммитов

Автор SHA1 Сообщение Дата
Aoun Bukhari 0d0bd7e29a Bug fix for configure button in bindings not working 
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
 2016-04-05 10:58:23 +02:00
Kai Kreuzer 2b6c333f3a Return empty config instead of 404 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-05 10:55:50 +02:00
Thomas Höfer 810a54b981 declared ConfigValidationException as RuntimeException in order to av… 
Signed-off-by: Thomas Höfer <t.hoefer@telekom.de>
 2016-04-05 10:31:31 +02:00
Markus Rathgeb 892dd6d88e Merge pull request #1316 from kaikreuzer/emptyconfig 
Return empty config instead of 404
 2016-04-04 22:24:49 +02:00
Kai Kreuzer 43ad1cba38 Return empty config instead of 404 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-04 22:05:33 +02:00
Kai Kreuzer f60c1015dd Merge pull request #1269 from cdjackson/thing-config-npe 
Fix potential NPE in thing config description provider
 2016-04-04 19:13:50 +02:00
Kai Kreuzer d4025a3e3d Merge pull request #1315 from sjka/fixCleanupInHueTest 
Waiting for proper cleanup in hue test
 2016-04-04 18:39:05 +02:00
Simon Kaufmann 229077e359 Waiting for proper cleanup in hue test 
...in order to prevent testing against a "used" thing.

fixes #1308
Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
 2016-04-04 18:36:31 +02:00
Kai Kreuzer b2037bcea1 Merge pull request #1314 from sjka/fixChangeThingTypeDuringInit 
Wait for running handler registration to complete
 2016-04-04 18:34:38 +02:00
Simon Kaufmann f5ccdd59f8 Wait for running handler registration to complete 
...in order to prevent a race condition when changing thing types
during initialization (see #1131).

Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
 2016-04-04 17:47:46 +02:00
Kai Kreuzer 4910df79de Merge pull request #1311 from sjka/configNull 
Made configuration null-tolerant
 2016-04-04 13:46:14 +02:00
Simon Kaufmann 387de7152e Made configuration null-tolerant 
relates #1301
Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
 2016-04-04 13:42:12 +02:00
Markus Rathgeb 94b3e82a88 Merge pull request #1310 from kaikreuzer/hue-tests 
adapted hue tests
 2016-04-04 13:32:35 +02:00
Kai Kreuzer 904c212272 adapted hue tests 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-04 12:36:27 +02:00
Kai Kreuzer 2adff2c30a Merge pull request #1268 from cdjackson/config-status 
Change response to config/status REST interface
 2016-04-04 12:33:58 +02:00
Markus Rathgeb 622920354d Merge pull request #1201 from qivicon/esh-should-work-on-CP2-with-portablebase64 
esh should work on cp2 with portablebase64
 2016-04-04 08:09:27 +02:00
Markus Rathgeb a1c56aa7c4 Merge pull request #1306 from kaikreuzer/automation-fix 
fixes broken build on automation rest api
 2016-04-03 22:00:14 +02:00
Kai Kreuzer 51154215ee fixes broken build on automation rest api 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-04-03 21:46:12 +02:00
Chris Jackson 6271d05d2e Change response to config/status REST interface 
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
 2016-04-03 18:19:42 +01:00
Markus Rathgeb 92f07b6bb7 Merge pull request #1302 from resetnow/basicui-html-escape 
BasicUI: escape widget titles and values for HTML (fixes #1293)
 2016-04-03 12:09:04 +02:00
Markus Rathgeb 97d6318566 Merge pull request #1286 from kaikreuzer/cdjackson-save_channel_config 
Refactored thing create and update mechanism through the REST API
 2016-04-03 11:38:18 +02:00
Kai Kreuzer 794cccd7f5 Merge pull request #1305 from resetnow/basicui-branding 
BasicUI: drop OpenHAB references in UI, fixes #1300
 2016-04-02 22:36:19 +02:00
Vlad Ivanov c40a0419e6 BasicUI: drop OpenHAB references in UI, fixes #1300 
Signed-off-by: Vlad Ivanov <vlad-mbx@ya.ru>
 2016-04-02 13:13:42 +03:00
Markus Rathgeb cba8640e27 Merge pull request #1282 from cdjackson/config-validator-minmax 
Allow options to be outside of min/max in validator
 2016-04-02 09:11:46 +02:00
Markus Rathgeb 29f59937e8 Merge pull request #1275 from kaikreuzer/yahoo 
fixes #1273
 2016-04-02 09:06:55 +02:00
Kai Kreuzer 5f06fd6d35 Merge pull request #1304 from cdjackson/rest-inbox-failure 
Update inbox resource to use JSONResponse and fix null response from approve
 2016-04-02 00:10:05 +02:00
Chris Jackson 5865348154 Update inbox resource to use JSONResponse and fix null response from approve 
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
 2016-04-01 22:49:27 +01:00
Kai Kreuzer a2a7e7ecb5 Merge pull request #788 from qivicon/ordering 
Reordering of modules
 2016-04-01 16:33:13 +02:00
Vlad Ivanov d814d25184 BasicUI: escape widget titles and values for HTML (fixes #1293) 
Signed-off-by: Vlad Ivanov <vlad-mbx@ya.ru>
 2016-04-01 00:45:00 +03:00
Kai Kreuzer 4cd0a2e03f Merge pull request #1295 from qivicon/thingID-input 
Allow specifying thing ID during manual creation
 2016-03-31 21:49:40 +02:00
Kai Kreuzer a1603124f9 Merge branch 'qivicon-channel-unlink' 2016-03-31 21:43:48 +02:00
Kai Kreuzer 7dbfc893df adapted texts 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-03-31 21:43:01 +02:00
Kai Kreuzer 651019a63a Merge branch 'channel-unlink' of https://github.com/qivicon/smarthome into qivicon-channel-unlink 2016-03-31 21:31:04 +02:00
Kai Kreuzer 5d48b32997 Merge pull request #1299 from sjka/fixBindingBaseClassesOSGiTest 
made BindingBaseClassesOSGiTest more robust wrt timing
 2016-03-31 21:30:34 +02:00
Kai Kreuzer 420e431e55 Merge pull request #1298 from sjka/fixHueLightHandlerOSGiTest 
made HueBridgeLightHandlerOSGiTest more robust wrt timing
 2016-03-31 18:53:14 +02:00
Simon Kaufmann 4d893c9e61 made HueBridgeLightHandlerOSGiTest more robust wrt timing 
...in order to get rid of the occasional
      java.lang.NoSuchFieldException: http
exception.

Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
 2016-03-31 13:56:57 +02:00
Simon Kaufmann 81925b7b19 made BindingBaseClassesOSGiTest more robust wrt timing 
Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
 2016-03-31 13:55:25 +02:00
Aoun Bukhari 7fcb15cd56 Allow reordering of modules 
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
 2016-03-31 12:52:09 +02:00
Kai Kreuzer f484299e05 Merge pull request #1296 from sjka/enableLoggingForCoreThingTests 
enhanced logging in order to track down #1131
 2016-03-30 21:48:31 +02:00
Simon Kaufmann 9f67e12b38 enhanced logging in order to track down #1131 
Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
 2016-03-30 19:10:59 +02:00
Aoun Bukhari e315d34ef9 Allow specifying thing ID during manual creation 
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
 2016-03-30 14:46:30 +02:00
Kai Kreuzer fd2a94f460 refactored thing update mechanism through the REST API 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
 2016-03-29 23:56:06 +02:00
Kai Kreuzer d2ab2089ae Merge pull request #1289 from qivicon/thing-label-inbox 
Bug fix: Missing discovery results label
 2016-03-29 22:08:58 +02:00
Kai Kreuzer 6f408ea995 Merge pull request #1290 from qivicon/binding-search 
Fixed automatic redirection issue
 2016-03-29 21:50:16 +02:00
Kai Kreuzer 6f69eda90e Merge pull request #1291 from qivicon/things-toast 
Fixed thing's manual-add toast
 2016-03-29 21:46:26 +02:00
Aoun Bukhari bbda7d34a2 Unlink channel after confirmation 
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
 2016-03-29 17:56:55 +02:00
Aoun Bukhari a2517d7b3e fixed things manual add toast 
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
 2016-03-29 17:06:41 +02:00
Aoun Bukhari 72ceb133dd Toast automatic redirect fix 
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
 2016-03-29 16:42:27 +02:00
Aoun Bukhari 3fc3a3c61b Bug fix: thing label not showing in inbox on refresh 
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
 2016-03-29 15:05:35 +02:00
Kai Kreuzer a89e2c1780 Merge pull request #1281 from cdjackson/config-validator-array 
Fix config validator so it handles multiple selection values
 2016-03-29 09:58:33 +02:00