Commit Graph

4628 Commits

Author SHA1 Message Date
Ace
def206d17e Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-11 16:18:27 +05:30
Ace
82447ef865 Fixing issues with query-devices 2019-09-11 16:18:13 +05:30
Charitha Goonetilleke
11e6e11714 Merge branch 'master' into 'master'
Sort device analytics data

Closes product-iots#140

See merge request entgra/carbon-device-mgt!238
2019-09-11 06:23:21 +00:00
Dharmakeerthi Lasantha
65c462bcd3 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt!240
2019-09-10 15:29:30 +00:00
lasanthaDLPDS
b3860d502e Fix build failure 2019-09-10 20:15:55 +05:30
lasanthaDLPDS
a41b5313a0 Fix merge conflicts 2019-09-10 19:11:37 +05:30
Turcy
e33f28bf8a Sort device analytics data 2019-09-09 23:49:24 +05:30
Charitha Goonetilleke
71488410d4 Merge branch 'master' into 'master'
Rest api to deploy DAS components

See merge request entgra/carbon-device-mgt!226
2019-09-09 15:03:49 +00:00
Yohan Avishke
234c2ee104 Resolve issue with wrong license header 2019-09-09 20:08:33 +05:30
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.
2019-09-09 19:51:40 +05:30
Turcy
0af18b0255 Make device analytics timestamp human-readable 2019-09-05 16:27:37 +05:30
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.
2019-09-02 10:10:22 +05:30
Yohan Avishke
35b03d387c fix: Change in file name
File name of AttributeDataType was changed to AttributeType to resolve some conflicts with import statements.
2019-09-02 00:47:25 +05:30
Yohan Avishke
6def2e1efa Merge branch 'master' of https://gitlab.com/YohanAvishke/carbon-device-mgt 2019-09-02 00:05:32 +05:30
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
2019-09-01 23:57:51 +05:30
Ace
48a0801faf Fixing test failures 2019-08-30 15:24:19 +05:30
Ace
91746c4d04 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-08-30 12:44:42 +05:30
Ace
5f3c069694 introducing a group properties table & ability to add/remove group properties 2019-08-30 12:42:09 +05:30
charitha
5c9c0d3ddf Fix missing operation id in mqtt operation topic 2019-08-30 10:57:37 +05:30
Ruwan Yatawara
ff7ec02bcb removing font-wso2 and adding font-entgra 2019-08-29 08:00:32 +00:00
Saad Sahibjan
91617a6dbb Modify enrollment app install policy to support new app manager 2019-08-29 13:22:18 +05:30
Ace
a2d349fa92 fixing license headers 2019-08-29 13:01:00 +05:30
Pahansith
c940cc03a0 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into configuration-endpoint 2019-08-29 10:52:20 +05:30
Pahansith
3ae5339eff Add device identifier for configuration retrieval endpoint 2019-08-29 10:51:49 +05:30
Ace
749db4e5ac removing references to font-wso2 and updating same to font-entgra 2019-08-28 17:53:53 +05:30
Ace
f6e89d9bef Adding new entgra-theme 2019-08-28 14:07:56 +05:30
Ace
4040d95eaa removing font-wso2-1.3.0 and adding font-entgra-1.4.0 with fresh icons 2019-08-28 13:45:15 +05:30
lasanthaDLPDS
5421c1c38b Fix operation DTO initializing issue 2019-08-28 13:16:54 +05:30
nipunnadeen
05e4da1780 Fix the responsive issues of the device-mgt react app 2019-08-28 10:21:36 +05:30
Pahansith
f01448d396 Change http method to get 2019-08-27 23:16:43 +05:30
Pahansith
a3f44b43b4 Add configuration retrieve endpoint 2019-08-27 12:44:40 +05:30
nipunnadeen
6e71482270 Add the copyright notice to device-mgt react app 2019-08-27 11:38:36 +05:30
nipunnadeen
dbfe6b308b Change the artifactId of the device-mgt pom.xml file 2019-08-26 15:17:40 +05:30
Dharmakeerthi Lasantha
e3a8c85c9b Merge branch 'application-mgt-new' into 'application-mgt-new'
Add navbar to device mgt reat app

