lasanthaDLPDS
f6098a75af
Sync with upstream master
5 years ago
Pahansith Gunathilake
db8645e6c5
Add policy type
5 years ago
achala piyarathna
5b50cddea6
Device Location history view feature
5 years ago
Saad Sahibjan
d683d0c93f
Merge branch 'master' into 'master'
...
Fix incorrect device view issue for different ownerships.
Closes product-iots#135
See merge request entgra/carbon-device-mgt!273
5 years ago
lasanthaDLPDS
2d58d69d2f
Fix incorrect device view issue for different ownerships.
5 years ago
Charitha Goonetilleke
4e9628dff4
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new
5 years ago
Charitha Goonetilleke
2b902e878c
Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new
5 years ago
milanperera
576ccd2363
Fix issues in fix-172
5 years ago
milanperera
a044bbd385
fix entgra/product-iots#172
5 years ago
ausamriyaaz
2c27830ecc
Fix Null pointer exception
5 years ago
Shamalka Navod
59188bcdb3
Fix error logs of DAO implementations
5 years ago
Charitha Goonetilleke
20dd0b88d2
Merge branch 'application-mgt-new' of https://gitlab.com/charithag/carbon-device-mgt into application-mgt-new
5 years ago
Charitha Goonetilleke
c29dc4dddb
Merge branch 'master' into 'application-mgt-new'
...
Changing status related APIs to honour tenant ID
See merge request charithag/carbon-device-mgt!1
5 years ago
Charitha Goonetilleke
bfed11080d
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new
5 years ago
Shamalka Navod
c5793bcf67
API endpoint to get all devices which are enrolled between two dates
5 years ago
Vinojini Paramasivam
8b61bbabea
Change search by group name to case insensitive
5 years ago
Ace
545ca7e2a2
Changing status related APIs to honour tenant ID
5 years ago
Charitha Goonetilleke
738c4991b9
Merge with upstream/master
5 years ago
Amanda Randombage
ff2c038688
Modify permanent delete API to support list of devices
5 years ago
Ace
647099f8a9
Adding debug logs to query-devices API
5 years ago
Ace
8086a54a1a
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
5 years ago
Ace
7838eaf97b
Modifying group devices API to retrieve properties
5 years ago
Charitha Goonetilleke
5cf89ec24c
Add application installation response via pull notification
5 years ago
Charitha Goonetilleke
919eeab2d8
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new
5 years ago
Charitha Goonetilleke
c3490c129a
Fix issue in deploying event streams
5 years ago
lasanthaDLPDS
cfd0f709ef
Add new application type
...
Add new application type for IoT use cases. Further, it is named as CUSTOM
5 years ago
Ace
fc03c404ad
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
5 years ago
lasanthaDLPDS
bf67894924
Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new
5 years ago
lasanthaDLPDS
cebc18bef6
Fix server starting issue
...
This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
5 years ago
Ace
def206d17e
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
5 years ago
Ace
82447ef865
Fixing issues with query-devices
5 years ago
Charitha Goonetilleke
11e6e11714
Merge branch 'master' into 'master'
...
Sort device analytics data
Closes product-iots#140
See merge request entgra/carbon-device-mgt!238
5 years ago
lasanthaDLPDS
a41b5313a0
Fix merge conflicts
5 years ago
Turcy
e33f28bf8a
Sort device analytics data
5 years ago
Yohan Avishke
234c2ee104
Resolve issue with wrong license header
5 years ago
Yohan Avishke
3dff9fef80
Create Endpoints to deploy DAS artifacts as Strings
...
Four new endpoints were created to deploy DAS artifacts. These apis will accept JSON payloads and convert them to Strings and will use those to deploy artifacts. These endpoints are different from the existing endpoints due to accepting different payloads and using different stubs to deploy.
5 years ago
Yohan Avishke
bed68289b5
Make stream persisting optional
...
At the moment of creating a stream it will be persisted by default. This was made a optional choice by using a query flag through this commit.
5 years ago
Yohan Avishke
35b03d387c
fix: Change in file name
...
File name of AttributeDataType was changed to AttributeType to resolve some conflicts with import statements.
5 years ago
Yohan Avishke
6def2e1efa
Merge branch 'master' of https://gitlab.com/YohanAvishke/carbon-device-mgt
5 years ago
Yohan Avishke
bdf74ac041
API to integrate functionality of DAS
...
Four endpoints to publish stream, receiver, publisher and siddhi script were added to the device.mgt.api. This commit contains implementation of the above end points, jax-rs beans, custom exceptions and common methods used for the endpoints.
These changes were done in order to decouple the DAS ui from Entgra products.
These endpoints will function by consuming JSON payloads to, generate custom artifacts and deploying them depending on the payload.
BREAKING CHANGE: Four endpoints to publish stream, receiver, publisher and siddhi script were added to the device.mgt.api
5 years ago
lasanthaDLPDS
40ec702334
Merge with upstream
5 years ago
Saad Sahibjan
dd4a31beb7
Log and set message in response whend device not found to delete
5 years ago
Saad Sahibjan
1c825af79d
Move delete device permanently to device-mgt admin API
5 years ago
Charitha Goonetilleke
bb82eb7236
Fix issue in IoT device type loading
5 years ago
lasanthaDLPDS
4e23dbf5af
Merge with upstream master
5 years ago
lasanthaDLPDS
9d9f420c83
Fix formatting issues
5 years ago
lasanthaDLPDS
f24cc4342f
Merge with master branch
6 years ago
Entgra Builder
3c4ef275f1
[maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder
03703b83eb
[maven-release-plugin] prepare release v3.2.8
6 years ago
Entgra Builder
fc7cf05e90
[maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder
93c53c8748
[maven-release-plugin] prepare release v3.2.7
6 years ago
Ruwan Yatawara
cd4373b352
Merge branch 'master' into 'master'
...
Adding new API to search devices based on device properties
See merge request entgra/carbon-device-mgt!162
6 years ago
Ace
192984e3c0
Adding new API to search devices based on device properties
6 years ago
lasanthaDLPDS
7f0be5f28b
Merge with upstream master
6 years ago
Inosh Perara
13960f77c9
add device type versioning APIs
6 years ago
Milan Perera
650f02bf03
Add user created date and modified date
6 years ago
Entgra Builder
5a6789e336
[maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder
c71b1f9314
[maven-release-plugin] prepare release v3.2.6
6 years ago
Saad Sahibjan
1f001b09f1
Fix tests related to deleteDevice API
6 years ago
Saad Sahibjan
be1bee9b9a
Modify delete device API to have permanentDelete query parameter
6 years ago
Entgra Builder
2d05e04a16
[maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder
84df5dd4bf
[maven-release-plugin] prepare release v3.2.5
6 years ago
Dharmakeerthi Lasantha
52c7a7ecdd
Improve app subscription functionality
...
Further integrate app management component with device mgt
6 years ago
Madawa Soysa
a285898782
Modify the Feature Specification Structure and Modify {deviceType}/features API
...
Related to entgra/product-iots#37
6 years ago
Asanka Kumara
b863d2fa5e
Get Device By ID API
6 years ago
Pahansith Gunathilake
920a66a165
Fix user creation password auto generation
6 years ago
lasanthaDLPDS
06e9591e36
Fix device-mgt operation log displaying issue
6 years ago
lasanthaDLPDS
efa17d2e51
Merge with upstream master
6 years ago
Charitha Goonetilleke
ca83635f13
Fix log issue in test cases
6 years ago
Charitha Goonetilleke
0c471fbb0b
Add capability to store device type specific platform configurations for any device type
6 years ago
lasanthaDLPDS
84e3beb6f6
Fix merge conflicts
6 years ago
Entgra Builder
54b0a0afd0
[maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder
6dd8ca9484
[maven-release-plugin] prepare release v3.2.4
6 years ago
Entgra Builder
14337bb884
[maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder
736ce76df6
[maven-release-plugin] prepare release v3.2.3
6 years ago
lasanthaDLPDS
12d46550e6
Fix requested changes in the review
6 years ago
lasanthaDLPDS
cc989148d6
Add an API to update the device owner for given device identifiers.
...
Further, add an API to get device activities without passing the username. Username is retrieved from the carbon context.
6 years ago
Entgra Builder
65eb70139b
[maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder
6bbbbdc18b
[maven-release-plugin] prepare release v3.2.2
6 years ago
lasanthaDLPDS
98d14b0815
Fix merge conflicts
6 years ago
Saad Sahibjan
a9a01c045e
Add copy commands to copy UserValidateManagement and OAuth2TokenManagement synapse APIs to IoTs pack
6 years ago
lasanthaDLPDS
c4c92f0faa
Adding application management initial pub UI
6 years ago
Charitha Goonetilleke
026bd175e9
Reformat & fix API publishing issue to Gateway
6 years ago
Charitha Goonetilleke
8b34253bc1
Optimize functionality
6 years ago
Charitha Goonetilleke
3d42175bea
Merge branch 'master' of https://gitlab.com/ruwany.ace/carbon-device-mgt into entgra-master
6 years ago
Ace
18078c51e8
bug fixes
6 years ago
Ace
59186155d0
Adding new apis to update devices status/get count/get list based on status
6 years ago
lasanthaDLPDS
8841741567
Fiz merge conflicts
6 years ago
Entgra Builder
cbe85378d8
[maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder
4b1f83b168
[maven-release-plugin] prepare release v3.2.1
6 years ago
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
7 years ago
WSO2 Builder
8da1bcb741
[WSO2 Release] [Jenkins #3011 ] [Release 3.1.31] prepare for next development iteration
7 years ago
WSO2 Builder
9c0cbdc983
[WSO2 Release] [Jenkins #3011 ] [Release 3.1.31] prepare release v3.1.31
7 years ago
charitha
2bfd598c67
Add location extraction from device properties and deice type specific location retrieval
7 years ago
Charitha Goonetilleke
d971c62009
Add device event filter API
...
See merge request entgra/carbon-device-mgt!2
7 years ago
lashanfaliq95
d843b71e1f
remove stack trace
7 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
WSO2 Builder
d44ac973cb
[WSO2 Release] [Jenkins #2983 ] [Release 3.1.17] prepare release v3.1.17
7 years ago
WSO2 Builder
a51a3cd6a4
[WSO2 Release] [Jenkins #2981 ] [Release 3.1.16] prepare for next development iteration
7 years ago
WSO2 Builder
f416cecb9e
[WSO2 Release] [Jenkins #2981 ] [Release 3.1.16] prepare release v3.1.16
7 years ago
WSO2 Builder
41358a41a5
[WSO2 Release] [Jenkins #2979 ] [Release 3.1.15] prepare for next development iteration
7 years ago
WSO2 Builder
d679faecca
[WSO2 Release] [Jenkins #2979 ] [Release 3.1.15] prepare release v3.1.15
7 years ago
geethkokila
7aab14c07d
Fix the path parameter
7 years ago
WSO2 Builder
5a1b4b154e
[WSO2 Release] [Jenkins #2977 ] [Release 3.1.14] prepare for next development iteration
7 years ago
WSO2 Builder
50232e10a5
[WSO2 Release] [Jenkins #2977 ] [Release 3.1.14] prepare release v3.1.14
7 years ago
Ruwan Yatawara
88924ac8d6
Correcting issue with events resource path
7 years ago
WSO2 Builder
f265ddc736
[WSO2 Release] [Jenkins #2975 ] [Release 3.1.13] prepare for next development iteration
7 years ago
WSO2 Builder
221fb27c6c
[WSO2 Release] [Jenkins #2975 ] [Release 3.1.13] prepare release v3.1.13
7 years ago
WSO2 Builder
7d1183274d
[WSO2 Release] [Jenkins #2973 ] [Release 3.1.12] prepare for next development iteration
7 years ago
WSO2 Builder
1e875dc00b
[WSO2 Release] [Jenkins #2973 ] [Release 3.1.12] prepare release v3.1.12
7 years ago
WSO2 Builder
1c3bca244a
[WSO2 Release] [Jenkins #2971 ] [Release 3.1.11] prepare for next development iteration
7 years ago
WSO2 Builder
4140ba7e76
[WSO2 Release] [Jenkins #2971 ] [Release 3.1.11] prepare release v3.1.11
7 years ago
WSO2 Builder
d2163025f2
[WSO2 Release] [Jenkins #2969 ] [Release 3.1.10] prepare for next development iteration
7 years ago
WSO2 Builder
494b4db66b
[WSO2 Release] [Jenkins #2969 ] [Release 3.1.10] prepare release v3.1.10
7 years ago
WSO2 Builder
31f11433bb
[WSO2 Release] [Jenkins #2967 ] [Release 3.1.9] prepare for next development iteration
7 years ago
WSO2 Builder
a3773032ce
[WSO2 Release] [Jenkins #2967 ] [Release 3.1.9] prepare release v3.1.9
7 years ago
WSO2 Builder
fa014fb838
[WSO2 Release] [Jenkins #2965 ] [Release 3.1.8] prepare for next development iteration
7 years ago
WSO2 Builder
e2218ed497
[WSO2 Release] [Jenkins #2965 ] [Release 3.1.8] prepare release v3.1.8
7 years ago
WSO2 Builder
eac2de37b2
Merge commit 'a73300b693013ab64bdf11dab9f626e4837eec04' into 34580e6a-6593-4c6a-8b11-5da48c102194
7 years ago
WSO2 Builder
a73300b693
[WSO2 Release] [Jenkins #2964 ] [Release 3.1.7] prepare for next development iteration
7 years ago
WSO2 Builder
fa5300cec1
[WSO2 Release] [Jenkins #2964 ] [Release 3.1.7] prepare release v3.1.7
7 years ago
Rasika Perera
108675261f
Merge pull request #1193 from lashanfaliq95/master
...
Updated the last-known api to be able to return a number of records.
7 years ago
WSO2 Builder
8282e69e12
Merge commit '46c4111b1dbaf85b9c413254f376c651488a5f57' into e61b2ead-a0d6-41af-8fb3-d2c404e569e2
7 years ago
lashanfaliq95
d60b885045
changed the parameters "type" and "deviceId" as required for the last-know api.
7 years ago
WSO2 Builder
46c4111b1d
[WSO2 Release] [Jenkins #2963 ] [Release 3.1.6] prepare for next development iteration
7 years ago
WSO2 Builder
28ec21a4f3
[WSO2 Release] [Jenkins #2963 ] [Release 3.1.6] prepare release v3.1.6
7 years ago
Rasika Perera
815cea8ab1
Merge pull request #1215 from Arcane94/geoFencing
...
Adding geofencing feature to geo devices dashboard
7 years ago
lashanfaliq95
b4f78337fa
last-known api
...
updated the comment of the api and handled the error when a negative
value is passed as the limit.
7 years ago
Arcane94
50a14e4321
Requested changes
7 years ago
Arcane94
8c303911b0
Final frontend and backend changes
7 years ago
Arcane94
1ffaad6fb7
rolling back some imports
7 years ago
Arcane94
27ae7cfed8
Fix for adding alerts twice with same name bug
7 years ago
Arcane94
9e64c8971d
Minor changes in execution plans
7 years ago
Arcane94
7c88dfa0b3
Minor changes in backend APIs
7 years ago
Arcane94
7583957e16
Execution Plans and other updates
7 years ago
Arcane94
790f91b3b7
Add method overloads
7 years ago
WSO2 Builder
10f32aa150
[WSO2 Release] [Jenkins #2961 ] [Release 3.1.5] prepare for next development iteration
7 years ago
WSO2 Builder
b2c969ef85
[WSO2 Release] [Jenkins #2961 ] [Release 3.1.5] prepare release v3.1.5
7 years ago
Charitha Goonetilleke
6922a8693f
Merge pull request #1221 from geethkokila/master
...
Add GDPR fixes
7 years ago
WSO2 Builder
ffb28d018b
[WSO2 Release] [Jenkins #2959 ] [Release 3.1.4] prepare for next development iteration
7 years ago
WSO2 Builder
66591d3680
[WSO2 Release] [Jenkins #2959 ] [Release 3.1.4] prepare release v3.1.4
7 years ago
geethkokila
ec3f814133
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
Charitha Goonetilleke
329e41b04c
Merge pull request #1197 from Arcane94/master
...
Fixed https://github.com/wso2/carbon-device-mgt/issues/1194
7 years ago
Lashan Faliq
51753ebbbf
Merge branch 'master' into master
7 years ago
WSO2 Builder
0f272ff4ed
[WSO2 Release] [Jenkins #2954 ] [Release 3.1.3] prepare for next development iteration
7 years ago
WSO2 Builder
ac9d20af2f
[WSO2 Release] [Jenkins #2954 ] [Release 3.1.3] prepare release v3.1.3
7 years ago
WSO2 Builder
bbe144e25f
[WSO2 Release] [Jenkins #2952 ] [Release 3.1.2] prepare for next development iteration
7 years ago
WSO2 Builder
7ee1bdacb6
[WSO2 Release] [Jenkins #2952 ] [Release 3.1.2] prepare release v3.1.2
7 years ago
WSO2 Builder
b31c31b410
[WSO2 Release] [Jenkins #2951 ] [Release 3.1.1] prepare for next development iteration
7 years ago
WSO2 Builder
ab8cd3f8e3
[WSO2 Release] [Jenkins #2951 ] [Release 3.1.1] prepare release v3.1.1
7 years ago
WSO2 Builder
748798df4c
[WSO2 Release] [Jenkins #2949 ] [Release 3.1.0] prepare for next development iteration
7 years ago
WSO2 Builder
e0704671de
[WSO2 Release] [Jenkins #2949 ] [Release 3.1.0] prepare release v3.1.0
7 years ago
geethkokila
71f1ff96e6
Update device-mgt component version (3.1.0)
7 years ago
WSO2 Builder
9ba315217c
[WSO2 Release] [Jenkins #2947 ] [Release 3.0.244] prepare for next development iteration
7 years ago
WSO2 Builder
96ee898b50
[WSO2 Release] [Jenkins #2947 ] [Release 3.0.244] prepare release v3.0.244
7 years ago
WSO2 Builder
93422ae12d
[WSO2 Release] [Jenkins #2945 ] [Release 3.0.243] prepare for next development iteration
7 years ago
WSO2 Builder
e4bc050806
[WSO2 Release] [Jenkins #2945 ] [Release 3.0.243] prepare release v3.0.243
7 years ago
Arcane94
2fb5ec431a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder
873bff0042
[WSO2 Release] [Jenkins #2943 ] [Release 3.0.242] prepare for next development iteration
7 years ago
WSO2 Builder
8b63813d84
[WSO2 Release] [Jenkins #2943 ] [Release 3.0.242] prepare release v3.0.242
7 years ago
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
7 years ago
geethkokila
9f9fd963a9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder
997bf0d16b
[WSO2 Release] [Jenkins #2941 ] [Release 3.0.241] prepare for next development iteration
7 years ago
WSO2 Builder
aabdc33dc1
[WSO2 Release] [Jenkins #2941 ] [Release 3.0.241] prepare release v3.0.241
7 years ago
Shavindri Dissanayake
ead0e202d6
updating the swagger content
7 years ago
Arcane94
c0024ce26f
Exception name change and minor modifications
7 years ago
geethkokila
b50c657b6b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder
af430cba61
[WSO2 Release] [Jenkins #2939 ] [Release 3.0.240] prepare for next development iteration
7 years ago
WSO2 Builder
60190f36ef
[WSO2 Release] [Jenkins #2939 ] [Release 3.0.240] prepare release v3.0.240
7 years ago
charitha
ab4f2b4833
Add response status to device property update API and improve db connection handling in device property update
7 years ago
WSO2 Builder
cafbfebfb1
[WSO2 Release] [Jenkins #2937 ] [Release 3.0.239] prepare for next development iteration
7 years ago
WSO2 Builder
08e9f918cf
[WSO2 Release] [Jenkins #2937 ] [Release 3.0.239] prepare release v3.0.239
7 years ago
WSO2 Builder
ce73acb26e
[WSO2 Release] [Jenkins #2935 ] [Release 3.0.238] prepare for next development iteration
7 years ago
WSO2 Builder
15de1dfd83
[WSO2 Release] [Jenkins #2935 ] [Release 3.0.238] prepare release v3.0.238
7 years ago
geethkokila
5fdf91d4ef
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder
0bbdf7a65f
[WSO2 Release] [Jenkins #2933 ] [Release 3.0.237] prepare for next development iteration
7 years ago
WSO2 Builder
13e63e41ac
[WSO2 Release] [Jenkins #2933 ] [Release 3.0.237] prepare release v3.0.237
7 years ago
WSO2 Builder
9a06578ac2
[WSO2 Release] [Jenkins #2931 ] [Release 3.0.236] prepare for next development iteration
7 years ago
WSO2 Builder
5d36bd5312
[WSO2 Release] [Jenkins #2931 ] [Release 3.0.236] prepare release v3.0.236
7 years ago
WSO2 Builder
b7e85c213b
[WSO2 Release] [Jenkins #2929 ] [Release 3.0.235] prepare for next development iteration
7 years ago
WSO2 Builder
b70e0252c4
[WSO2 Release] [Jenkins #2929 ] [Release 3.0.235] prepare release v3.0.235
7 years ago
WSO2 Builder
d2f18ddbc9
[WSO2 Release] [Jenkins #2927 ] [Release 3.0.234] prepare for next development iteration
7 years ago
WSO2 Builder
8f1f8eefe4
[WSO2 Release] [Jenkins #2927 ] [Release 3.0.234] prepare release v3.0.234
7 years ago
WSO2 Builder
30bb2a8665
[WSO2 Release] [Jenkins #2926 ] [Release 3.0.233] prepare for next development iteration
7 years ago
WSO2 Builder
a325b3c6c0
[WSO2 Release] [Jenkins #2926 ] [Release 3.0.233] prepare release v3.0.233
7 years ago
WSO2 Builder
8a06a494c4
[WSO2 Release] [Jenkins #2924 ] [Release 3.0.232] prepare for next development iteration
7 years ago
WSO2 Builder
f7e3cd9c3c
[WSO2 Release] [Jenkins #2924 ] [Release 3.0.232] prepare release v3.0.232
7 years ago
geethkokila
b78e6d6d01
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
Arcane94
50503fc7c0
Fixing the issue when defining alerts with same name
7 years ago
lashanfaliq95
7a1c17081b
fixed the issues
7 years ago
WSO2 Builder
6b99197b54
[WSO2 Release] [Jenkins #2922 ] [Release 3.0.231] prepare for next development iteration
7 years ago
WSO2 Builder
313918c656
[WSO2 Release] [Jenkins #2922 ] [Release 3.0.231] prepare release v3.0.231
7 years ago
WSO2 Builder
13a116c7e3
Merge commit 'f0cbe36ebee1f2dde088a9f70d9009350d998775' into c95329e5-bd9c-4d79-820a-d63940dc2c8c
7 years ago
Madawa Soysa
de9480e721
Merge pull request #1196 from lasanthaDLPDS/master
...
Formatting device-location API
7 years ago
WSO2 Builder
f0cbe36ebe
[WSO2 Release] [Jenkins #2921 ] [Release 3.0.230] prepare for next development iteration
7 years ago
WSO2 Builder
a688f56892
[WSO2 Release] [Jenkins #2921 ] [Release 3.0.230] prepare release v3.0.230
7 years ago
Kamidu Sachith Punchihewa
22929c3886
Merge pull request #1192 from Kamidu/master
...
Enable user's last name in the email template
7 years ago
lasantha
175c987b8a
formatting device-location API
7 years ago
lashanfaliq95
65cfca7024
Updated the last-known api to be able to return a number of records.
7 years ago
geethkokila
2c0ca5c210
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder
12e8639907
[WSO2 Release] [Jenkins #2919 ] [Release 3.0.229] prepare for next development iteration
7 years ago
WSO2 Builder
4f364288c5
[WSO2 Release] [Jenkins #2919 ] [Release 3.0.229] prepare release v3.0.229
7 years ago
kamidu
66a4e60b16
Enable user's last name in the email template
...
This is to enable the user's last name also to be included in the meta information list on email templates. When customizing the email template users can define to include both fist and last name to the content or title of the email
7 years ago
geethkokila
8cf1bd996c
Adding the privacy api
...
This is has an api to delete device of users when they request
7 years ago
WSO2 Builder
5851c43e3f
[WSO2 Release] [Jenkins #2917 ] [Release 3.0.228] prepare for next development iteration
7 years ago
WSO2 Builder
9e5ecfe204
[WSO2 Release] [Jenkins #2917 ] [Release 3.0.228] prepare release v3.0.228
7 years ago
WSO2 Builder
a29736e09e
[WSO2 Release] [Jenkins #2915 ] [Release 3.0.227] prepare for next development iteration
7 years ago