Kai Kreuzer
|
d4c09c607a
|
Merge branch 'Bug428193' of https://github.com/OLibutzki/smarthome into OLibutzki-Bug428193
Signed-off-by: Kai Kreuzer <kai@openhab.org>
Conflicts:
bundles/model/org.eclipse.smarthome.model.script.tests/META-INF/MANIFEST.MF
targetplatform/smarthome.target
|
2014-06-10 22:11:01 +02:00 |
Kai Kreuzer
|
46231d9f16
|
#434003 - Modularize main configuration file - fixed designer integration
Signed-off-by: Kai Kreuzer <kai@openhab.org>
|
2014-06-09 22:45:43 +02:00 |
Oliver Libutzki
|
930e8d7aba
|
[Bug 428193] Improved Guice injection
fixed some interpreter bugs
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
|
2014-05-15 18:06:59 +02:00 |
Kai Kreuzer
|
c2cd19801f
|
added fan fam fam icons (CQ 7813)
|
2014-03-17 14:31:52 -07:00 |
Kai Kreuzer
|
8c40d9afd8
|
removed UTF-8 char from license header
|
2014-03-07 18:06:35 +01:00 |
Oliver Libutzki
|
adecbba086
|
Bug 425456 - Add implicit imports to rule models
Addinionally added some imported pakcages to the plugin project's
manifest
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
|
2014-03-06 14:19:00 +01:00 |
Oliver Libutzki
|
ccd71fb3f0
|
src/main/java/*.xtend is compiled to correct target by Maven
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
|
2014-03-04 16:25:48 +01:00 |
Oliver Libutzki
|
83941de2c5
|
[428195] - Designer lacks in Java integration
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
|
2014-03-03 14:49:58 +01:00 |
Kai Kreuzer
|
f0fec42b00
|
fixed build properties to make the build succeed
|
2014-03-03 10:59:08 +01:00 |
Oliver Libutzki
|
7d2236732e
|
Updated .classpath to Java 1.7 / Extending RulesJvmModelInferrer to use items as fields
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
|
2014-03-03 10:51:06 +01:00 |
Oliver Libutzki
|
07cc7c30c1
|
Xtext 2.5 update - Initial
Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
|
2014-03-03 10:49:57 +01:00 |
Kai Kreuzer
|
108712ea46
|
initial contribution - CQ 7807
|
2014-01-10 15:53:28 +01:00 |