Граф коммитов

272 Коммитов

Автор SHA1 Сообщение Дата
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
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 29f59937e8 Merge pull request #1275 from kaikreuzer/yahoo
fixes #1273
2016-04-02 09:06:55 +02: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 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
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
Aoun Bukhari 7fcb15cd56 Allow reordering of modules
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-31 12:52:09 +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 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
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
Markus Reiter fb23d58f26 Add changes from kaikreuzer/openhab-core#27.
Signed-off-by: Markus Reiter <me@reitermark.us>
2016-03-28 00:29:23 +02:00
Markus Reiter eafa005024 Import iconset from OpenHAB.
Import iconset from OpenHAB, fix office icon and add script to generate iconset ReadMe.

Signed-off-by: Markus Reiter <me@reitermark.us>
2016-03-28 00:29:23 +02:00
Kai Kreuzer de4b9c6c37 fixes #1273
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-03-27 12:52:56 +02:00
Kai Kreuzer 09880fd208 Merge pull request #1266 from hmerk/master
Fix #1243 - WeMo LED lights not going ONLINE
2016-03-24 23:38:51 +01:00
Hans-Jörg Merk 0a8b0b45e6 Fix #1243 - WeMo LED lights not going ONLINE after linked to a channel
Signed-off-by: Hans-Jörg Merk <hans-joerg.merk@t-online.de>
2016-03-24 23:35:39 +01:00
Aoun Bukhari 689f8f8078 Support html tags in item description
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-24 13:47:21 +01:00
Aoun Bukhari 883e26065b show ignored and buttons shadow removed
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-23 18:18:15 +01:00
Aoun Bukhari 9b4e4dc51f md-button size customized
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-23 17:30:56 +01:00
Aoun Bukhari 9f5890414a removed auto width for md-icons
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-23 16:10:37 +01:00
Markus Rathgeb bed87f2873 Merge pull request #1208 from AlJungOrg/hue-refactorings
Refactrings for HueBridgeHandler
2016-03-22 15:19:06 +01:00
Markus Rathgeb 6b9a889349 Merge pull request #1207 from AlJungOrg/fix-hue-isEqual
HueBridgeHandler: Fix isEqual(state,state) Method
2016-03-22 15:18:19 +01:00
Kai Kreuzer 9dd87ac4fc Merge pull request #1206 from AlJungOrg/fix-hue-initialstate
Fix #1159 Add channelLinked() to HueLightHandler
2016-03-22 15:16:12 +01:00
Sebastian Janzen 38fc2ecd18
Refactrings for HueBridgeHandler
- Shrink code of pollingRunnable, which should make it more readable
 - Add notifyStatusListeners() Method

Signed-off-by: Sebastian Janzen <sebastian@janzen.it>
2016-03-22 15:09:08 +01:00
Sebastian Janzen 6904236dac
HueBridgeHandler: Fix isEqual(state,state) Method
Before, every Hue light state which was checked for equality resulted in true (=equal) if the light did not support color or alert.
This is not the full truth: Thanks to the `&&` expression, the isEqual() order of equal checking was:

 1. alert
 2. isOn
 3. effect
 4. brightness
 5. color mode
 6. ...

So it only fails if nothing before color mode was not equals.

Signed-off-by: Sebastian Janzen <sebastian@janzen.it>
2016-03-22 15:06:40 +01:00
Sebastian Janzen 886ccb8ee2
Fix #1159 Add channelLinked() to HueLightHandler
This is neccessary if you have enableChannels=true. Because if you use inbox/approve, the links are made after the HueLightHandler is created and the first channel updates are not forwarded to any item - they're linked after that.

Signed-off-by: Sebastian Janzen <sebastian@janzen.it>
2016-03-22 15:02:11 +01:00
Markus Rathgeb 035b68fca4 Merge pull request #1246 from kaikreuzer/control
made control ui work without groups
2016-03-22 13:16:38 +01:00
Kai Kreuzer ebdf87ff3a made control ui work without groups
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-03-22 11:22:08 +01:00
Kai Kreuzer c1d4e66efe Merge pull request #1231 from maggu2810/sonos-handle-every-case
sonos: handle every case in switch
2016-03-22 10:40:22 +01:00
Kai Kreuzer 49a026ca30 Merge pull request #1229 from maggu2810/sonos-unused-imports
sonos: remove unused imports (+formatter)
2016-03-22 10:39:31 +01:00
Kai Kreuzer c6a409001a Merge pull request #1230 from maggu2810/sonos-fix-npe
sonos: fix potential null pointer access
2016-03-22 10:38:51 +01:00
Kai Kreuzer 1297ea20bc Merge pull request #1238 from cdjackson/config-status
Config status should allow situation with no message
2016-03-22 09:35:31 +01:00
Chris Jackson 1433890c07 Config status should allow situation with no message
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
2016-03-21 22:58:49 +01:00
John Cocula c21256c1d4 Fixes #1235.
Signed-off-by: John Cocula <john@cocula.com>
2016-03-20 17:22:15 +00:00
Markus Rathgeb e94134ce43 Merge pull request #848 from kgoderis/sonos
Add synchronize(this) to onValueReceived()
2016-03-20 14:01:46 +01:00
Karel Goderis b91873daef Add synchronize(this) to onValueReceived()
Signed-off-by: Karel Goderis<karel.goderis@me.com>
2016-03-20 10:50:30 +01:00
Markus Rathgeb 26fc8a1716 sonos: comment unused variable as long as code is comment
The code that sets the logo member is comment, the variable is present
but not used.
If we do not need logo at all (there is also no need to write that
member if it is never read) there is no need to keep that field.

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-20 00:13:52 +01:00
Markus Rathgeb 279b735db0 sonos: handle every case in switch
I don't know why it has been decided to not add a default case to the
switch statement. But we should at least handle every value of the
enum(s).

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-20 00:10:51 +01:00
Markus Rathgeb dd3fcf9c65 sonos: fix potential null pointer access
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-20 00:05:04 +01:00
Markus Rathgeb cfd805d4e9 sonos: remove unused imports (+formatter)
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-20 00:03:10 +01:00
Markus Rathgeb 1c697160b0 wemo: drop usage of deprecated channel UID constructor
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-19 20:15:11 +01:00
Kai Kreuzer aafc979266 avoided deprecated ChannelUID constructor
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-03-18 20:36:04 -07:00
Markus Rathgeb 4a8b23e8b5 Channel#isLinked is deprecated, use BaseThingHandler#isLinked
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-19 02:05:13 +01:00