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 |
|
ayyoob
|
ef274b0b3e
|
fixed formatting issue
|
2017-05-30 00:38:48 +05:30 |
|
ayyoob
|
94d626ca3c
|
changed event definition
|
2017-05-30 00:31:04 +05:30 |
|
ayyoob
|
aaeac03cfb
|
fixed issues in mqtt input adapter and thrift adapter after testing with multitenancy
|
2017-05-30 00:04:49 +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 |
|
ayyoob
|
1b4de09d7b
|
added missing imports
|
2017-05-29 12:11:31 +05:30 |
|
Vishanth
|
8dcb7c68c9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-29 11:15:39 +05:30 |
|
ayyoob
|
b32bf11c91
|
fixed multi tenant issues after testing thrift endpoint with multitenant
|
2017-05-29 01:01:26 +05:30 |
|
Pasindu
|
4f4d783c37
|
Runtime permission policy per app changes
|
2017-05-24 12:03:48 +05:30 |
|
GDLMadushanka
|
4ebb5e3a28
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-24 10:51:46 +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 |
|
ayyoob
|
e4247a98ff
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
|
2017-05-19 14:50:26 +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 |
|
ayyoob
|
92ee01d597
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
|
2017-05-15 18:16:08 +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 |
|
GDLMadushanka
|
740d144112
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-15 10:11:27 +05:30 |
|
GDLMadushanka
|
d25b4d84ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-05-15 10:11:00 +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 |
|
GDLMadushanka
|
6dd45ae7c4
|
test
|
2017-05-12 09:02:08 +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 |
|