charitha
|
a2c0526b40
|
Fix typo
|
8 years ago |
|
charitha
|
670ca7c228
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
|
8 years ago |
kamidu
|
836ed2bc1c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
kamidu
|
3223e29df9
|
Fix for EMM-1185 , EMM- 1619
|
8 years ago |
Megala
|
235e9797d4
|
Fixing EMM-1717
|
8 years ago |
ayyoob
|
852ea00403
|
refactored method name
|
8 years ago |
|
ayyoob
|
5727886ea1
|
few changes after apimgt integration
|
8 years ago |
hasuniea
|
05e95e2675
|
fix the EMM-1702
|
8 years ago |
Imesh Chandrasiri
|
125b827f4f
|
Fix for modal popup overlay bug
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
a8e7396589
|
Merge pull request #377 from DimalChandrasiri/master
Parameterized datatable sorting function
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
6dafd11ca9
|
Merge pull request #379 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
8 years ago |
harshanl
|
4ce9c95044
|
Changed getOperations API to return operation list of removed devices
|
8 years ago |
thusithakalugamage
|
84a7d5517f
|
EMM-1685] - fix and few other related improvements
|
8 years ago |
|
Imesh Chandrasiri
|
bce1d9e060
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
Imesh Chandrasiri
|
3e4c1f9121
|
Parametarized datatable sorting function
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
5e6d8e667d
|
Merge pull request #376 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
8 years ago |
|
kamidu
|
131bcd48f9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
kamidu
|
cc6922bfad
|
Fix for EMM-1680
|
8 years ago |
|
charitha
|
664b3d4d43
|
Fix issue in duplicate mapping
|
8 years ago |
|
harshanl
|
4bcf350236
|
EMM-1678:Updated the oauth component versions
|
8 years ago |
|
thusithakalugamage
|
1a1f79b1b4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
thusithakalugamage
|
ac27349dae
|
Header nav menu responsiveness improvements
|
8 years ago |
|
kamidu
|
fc902ba602
|
fix database extended issue
|
8 years ago |
|
thusithakalugamage
|
a56aac7b87
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
thusithakalugamage
|
909e7836ca
|
Header nav menu responsiveness improvements
|
8 years ago |
|
kamidu
|
fc50b851bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
kamidu
|
4bbb378d26
|
conicting solving
|
8 years ago |
|
charitha
|
94a50584f4
|
Improve group listing with pagination
|
8 years ago |
|
Megala
|
c022f51467
|
Fixing EMM-1587
|
8 years ago |
|
kamidu
|
e2ee797462
|
Fix for EMM-1700
|
8 years ago |
madhawap
|
16b334b0b3
|
changes to swagger SecurityDefinitionConfigurator and annotations
|
8 years ago |
|
madhawap
|
7b8518a9db
|
changes to swagger SecurityDefinitionConfigurator and annotations
|
8 years ago |
|
charitha
|
ce5d63925a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
charitha
|
e89b4015b6
|
Introduced pagination
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
06e70c8326
|
Merge pull request #373 from shavidissa/master
swagger annotations and definitions changes for role management, configuration management and application management(admin)
|
8 years ago |
Shavindri
|
f0164b5a01
|
swagger annotations and definitions changes for role management, configuration management and application management(admin)
|
8 years ago |
|
thusithakalugamage
|
2ae60cc415
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
thusithakalugamage
|
88ec5246ec
|
[EMM-1694] - Header responsive issues fix
|
8 years ago |
|
kamidu
|
1fe74905f2
|
Fix for the redirection and ui related issues
|
8 years ago |
|
Imesh Chandrasiri
|
ebad678bab
|
Datatables serverside paging redirection bug fix
|
8 years ago |
|
kamidu
|
8c98accd18
|
Fixing conflitcs
|
8 years ago |
|
kamidu
|
c6fffb0b3a
|
Fixies for the ui issues in EMM -beta
|
8 years ago |
|
charitha
|
06176898d0
|
Exposed group id to API level
|
8 years ago |
|
Megala
|
e77d8b8b29
|
Adding isEmpty check
|
8 years ago |
|
Megala
|
0642cc10d7
|
Reformatting code
|
8 years ago |
|
Megala
|
f9204add08
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
|
Megala
|
42a9ba92a6
|
Fixing EMM-1683
|
8 years ago |
|
charitha
|
f22d392978
|
Upgrade to comply with latest CDMF changes
|
8 years ago |
|
Megala
|
b7990b9146
|
Fixing problems in retriveing data from secondary user store
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
c7bd0de033
|
Merge pull request #369 from thusithak/master
Platform configuration style defect fixes
|
8 years ago |
