thusithakalugamage
|
fa3db47400
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
thusithakalugamage
|
48337ee16c
|
[EMM-1618] - related improvements on remaining occurences
|
8 years ago |
hasuniea
|
33cc38defb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
hasuniea
|
fa972fbf36
|
adding platform ios to cdm-config.xml
|
8 years ago |
Rasika Perera
|
2340611a9b
|
Removing mdm specific dependencies from CDMF
|
8 years ago |
Milan Perera
|
da4a558d87
|
Merge pull request #387 from ayyoob/st2
added gateway mode to decide to which oauth app to use.
|
8 years ago |
ayyoob
|
2f58e0ba15
|
added gateway mode to decide to which oauth app to use.
|
8 years ago |
|
hasuniea
|
4f42980500
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
hasuniea
|
799beb3c59
|
removing ios platform entry from cdm-config.xml
|
8 years ago |
Shavindri
|
9ceb031677
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Kamidu Sachith Punchihewa
|
ecc70ead08
|
Merge pull request #385 from hastef88/emm1726
EMM-1726
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
af4989e56d
|
Merge pull request #384 from shavidissa/master
swagger annotations and definition update continued for device type, …
|
8 years ago |
|
Shavindri
|
1e32d5f89f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Hasitha Amal De Silva
|
4555819211
|
EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button.
|
8 years ago |
|
Shavindri
|
0842dcb2bb
|
swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
|
8 years ago |
|
Milan Perera
|
bb60caa171
|
Merge pull request #383 from ayyoob/st2
fixed api name for device type
|
8 years ago |
|
ayyoob
|
93c1725e32
|
fixed api name for device type
|
8 years ago |
charitha
|
e53b0c3860
|
Fix group count listing in dashboard
|
8 years ago |
|
kamidu
|
6d5fae0b0c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
kamidu
|
8c94e83431
|
Fix for Jira : EMM-1682 and EMM-1653
|
8 years ago |
|
kamidu
|
2f852d84f4
|
Fix for the issue : EMM policy updating issue
|
8 years ago |
|
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 |
harshanl
|
a4b6bb85b1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
harshanl
|
45e584a064
|
Fixed arithmetic overflow issue in MSSQL
|
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 |
|
Harshan Liyanage
|
83c36d4d3c
|
Merge pull request #382 from Megala21/master
Fixing EMM-1717
|
8 years ago |
Megala
|
235e9797d4
|
Fixing EMM-1717
|
8 years ago |
Ruwan
|
9687d554a6
|
Merge pull request #381 from ayyoob/st2
Fixed the issues related to apimgt integration
|
8 years ago |
|
ayyoob
|
92d30eaadc
|
config update
|
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 |
|
Kamidu Sachith Punchihewa
|
8740eae61a
|
Merge pull request #380 from DimalChandrasiri/master
Fix for modal popup overlay bug
|
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 |
|
thusithakalugamage
|
11544fab15
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
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 |
|
thusithakalugamage
|
8b221b2fc6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
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 |
