Commit Graph

4060 Commits (2f379408b2f83a06e988b38798859690a4e7aa16)
 

Author SHA1 Message Date
Harshan Liyanage 2f379408b2 Merge pull request #682 from Kamidu/cloud-3.1.0
8 years ago
kamidu 1e87a36273 fixing conflicts
8 years ago
kamidu 46b782398e css changes for loading icon
8 years ago
Kamidu Sachith Punchihewa 9b606923a0 Merge pull request #681 from harshanL/cloud-3.1.0
8 years ago
Harshan Liyanage 004a70f0e1 Fixed merge conflicts
8 years ago
Harshan Liyanage a5f6662198 Revert "Merge branch 'master' into cloud-3.1.0"
8 years ago
Harshan Liyanage ebf40f7025 Merge pull request #680 from Kamidu/cloud-3.1.0
8 years ago
kamidu d28091d8d0 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu 2eb061967e fixing icon issue in operation bar
8 years ago
Ruwan fb330f51d7 Merge pull request #678 from Kamidu/cloud-3.1.0
8 years ago
kamidu 1d3d11e5f2 hiding the advanced search
8 years ago
Ruwan a66b4b21d5 Merge pull request #677 from Kamidu/cloud-3.1.0
8 years ago
kamidu ba65a21e1c removing cope policies from cloud
8 years ago
kamidu ea1a047a7b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Harshan Liyanage 6749672521 Merge pull request #676 from ruwany/cloud-3.1.0
8 years ago
Ace ef0023cf5d Adding logic to acknowledge 404 response when tiers not available
8 years ago
kamidu dd1aeb7f4a Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu f3a43ab270 policy filtering or cloud
8 years ago
Kamidu Sachith Punchihewa 00d21fc2ff Merge pull request #675 from harshanL/cloud-3.1.0
8 years ago
Harshan Liyanage bc2a9c8659 Fixed policy monitoring issue.
8 years ago
Harshan Liyanage aa20e9a0b7 Merge pull request #673 from Kamidu/cloud-3.1.0
8 years ago
kamidu f6f3439489 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu 37a74155f3 adding the new toplink json
8 years ago
Kamidu Sachith Punchihewa 75bcc720d6 Merge pull request #672 from harshanL/cloud-3.1.0
8 years ago
Harshan Liyanage d1de1ce15c Fix for Advanced Search Issue #670
8 years ago
Amal Gunatilake e9c2f3e72d Merge branch 'master' into cloud-3.1.0
8 years ago
WSO2 Builder 3f8f8b3ab9 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration
8 years ago
WSO2 Builder 6a9a5ba9c8 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35
8 years ago
Susinda Perera 350714ce71 Merge pull request #668 from amalhub/master
8 years ago
amalhub c65f9c6dcb Fixing issue: https://github.com/wso2/product-iots/issues/314
8 years ago
Harshan Liyanage 6e00753c39 Merge pull request #666 from Kamidu/cloud-3.1.0
8 years ago
kamidu 3b9ae200e7 fixing posible null pointer excep
8 years ago
kamidu a85b5688a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu 0b94a284ad new role filtering related fixes
8 years ago
kamidu 8c17418198 fixing the null pointer exception
8 years ago
kamidu 530e603fb5 enable role filtering and role count in device cloud
8 years ago
kamidu cda0dd417f fixing the role filtering api issues
8 years ago
Harshan Liyanage 6aa8f067af Merge pull request #665 from wso2/revert-664-cloud-3.1.0
8 years ago
Harshan Liyanage d468ac07d0 Revert "Allowing configuration management in cloud environment"
8 years ago
Harshan Liyanage b32290ec30 Merge pull request #664 from madawas/cloud-3.1.0
8 years ago
Madawa Soysa da69bc9fe5 Allowing configuration management in cloud environment
8 years ago
Harshan Liyanage dedc6245ba Merge pull request #663 from charithag/cloud-3.1.0
8 years ago
charitha 6656f9e6f0 Add support for hybrid device types which has emulation/virtual capabilities
8 years ago
kamidu e205fd97cd fix the user view related issues and device location out dated issue
8 years ago
kamidu 1f572998f8 enable role filtering in device cloud
8 years ago
kamidu 73ab0a38bf adding get location api witch was missing from previous emm versions
8 years ago
kamidu a6f5c002a9 adding get location api witch was missing from previous emm versions
8 years ago
kamidu a77794f81a adding role filtering for device cloud via api
8 years ago
kamidu fc6c8e0290 adding get location api witch was missing from previous emm versions
8 years ago
Susinda Perera 643be65cf9 Merge pull request #662 from amalhub/master
8 years ago