Commit Graph

2832 Commits

Author SHA1 Message Date
megala21
0ed2b1c71b Fixing minor issue in android sense car file deployment 2017-05-15 09:27:00 +05:30
Milan Perera
3e122e96ea Merge pull request #678 from Kamidu/master
Changing the device notification msg
2017-05-12 07:57:09 +05:30
kamidu
103b795a86 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-11 21:36:52 +05:30
kamidu
0c1ff01697 chaning the notification msg 2017-05-11 21:36:40 +05:30
WSO2 Builder
2242a1169b [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare for next development iteration 2017-05-11 13:04:58 +05:30
WSO2 Builder
87bccbdf1c [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare release v3.0.34 2017-05-11 13:04:42 +05:30
Rasika Perera
057f6dffa8 Merge pull request #677 from ayyoob/new-master
fixed issues related to multi tenancy and feature definition for reference device types & added global configuration for mqtt adapter
2017-05-11 08:52:48 +05:30
ayyoob
0117db8d9f fixed issues related to analytics feature installation to DAS-3.1.0 2017-05-10 23:10:44 +05:30
ayyoob
6a1beb8ead fixed issues related to multi tenant analytics flow and operation flow for reference device types 2017-05-10 13:51:04 +05:30
ayyoob
654bb84c6d handle disconnection scenario for multi tenant mqtt receiver 2017-05-09 19:21:40 +05:30
ayyoob
f3a729204e fixed issue when default value is set for qos 2017-05-09 18:11:21 +05:30
ayyoob
01edaeeab4 changed log from printing stack trace to meaning logs stating waiting for either broker or key manager 2017-05-09 16:11:50 +05:30
ayyoob
39097abcec set default value for mqtt input adapter 2017-05-09 16:11:09 +05:30
ayyoob
2f56874e83 few fixes on analytics flow after testing the end to end flow 2017-05-09 16:10:25 +05:30
ayyoob
33f73eb2b3 merged with origin 2017-05-09 01:00:31 +05:30
ayyoob
728a8f4953 removed unused files and refactored few device type profile specific from the new device type feature structure, 2017-05-09 00:58:11 +05:30
ayyoob
0abbf55714 moved default input and output configurations to global properties 2017-05-09 00:57:14 +05:30
ayyoob
06d646c87a moved artifact deployment to the platform configuration 2017-05-09 00:56:21 +05:30
WSO2 Builder
f0a70d7f27 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration 2017-05-08 18:04:55 +05:30
WSO2 Builder
24460ebde1 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33 2017-05-08 18:04:39 +05:30
Madawa Soysa
a0eb78cd88 Merge pull request #675 from ayyoob/new-master
updated version for new features
2017-05-08 17:51:00 +05:30
ayyoob
cfab3b1b81 removed default p2.inf 2017-05-08 17:23:17 +05:30
ayyoob
b67fd7255f Merge branch 'new-master' of https://github.com/ayyoob/carbon-device-mgt-plugins into new-master 2017-05-08 17:22:18 +05:30
ayyoob
0d5f75de80 updated version for new features 2017-05-08 17:21:40 +05:30
ayyoob
4423020ebb updated version for new features 2017-05-08 17:14:22 +05:30
Ayyoob Hamza
24c2ae7ac9 Merge pull request #674 from sinthuja/master
Splitting the device type features into sub features.
2017-05-08 14:36:47 +05:30
sinthuja
37a15e927d Merge branch 'wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml
2017-05-08 14:28:07 +05:30
WSO2 Builder
df7df6ffa6 [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
3cdec9843a [maven-release-plugin] prepare release v3.0.32 2017-05-08 12:44:22 +05:30
sinthuja
7f5af71e4a Making the UI features to copy the capps to resources dir. 2017-05-07 23:09:23 +05:30
sinthuja
79bdfa642c Merge branch 'wso2-master'
# Conflicts:
#	components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
#	features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/src/main/resources/p2.inf
#	features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/p2.inf
#	features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/p2.inf
2017-05-07 23:02:06 +05:30
Ayyoob Hamza
2806a7a31c Merge pull request #673 from amalhub/master
Disabling maven-source-plugin
2017-05-07 21:14:10 +05:30
Amal Gunatilake
9c019992eb Disabling maven-source-plugin
Disabling maven-source-plugin to disable Jenkins release fail due to the large unnecessary source file generation.
2017-05-07 21:03:25 +05:30
sinthuja
778bbe3cc6 Fixing the issue in the resource paths. 2017-05-05 23:59:14 +05:30
sinthuja
5195e4144c Removing unwanted p2.inf. 2017-05-05 23:52:50 +05:30
sinthuja
6b3992261a Fixing the issues in the android sense device type. 2017-05-05 23:45:26 +05:30
Amal Gunatilake
49ebfc0cf5 Merge pull request #671 from ayyoob/new-master
Added missing fixes that was done for multi tenancy in cloud branch
2017-05-05 12:26:44 +05:30
ayyoob
edd3d6efee removed duplicate line 2017-05-05 09:09:43 +05:30
ayyoob
5a25f15d08 removing the fix did in cloud setup - jasinthas 2017-05-05 03:21:13 +05:30
ayyoob
359184429e Added missing fixes that was done for multi tenancy in cloud branch 2017-05-05 01:57:48 +05:30
sinthuja
bbc8c8efce Fixing the issue in consuming the events for carbon.super from mqtt. 2017-05-04 22:15:36 +05:30
sinthuja
ff6b1e32b2 Fixing the virtual fire alarm device types. 2017-05-04 21:41:34 +05:30
sinthuja
485ddfc53d Fixing the ardino and raspberry device types. 2017-05-04 16:30:14 +05:30
sinthuja
1cfef0cd9b Adding cloud p2.inf for the analytics features as well. 2017-05-04 15:33:56 +05:30
sinthuja
d720fa1db6 Removing the obsolete android sense aggregated feature. 2017-05-04 15:22:07 +05:30
sinthuja
ef84791510 Finishing the android sense feature into sub features UI/BE/Analytics. 2017-05-04 15:21:24 +05:30
Ayyoob Hamza
d50b436ed7 Merge pull request #670 from wso2/revert-667-git_issue_666
Revert "Fixing cannot install androidsense device type into current pack"
2017-05-03 21:31:05 +05:30
Rasika Perera
1df315cb29 Revert "Fixing cannot install androidsense device type into current pack" 2017-05-03 21:26:55 +05:30
Amal Gunatilake
ba91b8961b Merge pull request #667 from rasika/git_issue_666
Fixing cannot install androidsense device type into current pack
2017-05-03 20:52:14 +05:30
sinthuja
ff9efe1c76 Merge branch 'wso2-master' 2017-05-03 16:39:31 +05:30