Commit Graph

2117 Commits

Author SHA1 Message Date
Madhawa Perera
442afdaf8a Merge pull request #1077 from rasika/master
Fixing https://github.com/wso2/product-iots/issues/1066: moving scrip…
2017-06-29 11:58:11 +05:30
Rasika Perera
7c8813df2a Updating cdmf and cdmf-plugins versions 2017-06-29 07:55:42 +05:30
Rasika Perera
4c613e5682 Fixing https://github.com/wso2/product-iots/issues/1066: moving scripts dir into wso2/analytics 2017-06-29 07:49:48 +05:30
Geeth
d6df453472 Merge pull request #1070 from milanperera/iot-master
Removed DCR feature
2017-06-28 18:06:30 +05:30
Madhawa Perera
c6086de22c Merge pull request #1071 from thisaripatabendi/master
Adding coffee level graph to realtime-analytics view
2017-06-28 13:38:32 +05:30
thisaripatabendi
a5154cf269 Adding coffee level graph to realtime-analytics view 2017-06-28 12:39:52 +05:30
Milan Perera
82d1cf41e0 Removed DCR life cycle listener 2017-06-28 12:18:18 +05:30
thisaripatabendi
9b26660971 Adding coffee level graph to realtime-analytics view 2017-06-28 11:41:35 +05:30
Milan Perera
3a394ae869 Removed DCR feature 2017-06-28 11:20:34 +05:30
Geeth
d6392f49dd Merge pull request #1068 from sinthuja/origin-master
Fixing https://github.com/wso2/product-iots/issues/1067
2017-06-28 09:20:13 +05:30
sinthuja
77cd418e2f Fixing the build failure in the connected cup. 2017-06-27 18:24:57 +05:30
WSO2 Builder
76d8fc62a2 [maven-release-plugin]prepare for next development iteration 2017-06-23 23:06:50 +05:30
WSO2 Builder
cbf7dd8dce [maven-release-plugin]prepare release v3.1.0-alpha 2017-06-23 23:06:36 +05:30
Geeth
6bc0c7e03b Merge pull request #1056 from madhawap/master
Skipping java docs
2017-06-23 22:21:47 +05:30
madhawap
f01001fb96 Skipping java docs 2017-06-23 22:20:56 +05:30
Geeth
008bdca8fc Merge pull request #1055 from madhawap/master
version changes
2017-06-23 21:59:03 +05:30
madhawap
2d0104ee10 version changes 2017-06-23 21:58:05 +05:30
Geeth
ab4c0d7cce Merge pull request #1054 from madhawap/master
version changes
2017-06-23 21:39:56 +05:30
madhawap
8b868688ec version changes 2017-06-23 21:38:31 +05:30
Geeth
83729cec7a Merge pull request #1053 from madhawap/master
Adding version changes
2017-06-23 21:04:18 +05:30
madhawap
33f65cb49b Adding version changes 2017-06-23 21:01:03 +05:30
Madhawa Perera
32e0454a34 Merge pull request #1052 from sinthuja/origin-master
Fixing the mobile qsg issues and target/source jdk version.
2017-06-23 18:20:12 +05:30
sinthuja
c69f74ad2b Updating the source/target JDK versions to 1.8. 2017-06-23 18:13:44 +05:30
sinthuja
38781c2c91 Merge pull request #1050 from sinthuja/origin-master
Resolving conflicts of https://github.com/wso2/product-iots/pull/1049.
2017-06-23 17:26:24 +05:30
sinthuja
ff6642b5ba Adding the executable permission for the mobile qsg script. 2017-06-23 17:23:49 +05:30
sinthuja
f9fb51b671 Updating the qsg script out dated readme. 2017-06-23 17:21:13 +05:30
sinthuja
2803ba29e7 Merge branch 'pr1049' into origin-master
# Conflicts:
#	modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
2017-06-23 17:10:14 +05:30
thisaripatabendi
dd5f4861eb Fixing connected-cup issues. 2017-06-23 16:49:20 +05:30
sinthuja
9bdd2d766f Merge pull request #1048 from dunithd/master
Applying new UX for connected cup device details page
2017-06-23 16:48:35 +05:30
thisaripatabendi
67a6eb0db4 Fixing connected-cup issues. 2017-06-23 16:34:56 +05:30
Ruwan
93f5ed77f0 Merge pull request #1045 from ayyoob/devicetype-3.1.0
temporary fix for api verfication issue in integration test
2017-06-23 15:56:24 +05:30
Megala Uthayakumar
233ddbda99 Merge pull request #1047 from sinthuja/test-merge
Refactoring the connected cup sample with separate features for backend, api, ui.
2017-06-23 15:52:43 +05:30
sinthuja
0b85c80701 Updating the license headers. 2017-06-23 15:51:30 +05:30
sinthuja
cbd4507648 Adding missing connected cup version in the root pom.xml. 2017-06-23 15:30:53 +05:30
dunithd
ee680cfec8 Applying new UX for connected cup device details page 2017-06-23 15:27:23 +05:30
sinthuja
8afe1d5245 Cleaning up the files pom files. 2017-06-23 15:25:45 +05:30
sinthuja
cfe3e59ce3 Removing the unused file device-type, and removing datasource configs from UI feature. 2017-06-23 15:14:04 +05:30
sinthuja
2aad4c7bd4 Updating the coffeeking version as the bundle version. 2017-06-23 15:01:54 +05:30
sinthuja
1773b64d20 Reverting the change done for device type. 2017-06-23 14:08:19 +05:30
ayyoob
8cd1f815e4 temporary fix for api verfication issue 2017-06-23 13:50:25 +05:30
sinthuja
9d866509bd Merge branch 'wso2-master' into test-merge 2017-06-23 13:19:32 +05:30
sinthuja
5aa641183b Fixing some path issue in device type deployables. 2017-06-23 13:09:37 +05:30
sinthuja
c6876695fc Seperating the connected cup feature into backend, api, ui features as recommended feature structure. 2017-06-23 12:54:23 +05:30
sinthuja
5483532882 Fixing some version problem in the connected cup sample. 2017-06-23 11:47:39 +05:30
sinthuja
a8b4699cb9 Fixing intermittent NPE in mobile QSG 2017-06-23 11:05:32 +05:30
Ayyoob Hamza
817687af31 Merge pull request #1040 from wso2/rasika-patch-1
Update cdmf-plugins version
2017-06-23 09:26:01 +05:30
Rasika Perera
597e431712 Update pom.xml 2017-06-23 09:24:52 +05:30
Rasika Perera
7c97c58f8d Merge pull request #1039 from ayyoob/devicetype-3.1.0
moved to latest kernel, mb and added initial commit for migration script from 3.0.0. Added Device type api test case.
2017-06-23 09:21:28 +05:30
ayyoob
8c4f13ee48 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-23 04:12:26 +05:30
ayyoob
32c54e0ab6 adding client truststore key store - temporariy fix until kernel 4.4.17 is released 2017-06-23 04:07:25 +05:30