Harshan Liyanage
188c80f52a
Merge pull request #808 from hasuniea/master
...
Fixing issue wso2/product-iot#527
2017-06-23 17:49:23 +05:30
Hasunie
9206f74790
Fixing issue wso2/product-iot##527
2017-06-23 17:39:42 +05:30
ayyoob
d70cea2e46
fixed commit issues
2017-06-22 19:29:04 +05:30
ayyoob
536d100fd6
fixed comment issues
2017-06-22 17:44:54 +05:30
ayyoob
abacc0ce2a
fixed comment issues
2017-06-22 17:28:37 +05:30
ayyoob
2dab109ad3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-22 16:56:34 +05:30
Ace
ac01fef7be
Adding import enhancements
2017-06-22 15:34:03 +05:30
Ace
dcbffac198
Adding fixes for https://github.com/wso2/product-iots/issues/997
2017-06-22 15:12:40 +05:30
ayyoob
6c041c7b6a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-22 04:34:45 +05:30
Rasika Perera
fc4576082c
Changing artifact uploader admin service resource path
2017-06-21 10:57:50 +05:30
ayyoob
80cc690a42
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-21 04:11:40 +05:30
dunithd
4cf3e2d421
Adding an API method to retrieve an activity by it's ID and a device ID
2017-06-20 17:44:22 +05:30
Harshan Liyanage
a21c374b00
Code refactoring.
2017-06-19 12:52:31 +05:30
Harshan Liyanage
074ceeb0c7
Merged with master
2017-06-19 12:46:22 +05:30
Harshan Liyanage
967efa1fee
Fixed user enrolled device showing problem which resolves wso2/product-iots#406
2017-06-19 12:41:22 +05:30
ayyoob
3b7d4d8966
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-17 19:17:42 +05:30
ayyoob
ca33f035df
merge ui fixes
2017-06-17 18:52:25 +05:30
ayyoob
f47d0deb1a
few changes after testing.
2017-06-16 03:48:08 +05:30
ayyoob
da68f8fac1
fixed on config operation flow
2017-06-14 12:38:56 +05:30
Rasika Perera
ce6ab9b354
Refactoring "executionPlanType" -> "alertType"
2017-06-12 22:43:14 +05:30
Rasika Perera
6d02075a99
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-12 15:11:14 +05:30
ayyoob
6c7f911cbc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
...
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
2017-06-08 14:39:51 +05:30
ayyoob
7ab52af66e
add http pushnotification
2017-06-08 14:24:33 +05:30
Harshan Liyanage
a30982207b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-07 16:29:15 +05:30
Harshan Liyanage
3766ba0349
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
2017-06-07 16:29:05 +05:30
inoshperera
9f9208cebc
adding default values for timestamp
2017-06-07 09:25:16 +05:30
Rasika Perera
05b11a5099
Adding Exit Alerts feature
2017-06-06 14:55:04 +05:30
ayyoob
f3393080ba
fixed few issues after testing
2017-06-06 11:00:59 +05:30
Rasika Perera
886eaec271
Geo service alerts history method added
2017-06-05 10:11:14 +05:30
ayyoob
194e4d99b5
added policy compliance support
2017-06-05 00:12:59 +05:30
ayyoob
5b46dc03a5
few fixes on event reciever definition
2017-06-04 18:18:06 +05:30
ayyoob
7cba43ccbb
few changes after testing HTTP and MQTT flow
2017-06-04 06:52:29 +05:30
ayyoob
a7ebc96cb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-03 18:06:32 +05:30
ayyoob
a1b20f1663
changed response payload definition for pull notification
2017-06-03 13:27:08 +05:30
ayyoob
04b8b74e4f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-01 17:22:33 +05:30
ayyoob
a0d7518cbe
Implemented Pull Notification Support
2017-06-01 17:19:25 +05:30
Rasika Perera
0a8929c7ee
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-05-30 16:35:36 +05:30
madhawap
c4d433a1a0
Fix for disabling reboot and upgrade-firmware operations on UI and Code formatting
...
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled. In addition change a c-style for loop to a foreach loop in PolicyManagementServiceImpl.java
2017-05-29 20:13:51 +05:30
Rasika Perera
ea3ed9c444
Added Geo Service into Device Mgt Core
2017-05-29 11:51:41 +05:30
ayyoob
c3f23fa564
fixed multi tenant issues after testing custom device type impl
2017-05-29 01:00:16 +05:30
ayyoob
56faa75861
fixed analytics issues
2017-05-25 03:07:19 +05:30
ayyoob
5acf5912e4
added comment
2017-05-24 00:41:21 +05:30
ayyoob
a037f91f56
removed task Config from template
2017-05-24 00:27:13 +05:30
ayyoob
4d22bc7064
fixed UI Issues
2017-05-24 00:26:02 +05:30
ayyoob
dd1c2e4338
Added few fixes after testing and added default UI for device type management
2017-05-22 02:51:35 +05:30
ayyoob
f945da194d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-05-19 01:56:40 +05:30
ayyoob
abc9315f95
Added Pluggable Device Type
2017-05-19 01:49:10 +05:30
sinthuja
4df590caa1
Fixing https://github.com/wso2/product-iots/issues/447 .
2017-05-16 18:17:45 +05:30
ayyoob
fbb5f5ae88
merged with origin
2017-05-15 18:15:24 +05:30
ayyoob
d2d7be6fd6
fixed tenant related issue for mqtt push notification and stream artifact publishing
2017-05-10 13:50:06 +05:30
