WSO2 Builder
|
f28b740e9c
|
[WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare release v3.0.179
|
2017-11-22 10:42:08 +00:00 |
|
Ruwan
|
bde0965efe
|
Merge pull request #1119 from charithag/master
Merging PR https://github.com/wso2/carbon-device-mgt/pull/761 offline
|
2017-11-22 15:47:47 +05:30 |
|
charitha
|
f2fbf97b91
|
Reverting to column name based return of the generated keys as Statement.RETURN_GENERATED_KEYS are not handled consistently by H2 engine
|
2017-11-22 15:41:23 +05:30 |
|
charitha
|
a966dc2655
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2017-11-22 15:40:34 +05:30 |
|
WSO2 Builder
|
16750a6f96
|
[WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare for next development iteration
|
2017-11-22 09:19:46 +00:00 |
|
WSO2 Builder
|
46c732a2a9
|
[WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare release v3.0.178
|
2017-11-22 09:19:31 +00:00 |
|
charitha
|
0f7e8b6435
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2017-11-22 14:43:50 +05:30 |
|
charitha
|
713c6a6755
|
Merge branch 'patch-1' of https://github.com/thomsonimjd/carbon-device-mgt
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
|
2017-11-22 14:43:29 +05:30 |
|
Charitha Goonetilleke
|
c281374d95
|
Merge pull request #977 from dunithd/master
Data archival task implementation to prune CDM transnational tables.
|
2017-11-22 14:23:02 +05:30 |
|
dunithd
|
7cdea248f7
|
Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
# Resolving Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
|
2017-11-22 11:14:55 +05:30 |
|
Dunith Dhanushka
|
7f9cf0ffea
|
Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
# Resolving Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
|
2017-11-22 11:14:32 +05:30 |
|
WSO2 Builder
|
22fac48873
|
[WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare for next development iteration
|
2017-11-17 10:03:15 +00:00 |
|
WSO2 Builder
|
62678dd003
|
[WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare release v3.0.177
|
2017-11-17 10:03:02 +00:00 |
|
WSO2 Builder
|
3c027abbe4
|
Merge commit '41db467d7bf07bd76154b5588de8bdd34846bdae' into 36ea68d0-099b-430f-9991-b7f08d7b61ff
|
2017-11-17 09:40:53 +00:00 |
|
Ruwan
|
8ebf3eb8fa
|
Merge pull request #1070 from warunalakshitha/remote-control
Remote control
|
2017-11-17 15:02:21 +05:30 |
|
WSO2 Builder
|
41db467d7b
|
[WSO2 Release] [Jenkins #2797] [Release 3.0.176] prepare for next development iteration
|
2017-11-17 09:27:07 +00:00 |
|
WSO2 Builder
|
af3f8a976f
|
[WSO2 Release] [Jenkins #2797] [Release 3.0.176] prepare release v3.0.176
|
2017-11-17 09:26:43 +00:00 |
|
warunalakshitha
|
22c4753f74
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control
|
2017-11-17 14:46:42 +05:30 |
|
Ruwan
|
b8093e97f0
|
Merge pull request #1112 from wso2/revert-1111-master
Revert "Resolving conflicts for Remote Control feature on behalf of Waruna"
|
2017-11-17 14:35:05 +05:30 |
|
Charitha Goonetilleke
|
44592b2043
|
Revert "Resolving conflicts for Remote Control feature on behalf of Waruna"
|
2017-11-17 14:33:45 +05:30 |
|
Charitha Goonetilleke
|
bb88b4ed43
|
Merge pull request #1111 from ruwany/master
Resolving conflicts for Remote Control feature on behalf of Waruna
|
2017-11-17 14:31:19 +05:30 |
|
Ace
|
4b2955984f
|
Resolving conflicts for Remote Control feature on behalf of Waruna
|
2017-11-17 14:27:30 +05:30 |
|
WSO2 Builder
|
3097d8394f
|
[WSO2 Release] [Jenkins #2795] [Release 3.0.175] prepare for next development iteration
|
2017-11-17 06:58:17 +00:00 |
|
WSO2 Builder
|
85f895d4a8
|
[WSO2 Release] [Jenkins #2795] [Release 3.0.175] prepare release v3.0.175
|
2017-11-17 06:58:03 +00:00 |
|
Ruwan
|
70ab17acde
|
Merge pull request #1068 from Jasintha/devicePolicyServiceTestImprovement
Device policy service test improvement
|
2017-11-17 12:01:51 +05:30 |
|
Ruwan
|
5231166083
|
Merge pull request #1082 from menakaj/master
Fixing code formatting issues in device mgt Unit Tests.
|
2017-11-17 12:01:35 +05:30 |
|
Menaka Jayawardena
|
a9150da115
|
Added class level comments.
|
2017-11-17 11:58:30 +05:30 |
|
Menaka Jayawardena
|
46555cfe3a
|
Fixing code formatting issues in SearchManagementTestCases.
|
2017-11-17 11:58:30 +05:30 |
|
Menaka Jayawardena
|
a9f2a0a228
|
Fixing code formatting issues in PermissionManagerServiceTests
|
2017-11-17 11:56:41 +05:30 |
|
Menaka Jayawardena
|
e342507349
|
Fixing code formatting issues in DeviceTypeManagementService
|
2017-11-17 11:56:41 +05:30 |
|
Menaka Jayawardena
|
af8ab1f59b
|
Fixing code formatting issues in DeviceTypeManagementAdminService
|
2017-11-17 11:56:41 +05:30 |
|
Menaka Jayawardena
|
9e71b3d18e
|
Fixing code formatting issues in DeviceAgentServiceTest
|
2017-11-17 11:56:41 +05:30 |
|
WSO2 Builder
|
477eb4d703
|
[WSO2 Release] [Jenkins #2793] [Release 3.0.174] prepare for next development iteration
|
2017-11-17 05:41:29 +00:00 |
|
WSO2 Builder
|
85904edfe9
|
[WSO2 Release] [Jenkins #2793] [Release 3.0.174] prepare release v3.0.174
|
2017-11-17 05:41:16 +00:00 |
|
WSO2 Builder
|
0c032443f9
|
Merge commit '4620ca4a6ec6fddd221a074eb2d6bbb81a62babf' into d250b2c0-4c43-40c8-af8b-ab3fdf3a7436
|
2017-11-17 05:18:27 +00:00 |
|
WSO2 Builder
|
4620ca4a6e
|
[WSO2 Release] [Jenkins #2792] [Release 3.0.173] prepare for next development iteration
|
2017-11-17 05:08:44 +00:00 |
|
WSO2 Builder
|
aca017b9bd
|
[WSO2 Release] [Jenkins #2792] [Release 3.0.173] prepare release v3.0.173
|
2017-11-17 05:08:25 +00:00 |
|
Ruwan
|
ee0195f740
|
Merge pull request #950 from dilee/master
Minor refactorings and fixing formatting issues
|
2017-11-17 10:16:27 +05:30 |
|
Ruwan
|
357a625b0b
|
Merge pull request #1089 from rasika/master
Adding unit tests for monitoring manager
|
2017-11-17 10:11:34 +05:30 |
|
Ruwan
|
0166f73410
|
Merge pull request #1092 from madawas/api-unit-tests
Test Cases for DeviceManagementServiceImpl
|
2017-11-17 10:10:06 +05:30 |
|
WSO2 Builder
|
1b8ecafce5
|
[WSO2 Release] [Jenkins #2790] [Release 3.0.172] prepare for next development iteration
|
2017-11-13 04:18:35 +00:00 |
|
WSO2 Builder
|
7ee80afc09
|
[WSO2 Release] [Jenkins #2790] [Release 3.0.172] prepare release v3.0.172
|
2017-11-13 04:18:21 +00:00 |
|
inoshperera
|
04f6ca51b0
|
Merge pull request #1108 from madawas/master
This commit fixes the unable to parse the DN issue
|
2017-11-13 09:22:34 +05:30 |
|
Madawa Soysa
|
72a09bf90b
|
This commit fixes the unable to parse the DN issue
Currently when a DN cannot be parsed if the DN is not in RFC2253 format. This commit fixeds this issue.
|
2017-11-12 18:31:21 +05:30 |
|
WSO2 Builder
|
9cbc4a5da3
|
[WSO2 Release] [Jenkins #2788] [Release 3.0.171] prepare for next development iteration
|
2017-11-02 09:46:46 +00:00 |
|
WSO2 Builder
|
86eb38569b
|
[WSO2 Release] [Jenkins #2788] [Release 3.0.171] prepare release v3.0.171
|
2017-11-02 09:46:31 +00:00 |
|
Geeth
|
f0b85c6bfe
|
Merge pull request #1097 from wso2/revert-402-EMM-1298
Revert "Fix for EMM-1298"
|
2017-11-02 14:54:11 +05:30 |
|
Madawa Soysa
|
33345f5b52
|
Adding missing import
|
2017-11-02 14:42:08 +05:30 |
|
Madawa Soysa
|
33e39415de
|
Revert "Fix for EMM-1298"
|
2017-11-02 14:18:45 +05:30 |
|
Madawa Soysa
|
8ad597342e
|
Test Cases for DeviceManagementServiceImpl
|
2017-11-01 11:52:57 +05:30 |
|