8abdee84f7
set JavaSE-1.7 for the bundles
...
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-19 01:27:14 +01:00
f4e66a5986
Merge pull request #1209 from kaikreuzer/depr
...
fixed deprecation annotations
2016-03-18 21:53:24 +01:00
fa1bc8d5d8
Merge pull request #1204 from sjka/fixTransformServiceTest
...
Making MapTransformationServiceTest more robust
2016-03-18 21:24:03 +01:00
53d40bbfcf
Merge pull request #1216 from maggu2810/esh-not-oh
...
Eclipse SmartHome differs from openHAB
2016-03-18 13:21:33 -07:00
29cb997f6e
Merge pull request #1203 from resetnow/basicui-sitemaps-colors
...
BasicUI: add sitemap list, fix colors
2016-03-18 21:16:55 +01:00
5de60b229d
Eclipse SmartHome differs from openHAB
...
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-18 21:13:44 +01:00
2d35afed0b
Fix #1211
...
Signed-off-by: Ana Dimova <a.dimova@prosyst.bg>
2016-03-18 12:25:24 +02:00
0043c678c8
fixed deprecation annotations
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-03-17 16:43:00 -07:00
ede67acd1f
Merge pull request #1205 from qivicon/upnp-service-subscription-fix
...
Made sure resubscribe is only done when subscription is ended with Ca…
2016-03-17 16:19:05 -07:00
df9e83dc5b
Made sure resubscribe is only done when subscription is ended with CancelReasons EXPIRED or RENEW_FAILED as it does not make sense to SUBSCRIBE in the other cases.
...
Signed-off-by: IVAN GEORGIEV ILIEV <ivan.iliev@musala.com>
2016-03-17 12:21:52 +01:00
8e1fb9edca
Making MapTransformationServiceTest more robust
...
As it seems, the events take some time to arrive on some OS/file systems...
(see #1131 )
Therefore, in this change
* The test waits up to 10 seconds in order to verify the assertions
* The test first copies the property files to another place, so no versioned files get touched
Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
2016-03-17 11:10:28 +01:00
6fc4512158
BasicUI: add sitemap list, fix colors
...
This is a combination of 2 commits.
BasicUI: show a list of sitemaps when default sitemap is not found
BasicUI: add color support for text widget, fixes #1135
Signed-off-by: Vlad Ivanov <vlad-mbx@ya.ru>
2016-03-16 23:57:16 +03:00
b2d9035aa8
introduced PortableBase64 in order to be able to work on CP2
...
Also-by: Jochen Hiller <j.hiller@telekom.de>
Signed-off-by: Miki Jankov <miki.jankov87@gmail.com>
2016-03-16 15:18:52 +01:00
3362a5d22e
Fix #1191
...
Signed-off-by: Ana Dimova <a.dimova@prosyst.bg>
2016-03-16 12:14:47 +02:00
7440ad715c
Merge pull request #1199 from kaikreuzer/joda
...
fixed outdated reference to joda lib
2016-03-15 22:42:59 +01:00
00a6a8c356
fixed outdated reference to joda lib
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-03-15 22:41:27 +01:00
c0a12ece9f
Merge pull request #1198 from qivicon/config-ui
...
Parameter config UI modification
2016-03-15 22:04:53 +01:00
481ce66211
Parameter config UI modification
...
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-15 18:38:49 +01:00
b8a5720016
Merge pull request #1197 from qivicon/channels-bug
...
Channels bug fix
2016-03-15 17:57:08 +01:00
8c611a11d1
channels bug fix
...
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-15 17:43:23 +01:00
ccf2c4cb40
Merge pull request #1193 from qivicon/channels-missing
...
Support channels without channel types
2016-03-15 17:15:20 +01:00
896764896b
Merge pull request #1188 from qivicon/service-default
...
Set service config default values
2016-03-15 16:41:33 +01:00
554dc13c80
Merge pull request #1128 from kaikreuzer/joda
...
updated jodatime to 2.9.2
2016-03-15 16:40:09 +01:00
94f966aa0a
Merge pull request #1195 from qivicon/paperui-lang
...
Fixed language selection
2016-03-15 16:12:56 +01:00
87551571d6
Fixed language selection
...
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-15 16:03:08 +01:00
9dedcfcfb3
Support channels without channel types
...
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-15 15:26:13 +01:00
be1cdd15b7
Merge pull request #25 from maggu2810/service-default
...
fix HTML format
2016-03-15 08:46:19 +01:00
29066ce4b8
fix HTML format
...
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-15 07:38:11 +01:00
20f5e6809e
Merge pull request #1189 from maggu2810/non-oh
...
Eclipse SmartHome does not depend on openHAB
2016-03-15 06:49:48 +01:00
51d924326f
Eclipse SmartHome does not depend on openHAB
...
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-15 00:11:44 +01:00
a92dabe19f
Ser services default values
...
Signed-off-by: Aoun Bukhari <bukhari@itemis.de>
2016-03-14 22:01:28 +01:00
18feacddd4
Merge pull request #1187 from sjka/inboxCompatible
...
stay compatible with old inbox result entries
2016-03-14 16:04:43 +01:00
df0d5eec15
Merge pull request #1181 from kaikreuzer/channeluid
...
Changed creation of channels to not require a thing type
2016-03-14 16:04:00 +01:00
9862f90d44
stay compatible with old inbox result entries
...
...which were created before #768
Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
2016-03-14 13:59:34 +01:00
946a2ce571
Merge pull request #1185 from maggu2810/cleanup
...
remove obsolete org.eclipse.smarthome.io.rest.item
2016-03-14 10:38:11 +01:00
5c898332d6
remove obsolete org.eclipse.smarthome.io.rest.item
...
The content org.eclipse.smarthome.io.rest.item has already been migrated
to org.eclipse.smarthome.io.rest.core
Related to commit: 4c5e891c37
2016-03-14 10:00:10 +01:00
5a979443bc
Merge pull request #1184 from maggu2810/log
...
improve error logging
2016-03-14 09:54:27 +01:00
1b1c52dfed
improve error logging
...
Related to: https://github.com/eclipse/smarthome/pull/1172
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-14 09:48:56 +01:00
4799c095c9
Merge pull request #1172 from cdjackson/thing_factory
...
Fix NPE in thing factory
2016-03-14 09:27:38 +01:00
c14f5fbba1
Merge pull request #1183 from cdjackson/thing_config_provider
...
Update ThingConfigDescriptionProvider to properly use thing type
2016-03-14 00:28:52 +01:00
7a00d1274b
Update ThingConfigDescriptionProvider to properly use thing type
...
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
2016-03-13 23:26:41 +00:00
d99ad13ca8
Changed creation of channels to not require a thing type
...
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-03-13 21:59:22 +01:00
8ccd4074da
Merge pull request #1180 from maggu2810/paperui-format
...
Paper UI: apply the formatter to all js and html files
2016-03-13 21:37:44 +01:00
dd611ceddb
Fix NPE in thing factory
...
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
2016-03-13 20:16:25 +00:00
ea512ed468
Paper UI: apply the formatter to all js and html files
...
The about.html has not been reformatted, as it is no part of the web
stuff.
Related to: https://github.com/eclipse/smarthome/pull/1161
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-13 20:29:57 +01:00
b52539b15e
Merge pull request #1178 from maggu2810/ide-setup
...
remove unneeded m2e connectors
2016-03-13 20:28:29 +01:00
4ee5a0f71c
Merge pull request #1179 from maggu2810/group-cleanup
...
Paper UI: app.js refers removed groups configuration
2016-03-13 20:18:23 +01:00
0bd6615f13
Paper UI: app.js refers removed groups configuration
...
Related to: https://github.com/eclipse/smarthome/pull/1019#issuecomment-195765624
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-13 20:12:53 +01:00
541dfe911d
Revert "m2e: add connectors"
...
This reverts commit 26c5842ee36500096674https://github.com/eclipse/smarthome/issues/1176
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-13 19:55:32 +01:00
6500096674
console karaf: remove maven, xtext, groovy nature
...
Xtext and Groovy is not used by this bundle at all.
The Maven nature is not necessary at all. If you want to do some
development for this bundle it is simpler to add the respective Karaf
dependency bundle to your Eclipse IDE. The Maven Nature triggers the
Eclipse IDE to require some lifecycle plugins, that are not needed at
all.
As long as Eclipse SmartHome uses Eclipse PlugIns and Tycho, there is no
need to add all the m2e support plugins to the Eclipse IDE.
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2016-03-13 19:48:40 +01:00
Markus Rathgeb
Kai Kreuzer
Ana Dimova
IVAN GEORGIEV ILIEV
Simon Kaufmann
Vlad Ivanov
Miki Jankov
Aoun Bukhari
Chris Jackson