sinthuja
|
ddb8f4e9b3
|
Fixing https://github.com/wso2/product-iots/issues/353.
|
2017-08-31 16:53:57 +05:30 |
|
sinthuja
|
e6ff84918e
|
Merge branch 'wso2-master'
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/IntegrationClientServiceImpl.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/CredentialManagementResponseBuilder.java
|
2017-08-31 15:38:00 +05:30 |
|
sinthuja
|
465d801f42
|
Fixing https://github.com/wso2/product-iots/issues/1356.
|
2017-08-31 15:34:33 +05:30 |
|
Nirothipan
|
46921ac277
|
Resolving conflicts
|
2017-08-30 17:06:48 +05:30 |
|
Nirothipan
|
955fe4b4b5
|
checking message
|
2017-08-30 16:50:26 +05:30 |
|
Nirothipan
|
9d3b2ebf42
|
fixes for product-iots #504
|
2017-08-30 16:20:32 +05:30 |
|
amalhub
|
84ad02156b
|
Resolves: https://github.com/wso2/product-iots/issues/1339, https://github.com/wso2/product-iots/issues/1300
|
2017-08-30 12:20:51 +05:30 |
|
charitha
|
3bce479b4b
|
Fix for https://github.com/wso2/product-iots/issues/1305
|
2017-08-28 18:57:37 +05:30 |
|
Chathura Ekanayake
|
4092254b19
|
backend fix for the issue with getting next pending operation of custom devices.
|
2017-07-26 12:39:25 +05:30 |
|
Rasika Perera
|
575d06f513
|
Geofencing refactoring
|
2017-07-20 17:26:44 +05:30 |
|
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
|
2017-07-01 08:04:39 +05:30 |
|
Rasika Perera
|
186b49395e
|
Fixing https://github.com/wso2/product-iots/issues/685: When user removed, all associated devices removed
|
2017-06-30 14:59:24 +05:30 |
|
dunithd
|
cffecfaf3a
|
Removing the warning message and changing the HTTP response status code to 400
|
2017-06-30 10:45:40 +05:30 |
|
dunithd
|
07c525667c
|
Removing an unused import
|
2017-06-29 18:27:04 +05:30 |
|
dunithd
|
0d3701be88
|
Checking whether the geo location service has been enabled before reading stats from analytics server
|
2017-06-29 18:25:28 +05:30 |
|
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 |
|