community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,062 Commits 31 Branches 461 Tags 183 MiB
48976788c7
Commit Graph

4062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ayyoob Hamza
48976788c7 Merge pull request #684 from harshanL/cloud-3.1.0 
Api publishing timeout fixes for cloud.
 2017-04-04 20:43:02 +05:30
Harshan Liyanage
8a43a560b2 Api publishing timeout fixes for cloud. 2017-04-04 20:14:43 +05:30
Harshan Liyanage
2f379408b2 Merge pull request #682 from Kamidu/cloud-3.1.0 
Style changes
 2017-04-04 17:19:53 +05:30
kamidu
1e87a36273 fixing conflicts 2017-04-04 17:11:50 +05:30
kamidu
46b782398e css changes for loading icon 2017-04-04 16:54:50 +05:30
Kamidu Sachith Punchihewa
9b606923a0 Merge pull request #681 from harshanL/cloud-3.1.0 
Cloud 3.1.0
 2017-04-04 16:26:28 +05:30
Harshan Liyanage
004a70f0e1 Fixed merge conflicts 2017-04-04 16:13:30 +05:30
Harshan Liyanage
a5f6662198 Revert "Merge branch 'master' into cloud-3.1.0" 
This reverts commit e9c2f3e72d, reversing
changes made to 6e00753c39.
 2017-04-04 16:09:49 +05:30
Harshan Liyanage
ebf40f7025 Merge pull request #680 from Kamidu/cloud-3.1.0 
fix for icon missmatch issue in operation bar
 2017-04-04 14:43:47 +05:30
kamidu
d28091d8d0 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-04-04 14:37:07 +05:30
kamidu
2eb061967e fixing icon issue in operation bar 2017-04-04 14:36:50 +05:30
Ruwan
fb330f51d7 Merge pull request #678 from Kamidu/cloud-3.1.0 
hiding the advanced search
 2017-04-03 19:23:59 +05:30
kamidu
1d3d11e5f2 hiding the advanced search 2017-04-03 19:12:15 +05:30
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
 2017-04-03 19:00:37 +05:30
kamidu
ba65a21e1c removing cope policies from cloud 2017-04-03 18:55:24 +05:30
kamidu
ea1a047a7b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-04-03 18:28:12 +05:30
Harshan Liyanage
6749672521 Merge pull request #676 from ruwany/cloud-3.1.0 
Adding logic to acknowledge 404 response when tiers not available
 2017-04-03 17:27:32 +05:30
Ace
ef0023cf5d Adding logic to acknowledge 404 response when tiers not available 2017-04-03 17:29:25 +05:30
kamidu
dd1aeb7f4a Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-04-03 17:26:17 +05:30
kamidu
f3a43ab270 policy filtering or cloud 2017-04-03 17:26:00 +05:30
Kamidu Sachith Punchihewa
00d21fc2ff Merge pull request #675 from harshanL/cloud-3.1.0 
Fixed policy monitoring issue.
 2017-04-03 11:17:56 +05:30
Harshan Liyanage
bc2a9c8659 Fixed policy monitoring issue. 2017-04-03 11:00:34 +05:30
Harshan Liyanage
aa20e9a0b7 Merge pull request #673 from Kamidu/cloud-3.1.0 
Default configuration update
 2017-03-28 16:34:18 +05:30
kamidu
f6f3439489 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-28 15:09:17 +05:30
kamidu
37a74155f3 adding the new toplink json 2017-03-28 15:08:54 +05:30
Kamidu Sachith Punchihewa
75bcc720d6 Merge pull request #672 from harshanL/cloud-3.1.0 
Fix for Advanced Search Issue #670
 2017-03-28 13:54:13 +05:30
Harshan Liyanage
d1de1ce15c Fix for Advanced Search Issue #670 2017-03-28 13:49:53 +05:30
Amal Gunatilake
e9c2f3e72d Merge branch 'master' into cloud-3.1.0 2017-03-24 11:55:35 +05:30
WSO2 Builder
3f8f8b3ab9 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration 2017-03-23 18:59:18 +05:30
WSO2 Builder
6a9a5ba9c8 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35 2017-03-23 18:59:07 +05:30
Susinda Perera
350714ce71 Merge pull request #668 from amalhub/master 
UI Text: Changing the password
 2017-03-23 18:53:51 +05:30
amalhub
c65f9c6dcb Fixing issue: https://github.com/wso2/product-iots/issues/314 2017-03-23 15:51:46 +05:30
Harshan Liyanage
6e00753c39 Merge pull request #666 from Kamidu/cloud-3.1.0 
location and role management fixes
 2017-03-23 14:15:17 +05:30
kamidu
3b9ae200e7 fixing posible null pointer excep 2017-03-23 14:12:12 +05:30
kamidu
a85b5688a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-23 12:23:39 +05:30
kamidu
0b94a284ad new role filtering related fixes 2017-03-23 12:23:21 +05:30
kamidu
8c17418198 fixing the null pointer exception 2017-03-23 12:23:02 +05:30
kamidu
530e603fb5 enable role filtering and role count in device cloud 2017-03-23 12:22:27 +05:30
kamidu
cda0dd417f fixing the role filtering api issues 2017-03-23 12:21:41 +05:30
Harshan Liyanage
6aa8f067af Merge pull request #665 from wso2/revert-664-cloud-3.1.0 
Revert "Allowing configuration management in cloud environment"
 2017-03-23 11:13:09 +05:30
Harshan Liyanage
d468ac07d0 Revert "Allowing configuration management in cloud environment" 2017-03-23 11:12:15 +05:30
Harshan Liyanage
b32290ec30 Merge pull request #664 from madawas/cloud-3.1.0 
Allowing configuration management in cloud environment
 2017-03-23 11:11:24 +05:30
Madawa Soysa
da69bc9fe5 Allowing configuration management in cloud environment 2017-03-23 11:06:52 +05:30
Harshan Liyanage
dedc6245ba Merge pull request #663 from charithag/cloud-3.1.0 
Add support for hybrid device types which has emulation/virtual capab…
 2017-03-23 10:13:11 +05:30
charitha
6656f9e6f0 Add support for hybrid device types which has emulation/virtual capabilities 
(cherry picked from commit 78b7037)
 2017-03-23 01:07:28 +05:30
kamidu
e205fd97cd fix the user view related issues and device location out dated issue 2017-03-22 20:14:50 +05:30
kamidu
1f572998f8 enable role filtering in device cloud 2017-03-22 20:13:59 +05:30
kamidu
73ab0a38bf adding get location api witch was missing from previous emm versions 2017-03-22 20:13:08 +05:30
kamidu
a6f5c002a9 adding get location api witch was missing from previous emm versions 2017-03-22 20:12:50 +05:30
kamidu
a77794f81a adding role filtering for device cloud via api 2017-03-22 20:12:30 +05:30