See merge request entgra/carbon-device-mgt!213
2019-08-23 12:11:14 +00:00
Jayasanka
d7b290acf6 Add nav bar to device mgt reat app 2019-08-23 14:32:31 +05:30
Dharmakeerthi Lasantha
a4f1bed325 Merge branch 'application-mgt-new' into 'application-mgt-new'
Application mgt new

See merge request entgra/carbon-device-mgt!212
2019-08-22 15:00:18 +00:00
Jayasanka
c417b9708c Add react device-mgt device view page 2019-08-22 20:22:32 +05:30
Jayasanka
cc9e034edd Add react device-mgt device view page 2019-08-22 19:58:22 +05:30
lasanthaDLPDS
76b4953e3a Add device-mgt react ui feature 2019-08-22 18:29:56 +05:30
lasanthaDLPDS
40ec702334 Merge with upstream 2019-08-22 17:58:33 +05:30
lasanthaDLPDS
3a29ab9802 Add device-mgt react app 2019-08-22 17:33:25 +05:30
Saad Sahibjan
4a58aea2d0 Handle exception and log error messages related to DeviceTypeDAOHandler 2019-08-19 13:54:39 +05:30
Saad Sahibjan
0c7843f2fe Modify logic of saving DeviceTypePluginDAOManager to support multi tenancy 2019-08-19 13:54:39 +05:30
Saad Sahibjan
d6d91e4bc2 Remove retrieving device type extension class from deployer file 2019-08-19 13:54:39 +05:30
Saad Sahibjan
a246c16eb6 Register DeviceTypePluginExtensionService 2019-08-19 13:54:39 +05:30
Saad Sahibjan
b9bceadec8 Add the implementation of DeviceTypePluginExtensionService 2019-08-19 13:54:39 +05:30
Saad Sahibjan
c5b4641597 Add the interface of DeviceTypePluginExtensionService 2019-08-19 13:54:39 +05:30
Saad Sahibjan
42b092d43a Add license header for DeviceTypeDAOHandler 2019-08-19 13:54:39 +05:30
Saad Sahibjan
f0103f27c4 Modify error messages and exception handling 2019-08-19 13:54:39 +05:30
Saad Sahibjan
0d203e0cd5 Set device type plugin DAO manager in hashmap 2019-08-19 13:54:39 +05:30
Saad Sahibjan
9d81ee6cb4 Expose device type extension dao plugin via device type deployer 2019-08-19 13:54:39 +05:30
Saad Sahibjan
f1c6ee7068 Add interface for device type plugin dao 2019-08-19 13:54:39 +05:30
Saad Sahibjan
5271fc4163 Add device type extension config 2019-08-19 13:54:39 +05:30
Saad Sahibjan
dd4a31beb7 Log and set message in response whend device not found to delete 2019-08-16 13:49:49 +05:30
Saad Sahibjan
1c825af79d Move delete device permanently to device-mgt admin API 2019-08-15 17:08:21 +05:30
Ace
b260e5c086 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-08-15 15:15:22 +05:30
Ace
18218a351c Fixing issues with searching devices with groupID as a param 2019-08-15 15:12:42 +05:30
charitha
bb82eb7236 Fix issue in IoT device type loading 2019-08-13 00:08:58 +05:30
lasanthaDLPDS
4e23dbf5af Merge with upstream master 2019-08-08 16:35:52 +05:30
lasanthaDLPDS
9d9f420c83 Fix formatting issues 2019-08-05 18:39:22 +05:30
lasanthaDLPDS
f24cc4342f Merge with master branch 2019-07-17 17:46:33 +05:30
Entgra Builder
3c4ef275f1 [maven-release-plugin] prepare for next development iteration 2019-07-05 09:25:27 +00:00
Entgra Builder
03703b83eb [maven-release-plugin] prepare release v3.2.8 2019-07-05 09:25:15 +00:00
Ruwan Yatawara
59e14c6c1f Merge branch 'master' into 'master'
Bumping product versions

See merge request entgra/carbon-device-mgt!167
2019-07-05 09:02:02 +00:00
Entgra Builder
fc7cf05e90 [maven-release-plugin] prepare for next development iteration 2019-07-04 07:27:48 +00:00
Entgra Builder
93c53c8748 [maven-release-plugin] prepare release v3.2.7 2019-07-04 07:27:42 +00:00
Ace
1ad6519600 changing references to older release in html pages 2019-07-04 11:06:21 +05:30
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
2019-07-04 04:06:52 +00:00
Ace
3369438f2d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-07-04 09:21:31 +05:30
Ace
ca07db3fca Adding code to retrieve properties instead of the entire device 2019-06-28 11:25:01 +05:30
Ace
42b9753944 fixing bug with unitiated list 2019-06-28 10:13:51 +05:30
Ace
192984e3c0 Adding new API to search devices based on device properties 2019-06-27 17:03:00 +05:30
Ruwan Yatawara
bdb40c94d1 Merge branch 'master' into 'master'
updating references to 3.5.0 release to 3.6.0

