Commit Graph

4257 Commits

Author SHA1 Message Date
WSO2 Builder
8b7e458592 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration 2017-04-04 18:08:44 +05:30
WSO2 Builder
6297993560 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39 2017-04-04 18:08:31 +05:30
Hasunie
fdbd0d65e8 Merge pull request #683 from lakshani/master
Fixed the issue in application restriction for iOS
2017-04-04 18:02:50 +05:30
lakshani
0f1b17a25e Fixed the issue in application restriction for iOS 2017-04-04 18:00:24 +05:30
megala21
5cd58d7454 Fixes https://github.com/wso2/product-iots/issues/335 2017-04-04 14:18:24 +05:30
warunalakshitha
7517c58799 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-03-31 17:57:32 +05:30
WSO2 Builder
802c83de39 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration 2017-03-29 23:16:15 +05:30
WSO2 Builder
98dda03784 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38 2017-03-29 23:16:04 +05:30
Ayyoob Hamza
57c66d4a9f Merge pull request #674 from sinthuja/master
Fixing the case where multiple tags were passed for searching the APIs.
2017-03-29 23:09:42 +05:30
sinthuja
18583af6b4 Fixing the case where multiple tags were passed for searching the APIs. 2017-03-29 23:07:18 +05:30
WSO2 Builder
f3e119cd78 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration 2017-03-28 12:48:31 +05:30
WSO2 Builder
a8f8a49a80 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37 2017-03-28 12:48:20 +05:30
Kamidu Sachith Punchihewa
e35c7ef661 Merge pull request #671 from harshanL/master
Fix for Advanced Search Issue #670
2017-03-28 12:42:23 +05:30
Harshan Liyanage
9e4d84dfb2 Fix for Advanced Search Issue #670 2017-03-28 12:37:28 +05:30
warunalakshitha
5831d277da Fixing https://github.com/wso2/carbon-device-mgt-plugins/issues/613 2017-03-27 11:48:30 +05:30
Rasika Perera
6a623f5657 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-03-27 10:03:15 +05:30
Harshan Liyanage
52455b4c40 Merge pull request #669 from lakshani/reenrollment-device
Fixed jira IOTS-438
2017-03-24 15:46:09 +05:30
lakshani
5c7cfda487 Fixed jira IOTS-438 2017-03-24 15:42:54 +05:30
WSO2 Builder
0e5895ec78 [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration 2017-03-24 12:06:23 +05:30
WSO2 Builder
d6080159cb [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36 2017-03-24 12:06:12 +05:30
Amal Gunatilake
56b5f82ef8 Merge pull request #667 from wso2/cloud-3.1.0
Cloud 3.1.0 changes
2017-03-24 12:00:12 +05:30
Amal Gunatilake
e9c2f3e72d Merge branch 'master' into cloud-3.1.0 2017-03-24 11:55:35 +05:30
WSO2 Builder
3f8f8b3ab9 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration 2017-03-23 18:59:18 +05:30
WSO2 Builder
6a9a5ba9c8 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35 2017-03-23 18:59:07 +05:30
Susinda Perera
350714ce71 Merge pull request #668 from amalhub/master
UI Text: Changing the password
2017-03-23 18:53:51 +05:30
amalhub
c65f9c6dcb Fixing issue: https://github.com/wso2/product-iots/issues/314 2017-03-23 15:51:46 +05:30
Harshan Liyanage
6e00753c39 Merge pull request #666 from Kamidu/cloud-3.1.0
location and role management fixes
2017-03-23 14:15:17 +05:30
kamidu
3b9ae200e7 fixing posible null pointer excep 2017-03-23 14:12:12 +05:30
kamidu
a85b5688a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-23 12:23:39 +05:30
kamidu
0b94a284ad new role filtering related fixes 2017-03-23 12:23:21 +05:30
kamidu
8c17418198 fixing the null pointer exception 2017-03-23 12:23:02 +05:30
kamidu
530e603fb5 enable role filtering and role count in device cloud 2017-03-23 12:22:27 +05:30
kamidu
cda0dd417f fixing the role filtering api issues 2017-03-23 12:21:41 +05:30
Harshan Liyanage
6aa8f067af Merge pull request #665 from wso2/revert-664-cloud-3.1.0
Revert "Allowing configuration management in cloud environment"
2017-03-23 11:13:09 +05:30
Harshan Liyanage
d468ac07d0 Revert "Allowing configuration management in cloud environment" 2017-03-23 11:12:15 +05:30
Harshan Liyanage
b32290ec30 Merge pull request #664 from madawas/cloud-3.1.0
Allowing configuration management in cloud environment
2017-03-23 11:11:24 +05:30
Madawa Soysa
da69bc9fe5 Allowing configuration management in cloud environment 2017-03-23 11:06:52 +05:30
Harshan Liyanage
dedc6245ba Merge pull request #663 from charithag/cloud-3.1.0
Add support for hybrid device types which has emulation/virtual capab…
2017-03-23 10:13:11 +05:30
charitha
6656f9e6f0 Add support for hybrid device types which has emulation/virtual capabilities
(cherry picked from commit 78b7037)
2017-03-23 01:07:28 +05:30
kamidu
e205fd97cd fix the user view related issues and device location out dated issue 2017-03-22 20:14:50 +05:30
kamidu
1f572998f8 enable role filtering in device cloud 2017-03-22 20:13:59 +05:30
kamidu
73ab0a38bf adding get location api witch was missing from previous emm versions 2017-03-22 20:13:08 +05:30
kamidu
a6f5c002a9 adding get location api witch was missing from previous emm versions 2017-03-22 20:12:50 +05:30
kamidu
a77794f81a adding role filtering for device cloud via api 2017-03-22 20:12:30 +05:30
kamidu
fc6c8e0290 adding get location api witch was missing from previous emm versions 2017-03-22 20:11:41 +05:30
Susinda Perera
643be65cf9 Merge pull request #662 from amalhub/master
Once the password is changed - Curent user should be immediately logout
2017-03-22 15:54:33 +05:30
amalhub
4c6781d6b6 Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout 2017-03-22 15:37:16 +05:30
WSO2 Builder
e8ee33e7a4 [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration 2017-03-22 15:24:27 +05:30
WSO2 Builder
6cc898d2ab [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34 2017-03-22 15:24:16 +05:30
Geeth
c0a474f6fc Merge pull request #661 from charithag/master
Fixes and improvments
2017-03-22 15:18:50 +05:30