Commit Graph

2866 Commits

Author SHA1 Message Date
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
sinthuja
a524a8dee5 Adding android sense ui feature. 2017-05-03 16:36:42 +05:30
sinthuja
33b77942fd Merge pull request #669 from ruwany/master
Adding a build profile for cloud
2017-05-03 16:35:18 +05:30
Ace
637b1d4e0a merging and including profile specific p2.inf files 2017-05-03 16:29:15 +05:30
Ace
34c9e1cd82 Adding a build profile for cloud 2017-05-03 16:26:14 +05:30
sinthuja
e989103b9b Merge pull request #661 from amalhub/master
Updating carbon.devicemgt.version
2017-05-03 15:40:20 +05:30
Amal Gunatilake
f5093774df Merge branch 'master' into master 2017-05-03 14:41:32 +05:30
Amal Gunatilake
738a6bfcd1 Updating carbon.devicemgt.version 2017-05-03 14:40:23 +05:30
WSO2 Builder
2db4069053 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
902d7e3cf2 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
Amal Gunatilake
ddc1e8bef4 Merge pull request #663 from janakamarasena/master
Add synapse configs to handle mutual ssl auth for android
2017-05-02 20:28:37 +05:30
Janak Amarasena
477ff6faee Changed CDM version 2017-05-02 17:30:58 +05:30
Geeth
5597d4370b Merge pull request #668 from warunalakshitha/master
Push notification scheduler Task
2017-05-02 17:04:22 +05:30
Janak Amarasena
67510b007f Removed unwanted handlers 2017-05-02 17:02:53 +05:30
warunalakshitha
543e68771e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-01 20:53:24 +05:30
WSO2 Builder
e2becd3169 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
85c36c0ca8 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
Ayyoob Hamza
b71699dd13 Merge pull request #664 from rasika/master
Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue
2017-05-01 19:40:08 +05:30