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
WSO2 Builder
1bd160f551
[WSO2 Release] [Jenkins #3052 ] [Release 3.1.50] prepare for next development iteration
6 years ago
WSO2 Builder
b45aef9fec
[WSO2 Release] [Jenkins #3052 ] [Release 3.1.50] prepare release v3.1.50
6 years ago
WSO2 Builder
764b119ae5
[WSO2 Release] [Jenkins #3050 ] [Release 3.1.49] prepare for next development iteration
6 years ago
WSO2 Builder
1bbbce9ac3
[WSO2 Release] [Jenkins #3050 ] [Release 3.1.49] prepare release v3.1.49
6 years ago
WSO2 Builder
5005cebbff
[WSO2 Release] [Jenkins #3048 ] [Release 3.1.48] prepare for next development iteration
6 years ago
WSO2 Builder
5d688d8c4f
[WSO2 Release] [Jenkins #3048 ] [Release 3.1.48] prepare release v3.1.48
6 years ago
WSO2 Builder
a18b4550ef
[WSO2 Release] [Jenkins #3046 ] [Release 3.1.47] prepare for next development iteration
6 years ago
WSO2 Builder
9c77054795
[WSO2 Release] [Jenkins #3046 ] [Release 3.1.47] prepare release v3.1.47
6 years ago
Madawa Soysa
9b5cb1ef6a
Fix issue with search not updating
...
Related: entgra/product-iots#6
6 years ago
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
6 years ago
WSO2 Builder
8eaa7c6698
[WSO2 Release] [Jenkins #3044 ] [Release 3.1.46] prepare for next development iteration
6 years ago
WSO2 Builder
03b88248b8
[WSO2 Release] [Jenkins #3044 ] [Release 3.1.46] prepare release v3.1.46
6 years ago
WSO2 Builder
bfff9e7a7e
[WSO2 Release] [Jenkins #3042 ] [Release 3.1.45] prepare for next development iteration
6 years ago
WSO2 Builder
af64244ab3
[WSO2 Release] [Jenkins #3042 ] [Release 3.1.45] prepare release v3.1.45
6 years ago
Ace
3f77a3b27c
Adding correct tenant ID
6 years ago
Ace
92bf6f4140
Fixing formatting issues
6 years ago
Ace
b39be48919
Adding constants
6 years ago
Ace
8bc15e1f14
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
6 years ago
Ace
4aee621039
Fixing tenanted username
6 years ago
Ace
1721824d53
Fixing issue where super tenant table space is querried instead of relavent tenant when retrieving geo location data
6 years ago
WSO2 Builder
e7a9406789
[WSO2 Release] [Jenkins #3040 ] [Release 3.1.44] prepare for next development iteration
6 years ago
WSO2 Builder
b87b073739
[WSO2 Release] [Jenkins #3040 ] [Release 3.1.44] prepare release v3.1.44
6 years ago
WSO2 Builder
806ac13c39
[WSO2 Release] [Jenkins #3038 ] [Release 3.1.43] prepare for next development iteration
6 years ago
WSO2 Builder
e3901043fc
[WSO2 Release] [Jenkins #3038 ] [Release 3.1.43] prepare release v3.1.43
6 years ago
WSO2 Builder
3782e68f27
[WSO2 Release] [Jenkins #3036 ] [Release 3.1.42] prepare for next development iteration
6 years ago
WSO2 Builder
3111680b9f
[WSO2 Release] [Jenkins #3036 ] [Release 3.1.42] prepare release v3.1.42
6 years ago
WSO2 Builder
7186ed2f62
[WSO2 Release] [Jenkins #3034 ] [Release 3.1.41] prepare for next development iteration
6 years ago
WSO2 Builder
60aee974ff
[WSO2 Release] [Jenkins #3034 ] [Release 3.1.41] prepare release v3.1.41
6 years ago
lasanthaDLPDS
7388bcadce
Merge master branch
6 years ago
charitha
e12e7a3876
Add validation to event retrial
6 years ago
Ubuntu
e5cc5284e3
[maven-release-plugin] prepare for next development iteration
6 years ago
Ubuntu
ae078fe390
[maven-release-plugin] prepare release v3.2.0
6 years ago
charitha
034a15aa59
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
6 years ago
WSO2 Builder
353d6936db
[WSO2 Release] [Jenkins #3032 ] [Release 3.1.40] prepare for next development iteration
6 years ago
WSO2 Builder
8e2541b9ac
[WSO2 Release] [Jenkins #3032 ] [Release 3.1.40] prepare release v3.1.40
6 years ago
charitha
b5ce0fdd03
Merge branch 'iots-3.3.1' into entgra-master
6 years ago
lasanthaDLPDS
f9ec82e4dc
Merge with upstream
6 years ago
WSO2 Builder
01991dcc4d
[WSO2 Release] [Jenkins #3030 ] [Release 3.1.39] prepare for next development iteration
6 years ago
WSO2 Builder
18b81223df
[WSO2 Release] [Jenkins #3030 ] [Release 3.1.39] prepare release v3.1.39
6 years ago
WSO2 Builder
cbbd327a02
[WSO2 Release] [Jenkins #3028 ] [Release 3.1.38] prepare for next development iteration
6 years ago
WSO2 Builder
de07597d53
[WSO2 Release] [Jenkins #3028 ] [Release 3.1.38] prepare release v3.1.38
6 years ago
WSO2 Builder
3401a8c845
[WSO2 Release] [Jenkins #3026 ] [Release 3.1.37] prepare for next development iteration
6 years ago
WSO2 Builder
ecadadef94
[WSO2 Release] [Jenkins #3026 ] [Release 3.1.37] prepare release v3.1.37
6 years ago
geethkokila
2f428c8a58
Fix https://github.com/wso2/product-iots/issues/1857
...
Filtering the activities based on the user who added the operation
6 years ago
WSO2 Builder
2b6de6834b
[maven-release-plugin] prepare for next development iteration
6 years ago
WSO2 Builder
16c6a27f81
[maven-release-plugin] prepare release v3.1.36
6 years ago
WSO2 Builder
252b260237
[WSO2 Release] [Jenkins #3021 ] [Release 3.1.35] prepare for next development iteration
6 years ago
WSO2 Builder
a2422cb02a
[WSO2 Release] [Jenkins #3021 ] [Release 3.1.35] prepare release v3.1.35
6 years ago
WSO2 Builder
af7aa73886
[WSO2 Release] [Jenkins #3019 ] [Release 3.1.34] prepare for next development iteration
6 years ago
WSO2 Builder
47ed74c156
[WSO2 Release] [Jenkins #3019 ] [Release 3.1.34] prepare release v3.1.34
6 years ago
lasanthaDLPDS
d293b5b1b8
Fix merge conflixts
6 years ago
WSO2 Builder
4848e271af
[WSO2 Release] [Jenkins #3017 ] [Release 3.1.33] prepare for next development iteration
6 years ago
WSO2 Builder
c79baf3392
[WSO2 Release] [Jenkins #3017 ] [Release 3.1.33] prepare release v3.1.33
6 years ago
charitha
e858f5b627
Merge remote-tracking branch 'entgra/master' into entgra-master
6 years ago
WSO2 Builder
02282967ab
[WSO2 Release] [Jenkins #3015 ] [Release 3.1.32] prepare for next development iteration
6 years ago
WSO2 Builder
7daeb6efb9
[WSO2 Release] [Jenkins #3015 ] [Release 3.1.32] prepare release v3.1.32
6 years ago
charitha
47f619a136
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1
6 years ago
charitha
ead01f837d
Fixed issue in Geo fencing
6 years ago
WSO2 Builder
8da1bcb741
[WSO2 Release] [Jenkins #3011 ] [Release 3.1.31] prepare for next development iteration
6 years ago
WSO2 Builder
9c0cbdc983
[WSO2 Release] [Jenkins #3011 ] [Release 3.1.31] prepare release v3.1.31
6 years ago
charitha
2bfd598c67
Add location extraction from device properties and deice type specific location retrieval
6 years ago
Charitha Goonetilleke
d971c62009
Add device event filter API
...
See merge request entgra/carbon-device-mgt!2
6 years ago
lashanfaliq95
d843b71e1f
remove stack trace
6 years ago
lashanfaliq95
1fedf9650c
remove wildcard imports and log the error msg in filter api
7 years ago
lashanfaliq95
c8d0b10a38
update the device filter api
7 years ago
lashanfaliq95
3a7136abf9
complete the event filter
7 years ago
lashanfaliq95
e1ffd6341d
filter implementation which gets all records and based on the timestamp
7 years ago
lashanfaliq95
431342fd0f
filter implementation which gets all records
7 years ago
charitha
796acbda16
Add location extraction from device properties and deice type specific location retrieval
7 years ago
lashanfaliq95
c6a1508ee7
add the filter api
7 years ago
WSO2 Builder
0aec365dce
[WSO2 Release] [Jenkins #3009 ] [Release 3.1.30] prepare for next development iteration
7 years ago
WSO2 Builder
ca890ac346
[WSO2 Release] [Jenkins #3009 ] [Release 3.1.30] prepare release v3.1.30
7 years ago
WSO2 Builder
2e5db59398
[WSO2 Release] [Jenkins #3007 ] [Release 3.1.29] prepare for next development iteration
7 years ago
WSO2 Builder
964d92eb7f
[WSO2 Release] [Jenkins #3007 ] [Release 3.1.29] prepare release v3.1.29
7 years ago
WSO2 Builder
79d48bb1a8
[WSO2 Release] [Jenkins #3005 ] [Release 3.1.28] prepare for next development iteration
7 years ago
WSO2 Builder
f05750b794
[WSO2 Release] [Jenkins #3005 ] [Release 3.1.28] prepare release v3.1.28
7 years ago
WSO2 Builder
2fcb647957
[WSO2 Release] [Jenkins #3003 ] [Release 3.1.27] prepare for next development iteration
7 years ago
WSO2 Builder
2f519baf67
[WSO2 Release] [Jenkins #3003 ] [Release 3.1.27] prepare release v3.1.27
7 years ago
WSO2 Builder
7431cde12a
[WSO2 Release] [Jenkins #3001 ] [Release 3.1.26] prepare for next development iteration
7 years ago
WSO2 Builder
aa429e230c
[WSO2 Release] [Jenkins #3001 ] [Release 3.1.26] prepare release v3.1.26
7 years ago
WSO2 Builder
7620d7ea5d
[WSO2 Release] [Jenkins #2999 ] [Release 3.1.25] prepare for next development iteration
7 years ago
WSO2 Builder
5fd8aeef89
[WSO2 Release] [Jenkins #2999 ] [Release 3.1.25] prepare release v3.1.25
7 years ago
WSO2 Builder
3201dfcfa9
[WSO2 Release] [Jenkins #2996 ] [Release 3.1.24] prepare for next development iteration
7 years ago
WSO2 Builder
86000e93b2
[WSO2 Release] [Jenkins #2996 ] [Release 3.1.24] prepare release v3.1.24
7 years ago
WSO2 Builder
ac7e71282e
[WSO2 Release] [Jenkins #2994 ] [Release 3.1.23] prepare for next development iteration
7 years ago
WSO2 Builder
1c135b9e18
[WSO2 Release] [Jenkins #2994 ] [Release 3.1.23] prepare release v3.1.23
7 years ago
geethkokila
54fc0be69f
Fix the device information delete issue
7 years ago
WSO2 Builder
7dd3f29ff7
[WSO2 Release] [Jenkins #2992 ] [Release 3.1.22] prepare for next development iteration
7 years ago
WSO2 Builder
03dd153f6f
[WSO2 Release] [Jenkins #2992 ] [Release 3.1.22] prepare release v3.1.22
7 years ago
WSO2 Builder
db8a5afdf8
[WSO2 Release] [Jenkins #2990 ] [Release 3.1.21] prepare for next development iteration
7 years ago
WSO2 Builder
bb0c498b3a
[WSO2 Release] [Jenkins #2990 ] [Release 3.1.21] prepare release v3.1.21
7 years ago
WSO2 Builder
10cf201da7
[WSO2 Release] [Jenkins #2988 ] [Release 3.1.20] prepare for next development iteration
7 years ago
WSO2 Builder
2c73d73860
[WSO2 Release] [Jenkins #2988 ] [Release 3.1.20] prepare release v3.1.20
7 years ago
WSO2 Builder
790641a2aa
[WSO2 Release] [Jenkins #2987 ] [Release 3.1.19] prepare for next development iteration
7 years ago
WSO2 Builder
efb54864c6
[WSO2 Release] [Jenkins #2987 ] [Release 3.1.19] prepare release v3.1.19
7 years ago
WSO2 Builder
7fe945f1bf
[WSO2 Release] [Jenkins #2985 ] [Release 3.1.18] prepare for next development iteration
7 years ago
WSO2 Builder
555a349fd6
[WSO2 Release] [Jenkins #2985 ] [Release 3.1.18] prepare release v3.1.18
7 years ago
charitha
f62cb4febd
Add missing media type
7 years ago
WSO2 Builder
f7f13f2052
[WSO2 Release] [Jenkins #2983 ] [Release 3.1.17] prepare for next development iteration
7 years ago