See merge request entgra/carbon-device-mgt!160
2019-06-27 11:31:38 +00:00
Ace
33ffa23efc updating references to 3.5.0 release to 3.6.0 2019-06-26 13:24:00 +05:30
Saad Sahibjan
58a31d0031 Plugin level support for deleting device permanently 2019-06-25 19:15:24 +00:00
lasanthaDLPDS
7f0be5f28b Merge with upstream master 2019-06-17 20:13:12 +05:30
Saad Sahibjan
f372ba2018 Modify setting app type 2019-06-17 17:02:40 +05:30
Saad Sahibjan
c0e301845e Android enterpise app install payload creation 2019-06-17 17:02:40 +05:30
Inosh Perara
13960f77c9 add device type versioning APIs 2019-06-17 08:09:00 +00:00
Saad Sahibjan
e26b50742b Increase length of VALUE_FIELD column in DM_DEVICE_INFO table 2019-06-13 13:28:06 +05:30
Saad Sahibjan
29b2c41c73 Add iOS enterprise app install 2019-06-12 16:28:04 +05:30
Milan Perera
650f02bf03 Add user created date and modified date 2019-06-09 10:03:50 +05:30
Saad Sahibjan
857f9057d3 Modify setting app type 2019-06-07 11:18:07 +05:30
Saad Sahibjan
c9c4d7a64b Android enterpise app install payload creation 2019-06-06 22:12:21 +05:30
Saad Sahibjan
76b34b3229 Add gson dependency to commons 2019-06-06 22:12:21 +05:30
Entgra Builder
5a6789e336 [maven-release-plugin] prepare for next development iteration 2019-06-03 15:43:13 +00:00
Entgra Builder
c71b1f9314 [maven-release-plugin] prepare release v3.2.6 2019-06-03 15:43:05 +00:00
Saad Sahibjan
1f001b09f1 Fix tests related to deleteDevice API 2019-06-03 15:18:03 +05:30
Saad Sahibjan
52e971de76 Add delete device dao related implementation 2019-06-03 15:18:03 +05:30
Saad Sahibjan
48ae5c58e9 Add deleteDevice service and impl 2019-06-03 15:18:03 +05:30
Saad Sahibjan
be1bee9b9a Modify delete device API to have permanentDelete query parameter 2019-06-03 15:18:03 +05:30
Saad Sahibjan
b68cc62bc7 Handle StartupOperationConfig which runs only once after the server is started 2019-06-03 12:13:21 +05:30
Saad Sahibjan
c1177a26b2 Handle server version operation in task manager 2019-06-03 12:13:21 +05:30
Inosh Perara
b76784bc90 Merge branch 'master' into 'master'
Query error fix in operation profile

See merge request entgra/carbon-device-mgt!115
2019-06-01 11:28:45 +00:00
inoshperera
301b6ad5c2 Query error fix in operation profile 2019-06-01 16:57:28 +05:30
Entgra Builder
2d05e04a16 [maven-release-plugin] prepare for next development iteration 2019-05-31 14:13:46 +00:00
Entgra Builder
84df5dd4bf [maven-release-plugin] prepare release v3.2.5 2019-05-31 14:13:39 +00:00
Dharmakeerthi Lasantha
52c7a7ecdd Improve app subscription functionality
Further integrate app management component with device mgt
2019-05-31 07:42:25 +00:00
Madawa Soysa
a285898782 Modify the Feature Specification Structure and Modify {deviceType}/features API
Related to entgra/product-iots#37
2019-05-30 06:31:11 +00:00
Pahansith Gunathilake
1fc16f9572 Fix windows device inactive after sync 2019-05-28 05:18:05 +00:00
lasanthaDLPDS
9c45f907e2 Improve APPM subscribing method 2019-05-27 16:54:20 +05:30
Asanka Kumara
b863d2fa5e Get Device By ID API 2019-05-27 06:25:21 +00:00
Pahansith Gunathilake
a5e471c073 Fix drop down color issue 2019-05-27 06:22:12 +00:00
Pahansith Gunathilake
920a66a165 Fix user creation password auto generation 2019-05-27 06:21:14 +00:00
lasanthaDLPDS
06e9591e36 Fix device-mgt operation log displaying issue 2019-05-24 06:06:36 +05:30
lasanthaDLPDS
efa17d2e51 Merge with upstream master 2019-05-23 14:06:29 +05:30
lasanthaDLPDS
7c593d83fa Add APIs for subscription management 2019-05-22 17:39:09 +05:30
Saad Sahibjan
a9f19a6afb Merge branch 'master' into 'master'
Add missing permission in v0.9 API

