Harshan Liyanage
|
004a70f0e1
|
Fixed merge conflicts
|
8 years ago |
Harshan Liyanage
|
a5f6662198
|
Revert "Merge branch 'master' into cloud-3.1.0"
This reverts commit e9c2f3e72d , reversing
changes made to 6e00753c39 .
|
8 years ago |
Harshan Liyanage
|
ebf40f7025
|
Merge pull request #680 from Kamidu/cloud-3.1.0
fix for icon missmatch issue in operation bar
|
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
hiding the advanced search
|
8 years ago |
kamidu
|
1d3d11e5f2
|
hiding the advanced search
|
8 years ago |
Ruwan
|
a66b4b21d5
|
Merge pull request #677 from Kamidu/cloud-3.1.0
Device location refresh and COPE related policy filtering in 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
Adding logic to acknowledge 404 response when tiers not available
|
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
Fixed policy monitoring issue.
|
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
Default configuration update
|
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
Fix for Advanced Search Issue #670
|
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
UI Text: Changing the password
|
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
location and role management fixes
|
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
Revert "Allowing configuration management in cloud environment"
|
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
Allowing configuration management in cloud environment
|
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
Add support for hybrid device types which has emulation/virtual capab…
|
8 years ago |
charitha
|
6656f9e6f0
|
Add support for hybrid device types which has emulation/virtual capabilities
(cherry picked from commit 78b7037 )
|
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
Once the password is changed - Curent user should be immediately logout
|
8 years ago |
amalhub
|
4c6781d6b6
|
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout
|
8 years ago |
WSO2 Builder
|
e8ee33e7a4
|
[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
6cc898d2ab
|
[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34
|
8 years ago |
Geeth
|
c0a474f6fc
|
Merge pull request #661 from charithag/master
Fixes and improvments
|
8 years ago |