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
Madawa Soysa
9b5cb1ef6a
Fix issue with search not updating
...
Related: entgra/product-iots#6
2018-10-22 17:47:32 +11:00
Madawa Soysa
6aca4650e2
Introduce new API for user search based on user attributes
...
This commit introduces a new API to search users based on user claims such as First Name, Last Name, Email, etc. This new API can be used to filter users through a search query. Also this commit includes the UI modifications to modify the exiting user listing page to allow filter users by attributes.
Fixes to entgra/product-iots#6
2018-10-22 13:41:30 +11:00
Ace
3f77a3b27c
Adding correct tenant ID
2018-10-18 11:55:20 +05:30
Ace
92bf6f4140
Fixing formatting issues
2018-10-18 11:36:12 +05:30
Ace
b39be48919
Adding constants
2018-10-18 11:31:10 +05:30
Ace
4aee621039
Fixing tenanted username
2018-10-17 20:30:17 +05:30
Ace
1721824d53
Fixing issue where super tenant table space is querried instead of relavent tenant when retrieving geo location data
2018-10-17 16:49:29 +05:30
charitha
e12e7a3876
Add validation to event retrial
2018-09-30 21:57:29 +05:30
charitha
b5ce0fdd03
Merge branch 'iots-3.3.1' into entgra-master
2018-09-19 13:15:21 +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
charitha
e858f5b627
Merge remote-tracking branch 'entgra/master' into entgra-master
2018-08-13 12:21:24 +05:30
charitha
ead01f837d
Fixed issue in Geo fencing
2018-07-26 12:23:47 +05:30
charitha
2bfd598c67
Add location extraction from device properties and deice type specific location retrieval
2018-07-23 11:35:17 +05:30
Charitha Wijesinghe
d971c62009
Add device event filter API
...
See merge request entgra/carbon-device-mgt!2
2018-07-23 06:02:23 +00:00
lashanfaliq95
d843b71e1f
remove stack trace
2018-07-20 16:15:07 +05:30
lashanfaliq95
1fedf9650c
remove wildcard imports and log the error msg in filter api
2018-07-20 10:05:18 +05:30
lashanfaliq95
c8d0b10a38
update the device filter api
2018-07-16 18:08:52 +05:30
lashanfaliq95
3a7136abf9
complete the event filter
2018-07-15 10:58:09 +05:30
lashanfaliq95
e1ffd6341d
filter implementation which gets all records and based on the timestamp
2018-07-13 17:50:39 +05:30
lashanfaliq95
431342fd0f
filter implementation which gets all records
2018-07-11 19:51:12 +05:30
charitha
796acbda16
Add location extraction from device properties and deice type specific location retrieval
2018-07-11 10:28:14 +05:30
lashanfaliq95
c6a1508ee7
add the filter api
2018-07-11 09:26:01 +05:30
geethkokila
54fc0be69f
Fix the device information delete issue
2018-03-16 17:23:45 +05:30
charitha
f62cb4febd
Add missing media type
2018-03-16 01:46:41 +05:30
geethkokila
7aab14c07d
Fix the path parameter
2018-03-15 16:50:04 +05:30
Ruwan Yatawara
88924ac8d6
Correcting issue with events resource path
2018-03-15 14:31:44 +05:30
Rasika Perera
108675261f
Merge pull request #1193 from lashanfaliq95/master
...
Updated the last-known api to be able to return a number of records.
2018-03-14 15:14:07 +05:30
lashanfaliq95
d60b885045
changed the parameters "type" and "deviceId" as required for the last-know api.
2018-03-14 14:44:47 +05:30
lashanfaliq95
b4f78337fa
last-known api
...
updated the comment of the api and handled the error when a negative
value is passed as the limit.
2018-03-14 13:49:11 +05:30
Arcane94
50a14e4321
Requested changes
2018-03-14 12:05:21 +05:30
Arcane94
8c303911b0
Final frontend and backend changes
2018-03-14 12:05:21 +05:30
Arcane94
1ffaad6fb7
rolling back some imports
2018-03-14 11:59:54 +05:30
Arcane94
27ae7cfed8
Fix for adding alerts twice with same name bug
2018-03-14 11:57:01 +05:30
Arcane94
9e64c8971d
Minor changes in execution plans
2018-03-14 11:46:38 +05:30
Arcane94
7c88dfa0b3
Minor changes in backend APIs
2018-03-14 11:46:38 +05:30
Arcane94
7583957e16
Execution Plans and other updates
2018-03-14 11:46:38 +05:30
Arcane94
790f91b3b7
Add method overloads
2018-03-14 11:46:38 +05:30
geethkokila
ec3f814133
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-14 10:05:48 +05:30
Lashan Faliq
51753ebbbf
Merge branch 'master' into master
2018-03-13 14:48:50 +05:30
Arcane94
2fb5ec431a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-09 14:46:56 +05:30
shavidissa
b9cde9b936
Updated the swagger content - Groups ( #1211 )
...
* Updated the swagger content for the APIs used to add devices to groups
* Formatting the swagger content
2018-03-08 19:45:14 +05:30
geethkokila
9f9fd963a9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-08 10:22:36 +05:30
Shavindri Dissanayake
ead0e202d6
updating the swagger content
2018-03-07 19:34:45 +05:30
Arcane94
c0024ce26f
Exception name change and minor modifications
2018-03-05 10:42:26 +05:30
geethkokila
b50c657b6b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-05 10:09:22 +05:30
charitha
ab4f2b4833
Add response status to device property update API and improve db connection handling in device property update
2018-03-03 22:47:32 +05:30
geethkokila
b78e6d6d01
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-02-27 14:36:13 +05:30
Arcane94
50503fc7c0
Fixing the issue when defining alerts with same name
2018-02-24 15:15:36 +05:30
lashanfaliq95
7a1c17081b
fixed the issues
2018-02-23 18:15:15 +05:30
