Commit Graph

981 Commits

Author SHA1 Message Date
megala21
f3bca0f88c Merging with master 2017-07-25 11:19:46 +05:30
Dileesha Rajapakse
fc5e84796f Fixing Device Status search filter 2017-07-20 23:15:32 +05:30
Dileesha Rajapakse
d8ffa23a42 Fixing Device Type search filter 2017-07-20 22:11:15 +05:30
Madhawa Perera
8934dc2055 Merge pull request #857 from rasika/geo-fence-issues
Avoid calling geo service when geoFencing disabled
2017-07-20 18:28:08 +05:30
Rasika Perera
575d06f513 Geofencing refactoring 2017-07-20 17:26:44 +05:30
Rasika Perera
ba0a869cdd Avoid calling geo service when geoFencing disabled 2017-07-19 20:46:47 +05:30
Dileesha Rajapakse
18ccb8ec03 Refactored device.js 2017-07-18 10:28:35 +05:30
Dileesha Rajapakse
6cff453b24 Fixing redirection upon user session expiration issues 2017-07-18 09:46:04 +05:30
Dileesha Rajapakse
90099449d3 Fixing issue 1184 - Redirection not handled upon session expiration 2017-07-17 17:11:34 +05:30
Imesh Chandrasiri
4bfdec95f9 Temparory remove of device statistics 2017-07-17 15:12:29 +05:30
Rasika Perera
c6cce05b11 Merge pull request #845 from rasika/cloud-fixes
Cloud fixes
2017-07-17 11:14:55 +05:30
Madhawa Perera
efde7df025 Merge pull request #851 from rasika/geo-fence-issues
Fixing geofence issues
2017-07-16 21:36:56 +05:30
Madhawa Perera
731d88d96e Merge pull request #850 from rasika/temp-fix-api-subscribe
Temporary fixing download issue with adding /admin/manage/api/subscribe permission
2017-07-16 21:36:30 +05:30
Rasika Perera
c31461d278 Fixes https://github.com/wso2/product-iots/issues/1096 2017-07-16 19:01:06 +05:30
Rasika Perera
f3eaac15c7 Fixes https://github.com/wso2/product-iots/issues/1096 2017-07-16 18:53:05 +05:30
Rasika Perera
661925ca54 Fixes https://github.com/wso2/product-iots/issues/1134 : Temporary fixing issue with adding /admin/manage/api/subscribe permission 2017-07-16 18:20:16 +05:30
Rasika Perera
f15713ae85 Changing IoT Server logo into sharp .svg format 2017-07-16 16:11:39 +05:30
Imesh Chandrasiri
46b22e438d fixes wso2/product-iots#1152 2017-07-14 12:25:17 +05:30
Rasika Perera
9683b066dd Cloud fixes 2017-07-14 11:08:18 +05:30
Imesh Chandrasiri
f7c8578758 fixes wso2/product-iots#1141 2017-07-14 11:07:49 +05:30
Imesh Chandrasiri
7547599b09 fixes wso2/product-iots#1164 2017-07-13 15:14:40 +05:30
Imesh Chandrasiri
eabeb71a9c fixes wso2/product-iots#1166 2017-07-13 11:57:24 +05:30
Imesh Chandrasiri
a753ce1648 fixes wso2/product-iots#1170 2017-07-13 11:39:32 +05:30
Imesh Chandrasiri
c46cbb34ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-13 11:20:01 +05:30
Imesh Chandrasiri
a014cb0f60 fixes wso2/product-iots#1168 2017-07-13 11:17:41 +05:30
kamidu
19dc0a08c7 merge the css changes 2017-07-10 17:23:49 +05:30
kamidu
ee4e3df66d enable device owner flag in policy 2017-07-10 17:21:18 +05:30
Imesh Chandrasiri
ca760581a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-10 12:40:20 +05:30
Imesh Chandrasiri
66a7fe454c Fixes datatable miss rendering in device detail view. 2017-07-10 12:25:58 +05:30
sumedharubasinghe
77eadc7b5a Merge pull request #836 from rasika/operation-bar
Changes for the operation bar
2017-07-09 07:58:45 +05:30
Rasika Perera
6e748ae799 Hiding geo-fencing related buttons when geoservices disabled 2017-07-08 21:10:04 +05:30
Rasika Perera
389173f505 Fixes https://github.com/wso2/product-iots/issues/1084 2017-07-08 19:17:52 +05:30
Rasika Perera
394d97e1c8 Fixed operations not loaded correctly 2017-07-08 18:47:00 +05:30
Rasika Perera
9db4ddd4df Merge pull request #832 from rasika/geo-fencing
Hiding geo dashboard tools when GeoLocationConfiguration is Disabled
2017-07-07 18:39:02 +05:30
Imesh Chandrasiri
4a638836ca Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-07 12:42:28 +05:30
Imesh Chandrasiri
b43a2f72d9 Fixes wso2/product-iots#1118 2017-07-07 12:42:18 +05:30
Rasika Perera
83d0793a35 Hiding geo dashboard tools when GeoLocationConfiguration is Disabled 2017-07-07 06:58:58 +05:30
lasantha
edc14aa46d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 23:40:06 +05:30
lasantha
f32f5e4fdc Fixed operation label centering issue 2017-07-06 21:49:22 +05:30
Imesh Chandrasiri
1893d035a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 14:17:27 +05:30
Imesh Chandrasiri
e1857099a7 Fixes wso2/product-iots#1083 2017-07-06 14:17:16 +05:30
lasantha
cb8208b8b7 Adding UI validation to check whether radio or checkbox options are selected or not. 2017-07-06 13:15:52 +05:30
lasantha
e05eda5e18 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 09:42:22 +05:30
lasantha
c9e533dd2a adding ui params option to operations 2017-07-06 09:36:40 +05:30
Rasika Perera
3e118d8800 Fixing https://github.com/wso2/product-iots/issues/1063: Adding filter out features 2017-07-05 23:20:41 +05:30
Imesh Chandrasiri
c17b2fbd98 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-05 12:10:26 +05:30
Imesh Chandrasiri
d38714b7e6 fixes wso2/product-iots#1113 2017-07-05 12:08:45 +05:30
Rasika Perera
5e87ce2d66 Merge pull request #824 from rasika/monetize-cloud
Fixing https://github.com/wso2/product-iots/issues/1119: monetization
2017-07-05 11:10:11 +05:30
Rasika Perera
f8fa314359 Fixing https://github.com/wso2/product-iots/issues/1096: Hiding table when no alerts avaialble 2017-07-05 10:49:55 +05:30
Rasika Perera
7bc3ab7bec Fixing https://github.com/wso2/product-iots/issues/1096: Stationery -> Stationary 2017-07-05 07:17:52 +05:30