Charitha Goonetilleke
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
6 years ago
1bd160f551
[WSO2 Release] [Jenkins #3052 ] [Release 3.1.50] prepare for next development iteration
6 years ago
b45aef9fec
[WSO2 Release] [Jenkins #3052 ] [Release 3.1.50] prepare release v3.1.50
6 years ago
4d67016736
Merge pull request #1271 from charithag/master
...
Fixed https://github.com/wso2/product-iots/issues/1184
6 years ago
Charitha Goonetilleke
86029752f8
Fixed https://github.com/wso2/product-iots/issues/1184
6 years ago
Charitha Goonetilleke
e25d536210
Introduce new API for user search based on user attributes
...
Closes product-iots#6
See merge request entgra/carbon-device-mgt!31
6 years ago
c05d85646e
Merge branch 'improve-device-search' into 'master'
...
Fix issues with Advanced Device Search
Closes product-iots#8 and product-iots#7
See merge request entgra/carbon-device-mgt!32
6 years ago
764b119ae5
[WSO2 Release] [Jenkins #3050 ] [Release 3.1.49] prepare for next development iteration
6 years ago
1bbbce9ac3
[WSO2 Release] [Jenkins #3050 ] [Release 3.1.49] prepare release v3.1.49
6 years ago
ebb51a11da
Merge pull request #1270 from geethkokila/master
...
Fixing the SQL
6 years ago
2bb3e2cdc0
Fixing the SQL
6 years ago
5005cebbff
[WSO2 Release] [Jenkins #3048 ] [Release 3.1.48] prepare for next development iteration
6 years ago
5d688d8c4f
[WSO2 Release] [Jenkins #3048 ] [Release 3.1.48] prepare release v3.1.48
6 years ago
dbf102f6ae
Merge pull request #1269 from lasanthaDLPDS/master
...
Fix device monitoring task disabling issue
6 years ago
e76fe92ebe
Fix device monitoring task disabling issue
6 years ago
6795cbb180
Add IMEI parameter to custom parameters of the advanced search
...
Fixes entgra/product-iots#8
6 years ago
5300a7f363
Fix device advanced search
...
Device search button was not functioning due to a id mismatch. This
commit fixes the issue.
Fixes entgra/product-iots#7
6 years ago
a18b4550ef
[WSO2 Release] [Jenkins #3046 ] [Release 3.1.47] prepare for next development iteration
6 years ago
9c77054795
[WSO2 Release] [Jenkins #3046 ] [Release 3.1.47] prepare release v3.1.47
6 years ago
6fafde1d16
Merge pull request #1268 from charithag/master
...
Fixed NPE in sending push notifications
6 years ago
9b5cb1ef6a
Fix issue with search not updating
...
Related: entgra/product-iots#6
6 years ago
Charitha Goonetilleke
128b5f64aa
Fixed NPE in sending push notifications
6 years ago
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
6 years ago
8eaa7c6698
[WSO2 Release] [Jenkins #3044 ] [Release 3.1.46] prepare for next development iteration
6 years ago
03b88248b8
[WSO2 Release] [Jenkins #3044 ] [Release 3.1.46] prepare release v3.1.46
6 years ago
5cec8ae8d5
Merge pull request #1267 from charithag/master
...
Fixed issue in deploying execution plans as non admin user
6 years ago
Charitha Goonetilleke
3856a25449
Fixed authentication issue in deploying execution plans as non admin user
6 years ago
bfff9e7a7e
[WSO2 Release] [Jenkins #3042 ] [Release 3.1.45] prepare for next development iteration
6 years ago
af64244ab3
[WSO2 Release] [Jenkins #3042 ] [Release 3.1.45] prepare release v3.1.45
6 years ago
866ca72416
Merge pull request #1266 from ruwany/master
...
Fixing issue with retrieving tenant aware username when retrieving geo location info
6 years ago
3f77a3b27c
Adding correct tenant ID
6 years ago
92bf6f4140
Fixing formatting issues
6 years ago
b39be48919
Adding constants
6 years ago
8bc15e1f14
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
6 years ago
4aee621039
Fixing tenanted username
6 years ago
1721824d53
Fixing issue where super tenant table space is querried instead of relavent tenant when retrieving geo location data
6 years ago
a01886cb37
Handle NotNow response from device
6 years ago
e7a9406789
[WSO2 Release] [Jenkins #3040 ] [Release 3.1.44] prepare for next development iteration
6 years ago
b87b073739
[WSO2 Release] [Jenkins #3040 ] [Release 3.1.44] prepare release v3.1.44
6 years ago
e52675feef
Merge pull request #1265 from milanperera/notnow-wso2-fix
...
Handle NotNow response from device
6 years ago
b256d55847
Handle NotNow response from device
6 years ago
Charitha Goonetilleke
61e5cd4b53
Merge branch 'master' into 'master'
...
Persisting profile operations as string values instead of Objects
See merge request entgra/carbon-device-mgt!30
6 years ago
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
6 years ago
f06f83adda
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
6 years ago
806ac13c39
[WSO2 Release] [Jenkins #3038 ] [Release 3.1.43] prepare for next development iteration
6 years ago
e3901043fc
[WSO2 Release] [Jenkins #3038 ] [Release 3.1.43] prepare release v3.1.43
6 years ago
5ee7cba36a
Merge pull request #1264 from ruwany/master
...
Persisting profile operations as string values instead of Objects
6 years ago
cb0fb87b49
Fixing test failures and adding enhancements
6 years ago
4b71c6ec40
Operation retrieval logic changed to retrieve operation details via table merge instead of secondary DB call
6 years ago
de9cf67977
fixing issues with notification status not getting updated
6 years ago
Charitha Goonetilleke
WSO2 Builder
Geeth
Ruwan Yatawara
inoshperera
lasanthaDLPDS
Madawa Soysa
Hasunie
Milan Perera