See merge request entgra/carbon-device-mgt!73
2019-05-18 08:00:13 +00:00
Saad Sahibjan
f3b580277b Add UI for update enrollment 2019-05-16 10:05:17 +05:30
Charitha Goonetilleke
ca83635f13 Fix log issue in test cases 2019-05-06 08:46:41 +00:00
Charitha Goonetilleke
7a16ac7532 Fix build failure 2019-04-25 09:01:37 +00:00
Charitha Goonetilleke
0c471fbb0b Add capability to store device type specific platform configurations for any device type 2019-04-25 08:47:20 +00:00
lasanthaDLPDS
84e3beb6f6 Fix merge conflicts 2019-04-24 23:09:16 +05:30
lasanthaDLPDS
c2afa1126a Remove v0.9 API source 2019-04-24 19:58:08 +05:30
lasanthaDLPDS
39b1f0b72e Remove v0.9 API 2019-04-24 19:42:34 +05:30
lasanthaDLPDS
ba4d73d940 Add missing permission in v0.9 API 2019-04-24 13:17:32 +05:30
Entgra Builder
54b0a0afd0 [maven-release-plugin] prepare for next development iteration 2019-04-23 10:42:17 +00:00
Entgra Builder
6dd8ca9484 [maven-release-plugin] prepare release v3.2.4 2019-04-23 10:42:10 +00:00
Pahansith Gunathilake
4aa7987be8 Fix notification not showing issue - Issue ID #84 2019-04-19 08:08:33 +00:00
Entgra Builder
14337bb884 [maven-release-plugin] prepare for next development iteration 2019-04-18 13:58:18 +00:00
Entgra Builder
736ce76df6 [maven-release-plugin] prepare release v3.2.3 2019-04-18 13:58:11 +00:00
Inosh Perara
25a743f8e5 Merge branch 'master' into 'master'
Add an API to update the device owner for given device identifiers.

