Commit Graph

6753 Commits

Author SHA1 Message Date
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
sinthuja
7ddf1483b8 Merge branch 'wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
2017-05-09 12:09:22 +05:30
sinthuja
5f773a51c7 Merge branch 'wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
2017-05-09 12:09:22 +05:30
madhawap
a2897012f9 Fix for disabling reboot and upgrade-firmware operations on UI
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled.
2017-05-09 12:03:08 +05:30
Pasindu
5f700c5b4a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-09 08:49:00 +05:30
Pasindu
60470d039a Creating runtime permission policy for android devices 2017-05-09 08:33:17 +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
sinthuja
19225bdc86 Merge branch 'wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
2017-05-08 18:10:17 +05:30
sinthuja
bb66da51e6 Fixing the warning and mismatch version in the pom.xml. 2017-05-08 18:08:47 +05:30
sinthuja
48bbf1153b Fixing the warning and mismatch version in the pom.xml. 2017-05-08 18:08:47 +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
ead6b80aa4 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration 2017-05-08 18:04:55 +05:30
WSO2 Builder
05377d4f17 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration 2017-05-08 18:04:55 +05:30
WSO2 Builder
ac3a87167b [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration 2017-05-08 18:04:55 +05:30
WSO2 Builder
3be64a651b [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
WSO2 Builder
f849d9cca1 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33 2017-05-08 18:04:39 +05:30
WSO2 Builder
f959452968 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33 2017-05-08 18:04:39 +05:30
WSO2 Builder
ea1349cd07 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33 2017-05-08 18:04:39 +05:30
WSO2 Builder
c7a5a27838 [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
466fc301b2 [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
22ab166a71 [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
2b19cd5a1b [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
b8b91ea1d2 [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
df7df6ffa6 [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
e0a389bace [maven-release-plugin] prepare release v3.0.32 2017-05-08 12:44:22 +05:30
WSO2 Builder
5abbadcc1a [maven-release-plugin] prepare release v3.0.32 2017-05-08 12:44:22 +05:30
WSO2 Builder
77d828fe4d [maven-release-plugin] prepare release v3.0.32 2017-05-08 12:44:22 +05:30
WSO2 Builder
aa4c8ee3e4 [maven-release-plugin] prepare release v3.0.32 2017-05-08 12:44:22 +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