charitha
|
3c23a3cf5e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
7 years ago |
charitha
|
1449698a3c
|
OSGi improvement to #977
|
7 years ago |
Gathika94
|
c22a7f1882
|
minor ui changes
|
7 years ago |
Gathika94
|
89eff7b7bd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics
|
7 years ago |
Charitha Goonetilleke
|
61f88b54ff
|
Merge pull request #1122 from warunalakshitha/remote-control
Add remote control configurations as remove unused methods
|
7 years ago |
warunalakshitha
|
2313928741
|
Add remote control configurations as remove unused methods
|
7 years ago |
Gathika94
|
2e082fbbb7
|
removed unnecessary classes
|
7 years ago |
Gathika94
|
ad061d09a6
|
device details can be get through the api
|
7 years ago |
Gathika94
|
f5d1ab7403
|
backend api working properly
|
7 years ago |
Gathika94
|
c74a56cb45
|
geo hash algorithm
|
7 years ago |
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
|
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 |
warunalakshitha
|
22c4753f74
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control
|
7 years ago |
Charitha Goonetilleke
|
44592b2043
|
Revert "Resolving conflicts for Remote Control feature on behalf of Waruna"
|
7 years ago |
Ace
|
4b2955984f
|
Resolving conflicts for Remote Control feature on behalf of Waruna
|
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 |
Ruwan
|
ee0195f740
|
Merge pull request #950 from dilee/master
Minor refactorings and fixing formatting issues
|
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 |
megala21
|
5f0712dd38
|
Refactoring
|
7 years ago |
megala21
|
68533808c5
|
Adding test cases for UserManagementServicee
|
7 years ago |
Menaka Jayawardena
|
c0eb389ece
|
Removed device info persisting in the time of device enrollment and fixed the test case.
|
7 years ago |
sinthuja
|
10365c108b
|
Code cleanup.
|
7 years ago |
sinthuja
|
0252a5f2eb
|
Covering more database specific method calls.
|
7 years ago |
sinthuja
|
4d2d7b9ef5
|
Updating the failing Group management testcase with the database configuration.
|
7 years ago |
sinthuja
|
91e1268ca8
|
updating the default configurations for test cases.
|
7 years ago |
sinthuja
|
d214411f9a
|
Merge branch 'wso2-master' into origin-wso2-master
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceTest.java
|
7 years ago |
sinthuja
|
7a26fb6a93
|
adding some testcases for the mocking database operations.
|
7 years ago |
megala21
|
2c69c1bc10
|
Refactoring
|
7 years ago |
megala21
|
b392f93aab
|
Adding negative test cases for GroupProviderServiceImpl
|
7 years ago |
sinthuja
|
b419644a22
|
Adding more datasources configuration.
|
7 years ago |
sinthuja
|
635f84897d
|
Making datasource and isMock parameters as optional, and passing the default params.
|
7 years ago |
sinthuja
|
b9131fa141
|
Adding mock database impl.
|
7 years ago |
Madawa Soysa
|
d49f656b53
|
Merge pull request #1066 from madawas/api-unit-tests
More unit test cases to DeviceManagementService class
|
7 years ago |
Madawa Soysa
|
11b690354f
|
More unit test cases to DeviceManagementService class
|
7 years ago |
GDLMadushanka
|
ef83ddaa3a
|
refactoring
|
7 years ago |
GDLMadushanka
|
6aba996065
|
required changes for pr
|
7 years ago |
GDLMadushanka
|
0a1ba59307
|
refactoring
|
7 years ago |
GDLMadushanka
|
520529f474
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
7 years ago |
GDLMadushanka
|
74814b2932
|
unit tests for DeviceCacheManagerImpl
|
7 years ago |
Ace
|
66c4a345fd
|
Fixing bugs when getting device by status and adding test cases
|
7 years ago |
sinthuja
|
a6e85b856a
|
Merge branch 'wso2-master' into origin-wso2-master
|
7 years ago |