See merge request entgra/carbon-device-mgt!68
2019-04-18 04:55:48 +00:00
lasanthaDLPDS
12d46550e6 Fix requested changes in the review 2019-04-17 15:40:22 +05:30
Pahansith Gunathilake
2a6b960e80 Change Product Version to 3.5.0 2019-04-16 21:06:03 +00:00
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.
2019-04-16 20:11:02 +05:30
Entgra Builder
65eb70139b [maven-release-plugin] prepare for next development iteration 2019-04-10 19:04:25 +00:00
Entgra Builder
6bbbbdc18b [maven-release-plugin] prepare release v3.2.2 2019-04-10 19:04:19 +00:00
Pahansith Gunathilake
b075688d91 Whitelabel UI 2019-04-10 17:29:05 +00:00
Milan Perera
89e3c91fe6 Fix device information reduction issue 2019-04-09 14:38:06 +05:30
Saad Sahibjan
d64edd8cf9 Add handlebar helper to convert json to string 2019-03-28 14:26:07 +05:30
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
Saad Sahibjan
625fb7d07e Allow webclips installation via enrollment app install policy 2019-03-12 22:00:49 +05:30
Saad Sahibjan
a9a01c045e Add copy commands to copy UserValidateManagement and OAuth2TokenManagement synapse APIs to IoTs pack 2019-03-12 10:33:13 +00:00
inoshperera
a39d567e85 fix License text loading inconsistency in tenants 2019-02-02 18:20:11 +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
lasanthaDLPDS
c4c92f0faa Adding application management initial pub UI 2019-01-23 14:26:16 +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
18078c51e8 bug fixes 2019-01-17 13:53:42 +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
Saad Sahibjan
ae9dd807cc Enrollment application install feature for policy 2019-01-01 08:19:53 +00:00
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
Entgra Builder
cbe85378d8 [maven-release-plugin] prepare for next development iteration 2018-11-11 13:25:02 +00:00
Entgra Builder
4b1f83b168 [maven-release-plugin] prepare release v3.2.1 2018-11-11 13:24:57 +00:00
charitha
c3893d93bb Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2018-11-11 14:28:00 +05:30
charitha
4deb71229c 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.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-11-11 14:27:32 +05:30
Ace
880720a72f Fixing issue with task scheduler 2018-11-09 21:51:42 +05:30
WSO2 Builder
b4e8bb4da0 [WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare for next development iteration 2018-10-30 16:02:55 +00:00
WSO2 Builder
e482894fbd [WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare release v3.1.51 2018-10-30 16:02:44 +00:00
charitha
10672ea534 Fixed date format issue in geofencing 2018-10-30 20:47:31 +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
WSO2 Builder
1bd160f551 [WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare for next development iteration 2018-10-30 07:42:23 +00:00
WSO2 Builder
b45aef9fec [WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare release v3.1.50 2018-10-30 07:42:11 +00:00
charitha
86029752f8 Fixed https://github.com/wso2/product-iots/issues/1184 2018-10-29 21:03:24 +05:30
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
2018-10-27 12:26:59 +00:00
WSO2 Builder
764b119ae5 [WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare for next development iteration 2018-10-24 19:03:29 +00:00
WSO2 Builder
1bbbce9ac3 [WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare release v3.1.49 2018-10-24 19:03:17 +00:00
geethkokila
2bb3e2cdc0 Fixing the SQL 2018-10-25 00:11:49 +05:30
WSO2 Builder
5005cebbff [WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare for next development iteration 2018-10-24 04:01:39 +00:00
WSO2 Builder
5d688d8c4f [WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare release v3.1.48 2018-10-24 04:01:27 +00:00
lasanthaDLPDS
e76fe92ebe Fix device monitoring task disabling issue 2018-10-24 08:29:35 +05:30
Madawa Soysa
6795cbb180 Add IMEI parameter to custom parameters of the advanced search
Fixes entgra/product-iots#8
2018-10-24 13:53:13 +11:00
Madawa Soysa
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
2018-10-24 13:52:28 +11:00
WSO2 Builder
a18b4550ef [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare for next development iteration 2018-10-22 19:13:35 +00:00
WSO2 Builder
9c77054795 [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare release v3.1.47 2018-10-22 19:13:23 +00:00
Madawa Soysa
9b5cb1ef6a Fix issue with search not updating
Related: entgra/product-iots#6
2018-10-22 17:47:32 +11:00
charitha
128b5f64aa Fixed NPE in sending push notifications 2018-10-22 10:36:58 +05:30
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
WSO2 Builder
8eaa7c6698 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare for next development iteration 2018-10-21 13:35:14 +00:00
WSO2 Builder
03b88248b8 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare release v3.1.46 2018-10-21 13:34:59 +00:00
charitha
3856a25449 Fixed authentication issue in deploying execution plans as non admin user 2018-10-21 14:30:06 +05:30
WSO2 Builder
bfff9e7a7e [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare for next development iteration 2018-10-18 06:51:09 +00:00
WSO2 Builder
af64244ab3 [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare release v3.1.45 2018-10-18 06:50:57 +00: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
8bc15e1f14 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-10-18 11:24: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
Milan Perera
a01886cb37 Handle NotNow response from device 2018-10-16 21:12:05 +05:30
WSO2 Builder
e7a9406789 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare for next development iteration 2018-10-16 13:39:36 +00:00
WSO2 Builder
b87b073739 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare release v3.1.44 2018-10-16 13:39:24 +00:00
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
WSO2 Builder
806ac13c39 [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare for next development iteration 2018-10-12 03:58:28 +00:00
WSO2 Builder
e3901043fc [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare release v3.1.43 2018-10-12 03:58:17 +00:00
Geeth
5ee7cba36a
Merge pull request #1264 from ruwany/master
Persisting profile operations as string values instead of Objects
2018-10-12 09:11:58 +05:30
Ace
cb0fb87b49 Fixing test failures and adding enhancements 2018-10-11 16:37:13 +05:30