Pasindu
|
ee9c3ad5ef
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-30 12:16:03 +05:30 |
|
WSO2 Builder
|
e7af2ee4a4
|
[WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare for next development iteration
|
2017-05-30 11:07:50 +05:30 |
|
WSO2 Builder
|
dff15c5978
|
[WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare release v3.0.37
|
2017-05-30 11:07:36 +05:30 |
|
Pasindu
|
2682317930
|
Resolving Merging faults
|
2017-05-22 15:19:25 +05:30 |
|
Pasindu
|
59b6bce4b4
|
Resolving previous merging faults
|
2017-05-22 15:16:20 +05:30 |
|
Pasindu
|
5bb1662dfb
|
Resolve merging errors happened previously
|
2017-05-22 14:53:47 +05:30 |
|
Pasindu
|
92821c36e0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-22 07:46:27 +05:30 |
|
charitha
|
5cf096c7aa
|
Add windows scripts for virtual firealarm agent
|
2017-05-19 14:11:17 +05:30 |
|
Pasindu
|
444dbdf865
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-19 07:01:20 +05:30 |
|
WSO2 Builder
|
84e12c7cca
|
[WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare for next development iteration
|
2017-05-17 16:51:16 +05:30 |
|
WSO2 Builder
|
400da8f05e
|
[WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare release v3.0.36
|
2017-05-17 16:51:01 +05:30 |
|
Pasindu
|
1d832234df
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-17 10:10:16 +05:30 |
|
WSO2 Builder
|
9fcee2917f
|
[WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare for next development iteration
|
2017-05-16 14:24:47 +05:30 |
|
WSO2 Builder
|
c0c002a34b
|
[WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare release v3.0.35
|
2017-05-16 14:24:33 +05:30 |
|
Pasindu
|
1c358dac44
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-16 08:26:46 +05:30 |
|
Hasunie
|
3727bcb1e1
|
Merge pull request #660 from sameeragunarathne/master
fix multi tenant issues in windows device enrollment
|
2017-05-15 17:06:37 +05:30 |
|
Pasindu
|
913cc567fe
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-15 10:09:47 +05:30 |
|
Pasindu
|
b8a0fd04e7
|
merge fix
|
2017-05-15 09:51:45 +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 |
|
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
|
2f56874e83
|
few fixes on analytics flow after testing the end to end flow
|
2017-05-09 16:10:25 +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
|
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 |
|
ayyoob
|
cfab3b1b81
|
removed default p2.inf
|
2017-05-08 17:23:17 +05:30 |
|
ayyoob
|
4423020ebb
|
updated version for new features
|
2017-05-08 17:14:22 +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 |
|
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 |
|
ayyoob
|
edd3d6efee
|
removed duplicate line
|
2017-05-05 09:09:43 +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
|
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 |
|
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 |
|