Nirothipan
46921ac277
Resolving conflicts
7 years ago
Nirothipan
955fe4b4b5
checking message
7 years ago
Nirothipan
9d3b2ebf42
fixes for product-iots #504
7 years ago
amalhub
84ad02156b
Resolves: https://github.com/wso2/product-iots/issues/1339 , https://github.com/wso2/product-iots/issues/1300
7 years ago
charitha
3bce479b4b
Fix for https://github.com/wso2/product-iots/issues/1305
7 years ago
Chathura Ekanayake
4092254b19
backend fix for the issue with getting next pending operation of custom devices.
8 years ago
Rasika Perera
575d06f513
Geofencing refactoring
8 years ago
Madhawa Perera
031c648a2e
Merge pull request #816 from dunithd/master
...
Checking whether the geo location service has been enabled before reading stats from analytics server
8 years ago
Rasika Perera
186b49395e
Fixing https://github.com/wso2/product-iots/issues/685 : When user removed, all associated devices removed
8 years ago
dunithd
cffecfaf3a
Removing the warning message and changing the HTTP response status code to 400
8 years ago
dunithd
07c525667c
Removing an unused import
8 years ago
dunithd
0d3701be88
Checking whether the geo location service has been enabled before reading stats from analytics server
8 years ago
Harshan Liyanage
188c80f52a
Merge pull request #808 from hasuniea/master
...
Fixing issue wso2/product-iot#527
8 years ago
Hasunie
9206f74790
Fixing issue wso2/product-iot##527
8 years ago
ayyoob
d70cea2e46
fixed commit issues
8 years ago
ayyoob
536d100fd6
fixed comment issues
8 years ago
ayyoob
abacc0ce2a
fixed comment issues
8 years ago
ayyoob
2dab109ad3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
Ace
ac01fef7be
Adding import enhancements
8 years ago
Ace
dcbffac198
Adding fixes for https://github.com/wso2/product-iots/issues/997
8 years ago
ayyoob
6c041c7b6a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
Rasika Perera
fc4576082c
Changing artifact uploader admin service resource path
8 years ago
ayyoob
80cc690a42
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
dunithd
4cf3e2d421
Adding an API method to retrieve an activity by it's ID and a device ID
8 years ago
Harshan Liyanage
a21c374b00
Code refactoring.
8 years ago
Harshan Liyanage
074ceeb0c7
Merged with master
8 years ago
Harshan Liyanage
967efa1fee
Fixed user enrolled device showing problem which resolves wso2/product-iots#406
8 years ago
ayyoob
3b7d4d8966
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
ca33f035df
merge ui fixes
8 years ago
ayyoob
f47d0deb1a
few changes after testing.
8 years ago
ayyoob
da68f8fac1
fixed on config operation flow
8 years ago
Rasika Perera
ce6ab9b354
Refactoring "executionPlanType" -> "alertType"
8 years ago
Rasika Perera
6d02075a99
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
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
8 years ago
ayyoob
7ab52af66e
add http pushnotification
8 years ago
Harshan Liyanage
a30982207b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Harshan Liyanage
3766ba0349
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
8 years ago
inoshperera
9f9208cebc
adding default values for timestamp
8 years ago
Rasika Perera
05b11a5099
Adding Exit Alerts feature
8 years ago
ayyoob
f3393080ba
fixed few issues after testing
8 years ago
Rasika Perera
886eaec271
Geo service alerts history method added
8 years ago
ayyoob
194e4d99b5
added policy compliance support
8 years ago
ayyoob
5b46dc03a5
few fixes on event reciever definition
8 years ago
ayyoob
7cba43ccbb
few changes after testing HTTP and MQTT flow
8 years ago
ayyoob
a7ebc96cb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
a1b20f1663
changed response payload definition for pull notification
8 years ago
ayyoob
04b8b74e4f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
a0d7518cbe
Implemented Pull Notification Support
8 years ago
Rasika Perera
0a8929c7ee
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
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
8 years ago