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
|
8 years ago |
thisaripatabendi
|
dd5f4861eb
|
Fixing connected-cup issues.
|
8 years ago |
|
sinthuja
|
9bdd2d766f
|
Merge pull request #1048 from dunithd/master
Applying new UX for connected cup device details page
|
8 years ago |
|
thisaripatabendi
|
67a6eb0db4
|
Fixing connected-cup issues.
|
8 years ago |
Ruwan
|
93f5ed77f0
|
Merge pull request #1045 from ayyoob/devicetype-3.1.0
temporary fix for api verfication issue in integration test
|
8 years ago |
Megala Uthayakumar
|
233ddbda99
|
Merge pull request #1047 from sinthuja/test-merge
Refactoring the connected cup sample with separate features for backend, api, ui.
|
8 years ago |
|
sinthuja
|
0b85c80701
|
Updating the license headers.
|
8 years ago |
|
sinthuja
|
cbd4507648
|
Adding missing connected cup version in the root pom.xml.
|
8 years ago |
dunithd
|
ee680cfec8
|
Applying new UX for connected cup device details page
|
8 years ago |
|
sinthuja
|
8afe1d5245
|
Cleaning up the files pom files.
|
8 years ago |
|
sinthuja
|
cfe3e59ce3
|
Removing the unused file device-type, and removing datasource configs from UI feature.
|
8 years ago |
|
sinthuja
|
2aad4c7bd4
|
Updating the coffeeking version as the bundle version.
|
8 years ago |
|
sinthuja
|
1773b64d20
|
Reverting the change done for device type.
|
8 years ago |
ayyoob
|
8cd1f815e4
|
temporary fix for api verfication issue
|
8 years ago |
|
sinthuja
|
9d866509bd
|
Merge branch 'wso2-master' into test-merge
|
8 years ago |
|
sinthuja
|
5aa641183b
|
Fixing some path issue in device type deployables.
|
8 years ago |
|
sinthuja
|
c6876695fc
|
Seperating the connected cup feature into backend, api, ui features as recommended feature structure.
|
8 years ago |
|
sinthuja
|
5483532882
|
Fixing some version problem in the connected cup sample.
|
8 years ago |
|
sinthuja
|
a8b4699cb9
|
Fixing intermittent NPE in mobile QSG
|
8 years ago |
|
Ayyoob Hamza
|
817687af31
|
Merge pull request #1040 from wso2/rasika-patch-1
Update cdmf-plugins version
|
8 years ago |
Rasika Perera
|
597e431712
|
Update pom.xml
|
8 years ago |
|
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.
|
8 years ago |
|
ayyoob
|
8c4f13ee48
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
8 years ago |
|
ayyoob
|
32c54e0ab6
|
adding client truststore key store - temporariy fix until kernel 4.4.17 is released
|
8 years ago |
Geeth
|
63f952386e
|
Merge pull request #1038 from sinthuja/test-merge
Fixing the repo versions and merging the plugins dir with samples dir.
|
8 years ago |
|
sinthuja
|
c04b8e7872
|
Fixing the old references of the plugins-deployer, and owsap log in the integration tests.
|
8 years ago |
|
sinthuja
|
099ce78ea3
|
Adding missing http push notification extension.
|
8 years ago |
|
sinthuja
|
eb473cb7ea
|
Fixing the integration tests with modified plugin-deployer.xml name
|
8 years ago |
|
sinthuja
|
778c890616
|
Updating the snapshot versions to released versions.
|
8 years ago |
|
ayyoob
|
5969d413ac
|
moved to released version
|
8 years ago |
|
sinthuja
|
b363714446
|
fixing the issue in creating the connected cup instance.
|
8 years ago |
|
sinthuja
|
602e012e2e
|
committing the intermediate changes.
|
8 years ago |
|
sinthuja
|
3e89a7564f
|
Merge branch 'wso2-master' into test-merge
# Conflicts:
# pom.xml
|
8 years ago |
|
sinthuja
|
93f8acebb6
|
Updating the repo versions.
|
8 years ago |
|
Geeth
|
911d001aa6
|
Merge pull request #1034 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/776.
|
8 years ago |
|
sinthuja
|
56cbef3f35
|
Fixing https://github.com/wso2/product-iots/issues/776.
|
8 years ago |
|
ayyoob
|
cc94c0b29a
|
few test case fixes
|
8 years ago |
|
Geeth
|
7927d4c533
|
Merge pull request #1031 from harshanL/master
Fixed product-iots#458
|
8 years ago |
Harshan Liyanage
|
c240fb9a71
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
8 years ago |
|
Harshan Liyanage
|
0a7e33961a
|
Fixed sample-deployer issues which resolves wso2/product-iots#458
|
8 years ago |
|
Rasika Perera
|
a5513f5500
|
Merge pull request #1020 from rasika/master
Adding geo fencing
|
8 years ago |
Rasika Perera
|
d48b7d4939
|
Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied
|
8 years ago |
|
ayyoob
|
ac0c1ff186
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
8 years ago |
|
ayyoob
|
bdb6e9d55d
|
updated versions
|
8 years ago |
|
ayyoob
|
6d941a6e72
|
few fixes on test case
|
8 years ago |
|
Geeth
|
003b3d904a
|
Merge pull request #1028 from sinthuja/test-merge
Updating the cipher tool version.
|
8 years ago |
|
sinthuja
|
ade2a65f68
|
Updating the cipher tool version.
|
8 years ago |
|
ayyoob
|
76ddf4fe57
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
8 years ago |
|
ayyoob
|
5f80490332
|
added device type test case
|
8 years ago |
|
Rasika Perera
|
c2b573b32c
|
Adding geo fencing
|
8 years ago |
