Commit Graph

6070 Commits (415aac1ce0c3e847f3e40fa64ef7ed00e783bb92)
 

Author SHA1 Message Date
Gathika94 d3eb32b5cc working on ui features
7 years ago
Gathika94 4eb66f4e6b api for getting devices in geo grid working fine
7 years ago
Ruwan bde0965efe
Merge pull request #1119 from charithag/master
7 years ago
charitha f2fbf97b91 Reverting to column name based return of the generated keys as Statement.RETURN_GENERATED_KEYS are not handled consistently by H2 engine
7 years ago
charitha a966dc2655 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder 16750a6f96 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare for next development iteration
7 years ago
WSO2 Builder 46c732a2a9 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare release v3.0.178
7 years ago
charitha 0f7e8b6435 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
charitha 713c6a6755 Merge branch 'patch-1' of https://github.com/thomsonimjd/carbon-device-mgt
7 years ago
Charitha Goonetilleke c281374d95
Merge pull request #977 from dunithd/master
7 years ago
dunithd 7cdea248f7 Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
7 years ago
Dunith Dhanushka 7f9cf0ffea Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder 22fac48873 [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare for next development iteration
7 years ago
WSO2 Builder 62678dd003 [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare release v3.0.177
7 years ago
WSO2 Builder 3c027abbe4 Merge commit '41db467d7bf07bd76154b5588de8bdd34846bdae' into 36ea68d0-099b-430f-9991-b7f08d7b61ff
7 years ago
Ruwan 8ebf3eb8fa
Merge pull request #1070 from warunalakshitha/remote-control
7 years ago
WSO2 Builder 41db467d7b [WSO2 Release] [Jenkins #2797] [Release 3.0.176] prepare for next development iteration
7 years ago
WSO2 Builder af3f8a976f [WSO2 Release] [Jenkins #2797] [Release 3.0.176] prepare release v3.0.176
7 years ago
warunalakshitha 22c4753f74 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control
7 years ago
Ruwan b8093e97f0
Merge pull request #1112 from wso2/revert-1111-master
7 years ago
Charitha Goonetilleke 44592b2043
Revert "Resolving conflicts for Remote Control feature on behalf of Waruna"
7 years ago
Charitha Goonetilleke bb88b4ed43
Merge pull request #1111 from ruwany/master
7 years ago
Ace 4b2955984f Resolving conflicts for Remote Control feature on behalf of Waruna
7 years ago
WSO2 Builder 3097d8394f [WSO2 Release] [Jenkins #2795] [Release 3.0.175] prepare for next development iteration
7 years ago
WSO2 Builder 85f895d4a8 [WSO2 Release] [Jenkins #2795] [Release 3.0.175] prepare release v3.0.175
7 years ago
Ruwan 70ab17acde
Merge pull request #1068 from Jasintha/devicePolicyServiceTestImprovement
7 years ago
Ruwan 5231166083
Merge pull request #1082 from menakaj/master
7 years ago
Menaka Jayawardena a9150da115 Added class level comments.
7 years ago
Menaka Jayawardena 46555cfe3a Fixing code formatting issues in SearchManagementTestCases.
7 years ago
Menaka Jayawardena a9f2a0a228 Fixing code formatting issues in PermissionManagerServiceTests
7 years ago
Menaka Jayawardena e342507349 Fixing code formatting issues in DeviceTypeManagementService
7 years ago
Menaka Jayawardena af8ab1f59b Fixing code formatting issues in DeviceTypeManagementAdminService
7 years ago
Menaka Jayawardena 9e71b3d18e Fixing code formatting issues in DeviceAgentServiceTest
7 years ago
WSO2 Builder 477eb4d703 [WSO2 Release] [Jenkins #2793] [Release 3.0.174] prepare for next development iteration
7 years ago
WSO2 Builder 85904edfe9 [WSO2 Release] [Jenkins #2793] [Release 3.0.174] prepare release v3.0.174
7 years ago
WSO2 Builder 0c032443f9 Merge commit '4620ca4a6ec6fddd221a074eb2d6bbb81a62babf' into d250b2c0-4c43-40c8-af8b-ab3fdf3a7436
7 years ago
WSO2 Builder 4620ca4a6e [WSO2 Release] [Jenkins #2792] [Release 3.0.173] prepare for next development iteration
7 years ago
WSO2 Builder aca017b9bd [WSO2 Release] [Jenkins #2792] [Release 3.0.173] prepare release v3.0.173
7 years ago
Ruwan ee0195f740
Merge pull request #950 from dilee/master
7 years ago
Ruwan 357a625b0b
Merge pull request #1089 from rasika/master
7 years ago
Ruwan 0166f73410
Merge pull request #1092 from madawas/api-unit-tests
7 years ago
lasantha bbae97a92b resolve merging conflicts
7 years ago
lasantha 0185519a1f fixed merging conflicts
7 years ago
WSO2 Builder 1b8ecafce5 [WSO2 Release] [Jenkins #2790] [Release 3.0.172] prepare for next development iteration
7 years ago
WSO2 Builder 7ee80afc09 [WSO2 Release] [Jenkins #2790] [Release 3.0.172] prepare release v3.0.172
7 years ago
inoshperera 04f6ca51b0
Merge pull request #1108 from madawas/master
7 years ago
Madawa Soysa 72a09bf90b This commit fixes the unable to parse the DN issue
7 years ago
WSO2 Builder 9cbc4a5da3 [WSO2 Release] [Jenkins #2788] [Release 3.0.171] prepare for next development iteration
7 years ago
WSO2 Builder 86eb38569b [WSO2 Release] [Jenkins #2788] [Release 3.0.171] prepare release v3.0.171
7 years ago
Geeth f0b85c6bfe
Merge pull request #1097 from wso2/revert-402-EMM-1298
7 years ago