Commit Graph

3899 Commits

Author SHA1 Message Date
kamidu
37a74155f3 adding the new toplink json 2017-03-28 15:08:54 +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
kamidu
fc6c8e0290 adding get location api witch was missing from previous emm versions 2017-03-22 20:11:41 +05:30
Harshan Liyanage
216c6eada1 Merge pull request #657 from Kamidu/cloud-3.1.0
Changing the app name in the title
2017-03-21 10:56:44 +05:30
kamidu
bf1548c062 title app name changed 2017-03-21 10:52:12 +05:30
kamidu
fef7a58ad4 title app name changed 2017-03-20 14:29:27 +05:30
Harshan Liyanage
99bb2a369f Merge pull request #642 from Kamidu/cloud-3.1.0
Cloud fixes for device cloud 3.1.0
2017-03-15 17:52:03 +05:30
kamidu
42f2691962 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-15 17:46:08 +05:30
kamidu
e30a5910f1 change the device cloud documentation link 2017-03-15 17:45:09 +05:30
kamidu
f3a61cb8f3 enhasing toplink 2017-03-15 17:43:20 +05:30
Hasunie
1ee313ea77 Merge pull request #636 from harshanL/cloud-3.1.0
Fixed Device renaming issue.
2017-03-14 16:49:21 +05:30
Harshan Liyanage
3106839d4d Merge pull request #635 from Kamidu/cloud-3.1.0
re enabling device renaming
2017-03-14 14:37:10 +05:30
kamidu
6fe7470af5 re enabling device renaming 2017-03-14 14:29:36 +05:30
Harshan Liyanage
06ccbe28cc Fixed Device renaming issue. 2017-03-14 14:13:21 +05:30
Harshan Liyanage
da70593110 Merge pull request #634 from Kamidu/cloud-3.1.0
Cloud 3.1.0
2017-03-14 14:11:20 +05:30
kamidu
590e21f419 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-14 14:07:25 +05:30
kamidu
3ff2c9894f role filtering for device cloud is enabled 2017-03-14 14:06:22 +05:30
Harshan Liyanage
190d322858 Merge pull request #632 from Kamidu/cloud-3.1.0
Role filtering for device cloud
2017-03-13 17:47:49 +05:30
Kamidu Punchihewa
fa013bb537 Merge branch 'cloud-3.1.0' of https://github.com/Kamidu/carbon-device-mgt into cloud-3.1.0 2017-03-13 17:12:35 +05:30
Kamidu Punchihewa
e063fd0da9 code cleanup results 2017-03-13 17:11:07 +05:30
Kamidu Punchihewa
3e72231d5b code cleanup results 2017-03-13 17:08:54 +05:30
Kamidu Punchihewa
e6333438b9 ading role filtering and ui fixes 2017-03-13 17:01:54 +05:30
Charitha Goonetilleke
968913f135 Merge pull request #626 from Kamidu/cloud-3.1.0
remove the cloud related config from config.json
2017-03-09 11:28:04 +05:30
kamidu
0fade6aa9f remove the cloud related config from config.jason 2017-03-08 15:54:08 +05:30
Charitha Goonetilleke
fc1cc5049f Merge pull request #625 from Kamidu/cloud-3.1.0
Device Cloud Requested UI fixes
2017-03-08 13:06:20 +05:30
kamidu
dd26f366df Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-08 12:50:07 +05:30
kamidu
f9a03133fa device cloude related ui improvements 2017-03-08 12:49:52 +05:30
Harshan Liyanage
0ac8329fbc Merge branch 'ayyoob-cloud-3.1.0' into cloud-3.1.0 2017-03-07 10:04:57 +05:30
ayyoob
964fb7ce72 regenerated swagger api based on apimgt 2.1.0 rest api 2017-03-07 01:56:51 +05:30
ayyoob
525b55d603 avoid race condition by loading tiers 2017-03-06 11:30:22 +05:30
Ayyoob Hamza
f554f62e1d Merge pull request #621 from ayyoob/cloud-3.1.0
added permission and subscription fix
2017-03-03 17:07:58 +05:30
ayyoob
5e4b0564b7 added permission fix for operation and synchronised application creation to avoid duplicate subscription 2017-03-03 17:02:36 +05:30
ayyoob
6a0c0cb299 added default permissions 2017-03-02 20:27:32 +05:30
Milan Perera
2a250371a2 Merge pull request #619 from ayyoob/cloud-3.1.0
added logger trace and made api app registration to be device type specific
2017-03-02 14:33:56 +05:30