Gathika94
|
d3eb32b5cc
|
working on ui features
|
7 years ago |
Gathika94
|
4eb66f4e6b
|
api for getting devices in geo grid working fine
|
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
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
|
7 years ago |
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
|
7 years ago |
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
|
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
|
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 |
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 |
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 |
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
Minor refactorings and fixing formatting issues
|
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 |
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 |
WSO2 Builder
|
b929ba11d3
|
[WSO2 Release] [Jenkins #2786] [Release 3.0.170] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
ccba297aca
|
[WSO2 Release] [Jenkins #2786] [Release 3.0.170] prepare release v3.0.170
|
7 years ago |
charitha
|
1eb2e54ae8
|
Resolve test failures and issues after merging with upstream
|
7 years ago |
charitha
|
6e62c3d64e
|
Refactor after merging
|
7 years ago |
charitha
|
b3094277fd
|
Merge branch 'master' into add-emm-analytics
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java
|
7 years ago |
WSO2 Builder
|
60b3060b4c
|
[WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
0b72a71e6f
|
[WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare release v3.0.169
|
7 years ago |
WSO2 Builder
|
8f860e34a1
|
[WSO2 Release] [Jenkins #2782] [Release 3.0.168] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
3d18b11c17
|
[WSO2 Release] [Jenkins #2782] [Release 3.0.168] prepare release v3.0.168
|
7 years ago |
WSO2 Builder
|
8c80836f72
|
[WSO2 Release] [Jenkins #2780] [Release 3.0.167] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
fd86095fd2
|
[WSO2 Release] [Jenkins #2780] [Release 3.0.167] prepare release v3.0.167
|
7 years ago |
WSO2 Builder
|
593090de40
|
[WSO2 Release] [Jenkins #2778] [Release 3.0.166] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
9ee51eb816
|
[WSO2 Release] [Jenkins #2778] [Release 3.0.166] prepare release v3.0.166
|
7 years ago |
WSO2 Builder
|
5f6fe29e52
|
[WSO2 Release] [Jenkins #2776] [Release 3.0.165] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
a9bb2f8723
|
[WSO2 Release] [Jenkins #2776] [Release 3.0.165] prepare release v3.0.165
|
7 years ago |
megala21
|
5f0712dd38
|
Refactoring
|
7 years ago |
megala21
|
68533808c5
|
Adding test cases for UserManagementServicee
|
7 years ago |
WSO2 Builder
|
f724ff341f
|
[WSO2 Release] [Jenkins #2774] [Release 3.0.164] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
7026020140
|
[WSO2 Release] [Jenkins #2774] [Release 3.0.164] prepare release v3.0.164
|
7 years ago |
Menaka Jayawardena
|
c0eb389ece
|
Removed device info persisting in the time of device enrollment and fixed the test case.
|
7 years ago |