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
|
8 years ago |
Ayyoob Hamza
|
2806a7a31c
|
Merge pull request #673 from amalhub/master
Disabling maven-source-plugin
|
8 years ago |
Amal Gunatilake
|
9c019992eb
|
Disabling maven-source-plugin
Disabling maven-source-plugin to disable Jenkins release fail due to the large unnecessary source file generation.
|
8 years ago |
sinthuja
|
778bbe3cc6
|
Fixing the issue in the resource paths.
|
8 years ago |
sinthuja
|
5195e4144c
|
Removing unwanted p2.inf.
|
8 years ago |
sinthuja
|
6b3992261a
|
Fixing the issues in the android sense device type.
|
8 years ago |
Amal Gunatilake
|
49ebfc0cf5
|
Merge pull request #671 from ayyoob/new-master
Added missing fixes that was done for multi tenancy in cloud branch
|
8 years ago |
ayyoob
|
edd3d6efee
|
removed duplicate line
|
8 years ago |
ayyoob
|
5a25f15d08
|
removing the fix did in cloud setup - jasinthas
|
8 years ago |
ayyoob
|
359184429e
|
Added missing fixes that was done for multi tenancy in cloud branch
|
8 years ago |
sinthuja
|
bbc8c8efce
|
Fixing the issue in consuming the events for carbon.super from mqtt.
|
8 years ago |
sinthuja
|
ff6b1e32b2
|
Fixing the virtual fire alarm device types.
|
8 years ago |
sinthuja
|
485ddfc53d
|
Fixing the ardino and raspberry device types.
|
8 years ago |
sinthuja
|
1cfef0cd9b
|
Adding cloud p2.inf for the analytics features as well.
|
8 years ago |
sinthuja
|
d720fa1db6
|
Removing the obsolete android sense aggregated feature.
|
8 years ago |
sinthuja
|
ef84791510
|
Finishing the android sense feature into sub features UI/BE/Analytics.
|
8 years ago |
Ayyoob Hamza
|
d50b436ed7
|
Merge pull request #670 from wso2/revert-667-git_issue_666
Revert "Fixing cannot install androidsense device type into current pack"
|
8 years ago |
Rasika Perera
|
1df315cb29
|
Revert "Fixing cannot install androidsense device type into current pack"
|
8 years ago |
Amal Gunatilake
|
ba91b8961b
|
Merge pull request #667 from rasika/git_issue_666
Fixing cannot install androidsense device type into current pack
|
8 years ago |
sinthuja
|
ff9efe1c76
|
Merge branch 'wso2-master'
|
8 years ago |
sinthuja
|
a524a8dee5
|
Adding android sense ui feature.
|
8 years ago |
sinthuja
|
33b77942fd
|
Merge pull request #669 from ruwany/master
Adding a build profile for cloud
|
8 years ago |
Ace
|
637b1d4e0a
|
merging and including profile specific p2.inf files
|
8 years ago |
Ace
|
34c9e1cd82
|
Adding a build profile for cloud
|
8 years ago |
sinthuja
|
e989103b9b
|
Merge pull request #661 from amalhub/master
Updating carbon.devicemgt.version
|
8 years ago |
Amal Gunatilake
|
f5093774df
|
Merge branch 'master' into master
|
8 years ago |
Amal Gunatilake
|
738a6bfcd1
|
Updating carbon.devicemgt.version
|
8 years ago |
WSO2 Builder
|
2db4069053
|
[WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
902d7e3cf2
|
[WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31
|
8 years ago |
Amal Gunatilake
|
ddc1e8bef4
|
Merge pull request #663 from janakamarasena/master
Add synapse configs to handle mutual ssl auth for android
|
8 years ago |
Janak Amarasena
|
477ff6faee
|
Changed CDM version
|
8 years ago |
Geeth
|
5597d4370b
|
Merge pull request #668 from warunalakshitha/master
Push notification scheduler Task
|
8 years ago |
Janak Amarasena
|
67510b007f
|
Removed unwanted handlers
|
8 years ago |
warunalakshitha
|
543e68771e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
WSO2 Builder
|
e2becd3169
|
[WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
85c36c0ca8
|
[WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30
|
8 years ago |
Ayyoob Hamza
|
b71699dd13
|
Merge pull request #664 from rasika/master
Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue
|
8 years ago |
Rasika Perera
|
9d00038199
|
#665 : Added some improvements to the fix
|
8 years ago |
Rasika Perera
|
f7dbc156b3
|
#665 : Added some changes to reuse PropertyUtils.replaceTenantDomainProperty()
|
8 years ago |
Rasika Perera
|
f3a817939d
|
#666 : Fixing cannot install androidsense device type into current pack
|
8 years ago |
Rasika Perera
|
be99ca571b
|
#665 : Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue
|
8 years ago |
warunalakshitha
|
568538cc13
|
add comments for performance configs
|
8 years ago |
Janak Amarasena
|
7db99295f5
|
Add synapse configs to handle mutual ssl auth for android
|
8 years ago |
WSO2 Builder
|
c3fb32f3bc
|
[WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
1b0047c39f
|
[WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29
|
8 years ago |
Ayyoob Hamza
|
5397fc3563
|
Merge pull request #662 from Megala21/master
Adding security filters for secured-websocket war
|
8 years ago |
WSO2 Builder
|
99e587eb78
|
[WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
9b8929a8cd
|
[WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28
|
8 years ago |
Kamidu Sachith Punchihewa
|
6759a99ae9
|
Merge pull request #657 from rasika/master
Fixing Android policy view and policy edit doesn't honor isCloud enabled param
|
8 years ago |
megala21
|
d1ee78eaed
|
Adding security filters for websocket web.xml
|
8 years ago |