Gathika94
3bb2e8a5bf
Add new method to put permission taking String parameters
2019-03-28 11:55:09 +05:30
lasanthaDLPDS
98d14b0815
Fix merge conflicts
2019-03-13 12:09:29 +05:30
lasanthaDLPDS
f92ae35e4b
Fix the task running issue in tenant mode
...
If a run time error encountered while sending a notification(e.g:- Push Notification ) to a device when the task is running for tenants, it terminates the task running and notifications won't be sending to devices which are enrolled to other tenants as well. Hence cath the exception in sendNotification method and log.
Further, since this is critical path, added few debug logs as well.
2019-01-28 11:56:49 +05:30
Inosh Perara
ecd35c34e4
Merge branch 'master' into 'master'
...
Add enrollment notification sending feature
See merge request entgra/carbon-device-mgt!38
2019-01-28 05:48:01 +00:00
lasanthaDLPDS
7975563530
Improve the payload of enrollment notification
2019-01-24 17:41:53 +05:30
charitha
2380a22d53
Commit transaction after changing status
2019-01-21 15:36:42 +05:30
lasanthaDLPDS
e852c62663
Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt
2019-01-21 10:54:37 +05:30
lasanthaDLPDS
b90766b5a4
Add enrollment notification sending feature
2019-01-18 08:04:40 +05:30
charitha
026bd175e9
Reformat & fix API publishing issue to Gateway
2019-01-17 22:46:32 +05:30
charitha
8b34253bc1
Optimize functionality
2019-01-17 15:28:12 +05:30
charitha
3d42175bea
Merge branch 'master' of https://gitlab.com/ruwany.ace/carbon-device-mgt into entgra-master
2019-01-17 14:00:22 +05:30
Ace
59186155d0
Adding new apis to update devices status/get count/get list based on status
2019-01-17 12:35:06 +05:30
charitha
e78a2a1279
Merge remote-tracking branch 'entgra/master' into entgra-master
2019-01-14 15:24:15 +05:30
charitha
75dd9321af
Add methods to get device count based on status and device type
2019-01-14 15:24:01 +05:30
Madawa Soysa
6f80d1993d
Move private constants to a public constant class
2018-12-13 20:21:59 +11:00
Madawa Soysa
eea040f391
Remove redundant authorization check and fix the test
2018-12-09 14:01:45 +11:00
Madawa Soysa
001649e5fd
Fix issue with advanced search to pick the correct enrollment
...
This commit addresses following two issues,
1. Advanced search feature returns the oldest enrollment instance
This issue occurs when the same device is enrolled for multiple users. The cause of the issue is filtering the devices by device identifier which is a unique property for a device. This commit fixes the issue by filtering the devices from enrollment id and owner instead of the device identifier.
2. All devices do not return for privileged users when searched through advanced-search
The cause of the issue is not considering the user permissions when filtering the devices. This commit fixes the issue by validating the permissions of the logged in user before filtering.
Fixes entgra/product-iots#13
Fixes entgra/product-iots#14
2018-12-04 23:04:25 +11:00
lasanthaDLPDS
8841741567
Fiz merge conflicts
2018-11-18 08:05:35 +05:30
Ace
880720a72f
Fixing issue with task scheduler
2018-11-09 21:51:42 +05:30
charitha
f0ec4a3520
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
...
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
# components/apimgt-extensions/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
# components/device-mgt-extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/Operation.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/ProfileOperationDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
# components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
# components/identity-extensions/pom.xml
# components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
# components/policy-mgt/pom.xml
# components/test-coverage/pom.xml
# components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
# components/webapp-authenticator-framework/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
# features/apimgt-extensions/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
# features/certificate-mgt/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
# features/device-mgt-extensions/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
# features/device-mgt/pom.xml
# features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
# features/email-sender/pom.xml
# features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
# features/jwt-client/pom.xml
# features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
# features/oauth-extensions/pom.xml
# features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
# features/policy-mgt/pom.xml
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
# features/webapp-authenticator-framework/pom.xml
# pom.xml
2018-10-30 14:29:37 +05:30
geethkokila
2bb3e2cdc0
Fixing the SQL
2018-10-25 00:11:49 +05:30
lasanthaDLPDS
e76fe92ebe
Fix device monitoring task disabling issue
2018-10-24 08:29:35 +05:30
charitha
128b5f64aa
Fixed NPE in sending push notifications
2018-10-22 10:36:58 +05:30
charitha
3856a25449
Fixed authentication issue in deploying execution plans as non admin user
2018-10-21 14:30:06 +05:30
Milan Perera
a01886cb37
Handle NotNow response from device
2018-10-16 21:12:05 +05:30
Milan Perera
b256d55847
Handle NotNow response from device
2018-10-16 17:41:39 +05:30
Ace
de0bc0bb50
persisting profile operation payloads as string values as upposed to profile objects. this will iron iot future compatibility issues that may arise, due to operation dto getting updated
2018-10-12 10:44:53 +05:30
Ace
cb0fb87b49
Fixing test failures and adding enhancements
2018-10-11 16:37:13 +05:30
Ace
4b71c6ec40
Operation retrieval logic changed to retrieve operation details via table merge instead of secondary DB call
2018-10-11 14:21:26 +05:30
Ace
de9cf67977
fixing issues with notification status not getting updated
2018-10-10 22:35:05 +05:30
Ace
e487ef4627
Fixing issue due to changes in serialVersionUID after adding an additional field to Operation DTO. As a fix, serializationUID of the earlier revision of the class was included in the current code
2018-10-10 18:37:37 +05:30
Ace
deeeb2ce48
Persisting profile operations as string payloads and retriving same as strings, failing which as profile objects to support legacy functonality
2018-10-10 11:20:45 +05:30
Ace
a8e52ee781
Fixing issue due to change in serialVersionUID after adding additional field to Operation DTO and correcting flaw in notification sending logic
2018-10-09 13:57:02 +05:30
Ace
4b08dd6053
Fixing issue with notification sending logic
2018-10-06 15:46:47 +05:30
lasanthaDLPDS
7388bcadce
Merge master branch
2018-10-01 01:27:45 +05:30
Milan Perera
4c7bd0664d
Fix issue in order of get pending operations
2018-09-19 16:30:41 +05:30
geethkokila
4ded86a134
Add app manager osgi fixes
2018-09-19 15:55:11 +05:30
lasanthaDLPDS
f9ec82e4dc
Merge with upstream
2018-09-15 12:50:18 +05:30
charitha
fd8e73480d
Order by on operation mapping ID
2018-09-13 15:28:58 +05:30
charitha
7ea609612c
Revert "This is the fix for the intermittent issues when applying policies on devices"
...
This reverts commit ba8537e
2018-09-12 13:29:23 +05:30
Milan Perera
576fa40cb0
Modify addOperation logic to improve the performance
2018-09-12 11:10:55 +05:30
Milan Perera
77f7792bc7
Fix wso2/product-iots#1863
2018-09-12 11:00:12 +05:30
aselarbd
ba8537e198
This is the fix for the intermittent issues when applying policies on devices
...
Please find the GitHub issue from [1]
[1]: https://github.com/wso2/product-iots/issues/1833
2018-09-10 11:56:59 +05:30
geethkokila
2f428c8a58
Fix https://github.com/wso2/product-iots/issues/1857
...
Filtering the activities based on the user who added the operation
2018-08-30 18:01:12 +05:30
Geeth
f5515bfa5f
Merge pull request #1252 from abhishekdesilva/master
...
Checking for pending operations before adding an operation
2018-08-22 15:37:21 +05:30
abhishekdesilva
85040f0c68
Log debug process completion
2018-08-21 15:00:14 +05:30
abhishekdesilva
4aad82437b
Log info has changed into debug
2018-08-21 14:46:18 +05:30
abhishekdesilva
a0bc1cdd20
Reformatted the code block as necessary
2018-08-21 09:53:23 +05:30
lasanthaDLPDS
d293b5b1b8
Fix merge conflixts
2018-08-19 15:06:25 +05:30
geethkokila
7d34928ac5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-08-13 14:56:13 +05:30
