Pasindu
ee9c3ad5ef
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
2017-05-30 12:16:03 +05:30
Pasindu
ea274ac2b3
change pom
2017-05-30 12:14:19 +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
f49ecb2539
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
...
Some changes in android plugin for runtime permission is included.
2017-05-30 10:15:21 +05:30
Ayyoob Hamza
4b40bf7ac7
Merge pull request #676 from madhawap/master
...
Fix for disabling reboot and upgrade-firmware operations on UI
2017-05-30 09:07:33 +05:30
madhawap
614d1c2606
upgrade the carbon.devicemgt.version
2017-05-29 19:13:51 +05:30
madhawap
af0ce14af1
Adding android agent apk after pasindujw's fixes
2017-05-29 18:58:25 +05:30
madhawap
a1a8ac3c71
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
2017-05-29 18:55:19 +05:30
Pasindu
4f4d783c37
Runtime permission policy per app changes
2017-05-24 12:03:48 +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
Amal Gunatilake
ac5d47b313
Merge pull request #681 from charithag/master
...
Add windows scripts for virtual firealarm agent
2017-05-19 14:18:49 +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
sinthuja
5663511348
Merge pull request #680 from Megala21/master
...
Fixing issues in virtual fire alarm
2017-05-17 16:15:24 +05:30
megala21
20f8708edb
Fixing issues in virtual fire alarm
2017-05-17 15:50:57 +05:30
Pasindu
1d832234df
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
2017-05-17 10:10:16 +05:30
Pasindu
7fa1b5eddd
Change devicemgt version
2017-05-17 10:09:14 +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
Ayyoob Hamza
dabb4897bb
Merge pull request #679 from Megala21/artifact
...
Fixing minor issue in android sense car file deployment
2017-05-15 09:28:17 +05:30
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
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
