Commit Graph

819 Commits

Author SHA1 Message Date
megala21
f14e2c2d6a Removing cloud_type from config.json 2017-05-08 15:19:51 +05:30
megala21
8d0efd3289 Adding request new device type button for cloud 2017-05-08 13:58:59 +05:30
Amal Gunatilake
a4072615af Merge pull request #733 from rasika/improvement_getuser
Fixing typo and getCarbonUser() replaced with context.user
2017-05-05 11:26:01 +05:30
Amal Gunatilake
d898a7dc8e Merge pull request #732 from rasika/git_issue_731
Hide IoT Server version when isCloud is TRUE
2017-05-05 11:25:55 +05:30
ayyoob
cedb6cb798 fixed device stats loading page issue 2017-05-05 03:02:35 +05:30
Rasika Perera
776bafcd73 Fixing typo and getCarbonUser() replaced with context.user 2017-05-03 23:22:25 +05:30
Rasika Perera
d247b07b4a #731 : Hide IoT Server version when isCloud is TRUE 2017-05-03 23:04:55 +05:30
Rasika Perera
5dc9259fc0 Merge pull request #728 from rasika/git_issue_726
Resolving cannot log into devicemgt app when tenant is not loaded in API Manager
2017-05-03 20:23:07 +05:30
Rasika Perera
2831bfaf2c #726 : Resolving cannot log into devicemgt app when tenant is not loaded in API Manager 2017-05-03 19:59:17 +05:30
Ace
b54bf3000f Adding fix for status 500 in device listing page 2017-05-03 07:13:06 +05:30
Harshan Liyanage
7744ee2aea Merge pull request #716 from rasika/analytics-url
Enabling Statics URL
2017-04-27 12:44:55 +05:30
kamidu
845a8cb8f7 enable statics url 2017-04-26 12:34:21 +05:30
Rasika Perera
636f0cbe98 #706 : Policy view and policy edit doesn't honor isCloud enabled parameter 2017-04-25 14:46:22 +05:30
Rasika Perera
a107a0392e Fixing #703 : missing ContentType header on datatable invoker api 2017-04-25 08:27:41 +05:30
Rasika Perera
7660bf8569 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-25 08:26:51 +05:30
kamidu
a9888b5cf7 adding device cloud header 2017-04-21 15:43:39 +05:30
Amal Gunatilake
56cb6a3a1e Fixing security issue: Password Autocomplete in Firefox Browser
https://github.com/wso2/product-iots/issues/372
2017-04-20 14:31:20 +05:30
Rasika Perera
1a4f195a74 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-10 09:16:57 +05:30
kamidu
8bc7362bc0 disableing advanced search 2017-04-07 13:47:22 +05:30
kamidu
a5a222ead6 fixing device status 2017-04-07 13:47:12 +05:30
kamidu
06366bff24 css changes for loading icon 2017-04-07 13:46:09 +05:30
kamidu
2c20070720 fixing icon issue in operation bar 2017-04-07 13:45:12 +05:30
kamidu
16b67bebda hiding the advanced search 2017-04-07 13:44:57 +05:30
kamidu
9826a97d60 removing cope policies from cloud 2017-04-07 13:44:41 +05:30
kamidu
4cb816cb7f policy filtering or cloud 2017-04-07 13:44:05 +05:30
kamidu
57787a29c4 adding the new toplink json 2017-04-07 13:43:19 +05:30
Amal Gunatilake
980a90900d Merge pull request #679 from Megala21/fix_group_share_ui
Fixes https://github.com/wso2/product-iots/issues/335
2017-04-05 09:21:45 +05:30
lakshani
0f1b17a25e Fixed the issue in application restriction for iOS 2017-04-04 18:00:24 +05:30
megala21
5cd58d7454 Fixes https://github.com/wso2/product-iots/issues/335 2017-04-04 14:18:24 +05:30
Rasika Perera
6a623f5657 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-03-27 10:03:15 +05:30
Amal Gunatilake
e9c2f3e72d Merge branch 'master' into cloud-3.1.0 2017-03-24 11:55:35 +05:30
amalhub
c65f9c6dcb Fixing issue: https://github.com/wso2/product-iots/issues/314 2017-03-23 15:51:46 +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
Harshan Liyanage
d468ac07d0 Revert "Allowing configuration management in cloud environment" 2017-03-23 11:12:15 +05:30
Madawa Soysa
da69bc9fe5 Allowing configuration management in cloud environment 2017-03-23 11:06:52 +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
amalhub
4c6781d6b6 Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout 2017-03-22 15:37:16 +05:30
Geeth
c0a474f6fc Merge pull request #661 from charithag/master
Fixes and improvments
2017-03-22 15:18:50 +05:30
charitha
78b7037aa9 Add support for hybrid device types which has emulation/virtual capabilities 2017-03-22 15:04:21 +05:30
amalhub
af4ab19132 Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/647 2017-03-22 12:16:12 +05:30
sinthuja
54888b6727 Adding back the webscoket credential method invocation, as it's needed by the pugins. 2017-03-21 19:44:02 +05:30
charitha
5ff3ba3fcc Fix issue in showing dynamic icons 2017-03-21 11:14:27 +05:30
kamidu
bf1548c062 title app name changed 2017-03-21 10:52:12 +05:30
Harshan Liyanage
df6d8d4496 Merge pull request #656 from Kamidu/cloud-3.1.0
Fixing Git Issue : https://github.com/wso2/carbon-device-mgt/issues/643
2017-03-20 16:43:33 +05:30