community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,981 Commits 31 Branches 461 Tags 183 MiB
5ca299530e
Commit Graph

4966 Commits

Author SHA1 Message Date
shamalka
7dc9fbb04b Fix error on retrieving location 2019-10-23 15:02:32 +05:30
Yohan Avishke
4a3a9b587e Change invalid payload exception responses to bad requests 2019-10-23 11:51:34 +05:30
achala007
e57dd65dd8 Update geo featur UI and date time picker 2019-10-23 09:54:00 +05:30
Yohan Avishke
8bebf2c126 Wrap service level error messages from api level error messages 2019-10-23 06:50:59 +05:30
Dharmakeerthi Lasantha
0f8d4a02d4 Merge branch 'master' into 'application-mgt-new' 
Fix apple logo not displaying in UI DEP config

See merge request entgra/carbon-device-mgt!345
 2019-10-22 18:37:37 +00:00
Dharmakeerthi Lasantha
6717723d69 Merge branch 'application-mgt-new' into 'application-mgt-new' 
Add roles and enrolled devices of users

See merge request entgra/carbon-device-mgt!343
 2019-10-22 18:13:54 +00:00
Saad Sahibjan
48ffb02cb4 Fix apple logo not displaying in UI DEP config 2019-10-22 23:40:49 +05:30
shamalka
5436d9dd37 Add roles and enrolled devices of users 2019-10-22 22:56:20 +05:30
lasanthaDLPDS
67f442f1c4 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-22 22:35:59 +05:30
Dharmakeerthi Lasantha
edf9486a6d Merge branch 'application-mgt-new' into 'application-mgt-new' 
Add main devicemgt features to dashboard

See merge request entgra/carbon-device-mgt!333
 2019-10-22 17:02:24 +00:00
Charitha Goonetilleke
e58ca40323 Merge branch 'application-mgt-new' into 'application-mgt-new' 
Adding status column to GROUP table and honuring same in API

See merge request entgra/carbon-device-mgt!341
 2019-10-22 14:39:55 +00:00
lasanthaDLPDS
2103306fa1 Improve APPM source 
Fix formatting issues, add java doc comments, improve transaction handling
 2019-10-22 19:45:25 +05:30
lasanthaDLPDS
b5a86d8e79 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-21 20:00:29 +05:30
lasanthaDLPDS
d4f3754ebc Add new admin API to get app subscription data 2019-10-21 19:59:19 +05:30
Dharmakeerthi Lasantha
41f53d06c6 Merge branch 'application-mgt-new' into 'application-mgt-new' 
MS SQL based syntax fixes

See merge request entgra/carbon-device-mgt!339
 2019-10-21 09:53:59 +00:00
Dharmakeerthi Lasantha
3c11838c14 Merge branch 'corrective-policy' into 'application-mgt-new' 
Message to display in view when a selected corrective policy is changed to general or deleted

See merge request entgra/carbon-device-mgt!338
 2019-10-21 09:52:14 +00:00
inoshperera
0db399814b MS SQL based syntax fixes 2019-10-21 14:04:38 +05:30
Saad Sahibjan
bb681c43d0 Message to display in view when a selected corrective policy is changed to general or deleted 2019-10-21 13:50:21 +05:30
inoshperera
422e106c36 MS sql related bug fixes 2019-10-20 09:41:07 +05:30
shamalka
318736bcbf Add feature descriptions 2019-10-20 00:17:02 +05:30
shamalka
02a8fd35dc Add main devicemgt features to dashboard 2019-10-19 23:59:40 +05:30
Inosh Perara
0539971f40 Merge branch 'corrective-policy' into 'application-mgt-new' 
Corrective Policy

See merge request entgra/carbon-device-mgt!328
 2019-10-19 17:12:29 +00:00
Saad Sahibjan
8178a3cd8f Message to display when a selected corrective policy is changed to general or deleted 2019-10-19 12:18:53 +05:30
Saad Sahibjan
ec3f5afcb7 Prevent same policy ID bieng avaialble in selecting a corrective policy 2019-10-19 12:18:02 +05:30
Ace
548ad336bf Adding status column to GROUP table and honuring same in API 2019-10-18 18:18:40 +05:30
lasanthaDLPDS
b5a1433709 Improve SQL queries in APPM 2019-10-18 17:17:38 +05:30
ausam riyaaz
2e8a706724 Fix MsSQL syntax issues. 2019-10-18 11:40:49 +00:00
Saad Sahibjan
e3905e793d Add policy type and corrective action UI for view policy 2019-10-18 15:04:08 +05:30
Saad Sahibjan
fc916d4e4c Add policy type and corrective action UI for edit policy 2019-10-18 15:04:08 +05:30
Saad Sahibjan
1d2444f16f Add policy type and corrective action UI for create policy 2019-10-18 15:04:08 +05:30
Saad Sahibjan
62c01aa508 Add a new unit for corrective action 2019-10-18 15:04:08 +05:30
Saad Sahibjan
ca2a1b85c3 Add UI controller method to retrieve all policies by policy type 2019-10-18 15:04:08 +05:30
Saad Sahibjan
622e1842de Add corrective actions in policy wrapper to policy object 2019-10-18 15:04:08 +05:30
Saad Sahibjan
bb1a3f6230 Add correctiveAction to policy wrapper bean class 2019-10-18 15:04:08 +05:30
Saad Sahibjan
4e06e95039 Add correctiveAction to policy bean class 2019-10-18 15:04:08 +05:30
Saad Sahibjan
4e61f771e7 Add corrective action bean class 2019-10-18 15:04:08 +05:30
sandarudr
3039e30578 Change Entgra IoT Server version to 4.0.0 2019-10-17 18:23:10 +05:30
lasanthaDLPDS
afb487dedc Improve APPM subscribing functionality 2019-10-17 11:24:58 +05:30
Shamalka Navod
b291c814c4 Fix Device dis-enrollment issue in APPM 2019-10-16 13:27:20 +00:00
Yohan Avishke
8489dec2b1 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/EventStream.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
 2019-10-16 07:24:03 +05:30
Yohan Avishke
51b7f8b206 Modify code to limit garbage collectible objects and create method to deploy adapters without custom mapping 
Removed creation of ArrayLists when a service is been called and added null validation to those lists in service layer. Developed code to deploy adapters when custom mapping is false and updated exception handling.
 2019-10-16 07:12:31 +05:30
lasanthaDLPDS
2efbad9e6c Upgrade APPM version 2019-10-15 14:05:38 +05:30
lasanthaDLPDS
0b238b9c45 Merge with upstream master 2019-10-15 12:51:54 +05:30
lasanthaDLPDS
46d28cca8d Add MsSQL and Oracle support for APPM 2019-10-15 09:15:44 +05:30
Entgra Builder
9502ff52e6 [maven-release-plugin]prepare for next development iteration 2019-10-14 15:53:20 +00:00
Entgra Builder
35b76c1c1b [maven-release-plugin]prepare release v3.2.14 2019-10-14 15:53:13 +00:00
vinojiniparamasivam
c6d23b5e7a Change button name in add policy page 2019-10-14 17:24:22 +02:00
Entgra Builder
2fa223410c [maven-release-plugin]prepare for next development iteration 2019-10-14 12:36:11 +00:00
Entgra Builder
d8248301de [maven-release-plugin]prepare release v3.2.13 2019-10-14 12:36:01 +00:00
Yohan Avishke
4557c5fc5c Update the Analytics Artifacts Management API 2019-10-14 09:35:32 +00:00
Yohan Avishke
d885707046 Refactor code in a reusable way and change response messages 
Removed repeated classes and implemented code to already existing classes and divided code into sub methods to limit repetitive code and increase readability. And the response messages were change in order to give users a better understating of the responses they get when calling the api endpoints.
 2019-10-13 12:37:55 +05:30
Yohan Avishke
fe4e857639 Change exception codes of device stream events 2019-10-13 12:37:55 +05:30
Yohan Avishke
e643db08d1 Change event attribute mapping logic and error handling 
Event attribute mapping logic was moved to service layer from the api layer and a created a meaningful error message.
 2019-10-13 12:37:55 +05:30
Yohan Avishke
da2d95e7ac Change event attribute mapping logic and error handling 
Event attribute mapping logic was moved to service layer from the api layer and a created a meaningful error message.
 2019-10-13 12:37:55 +05:30
Yohan Avishke
f660bf9edd Add ApiParams to all the parameters 2019-10-13 12:37:55 +05:30
Yohan Avishke
e5963c79fd Override toString 2019-10-13 12:37:55 +05:30
Saad Sahibjan
f9660de334 Minor fixes and improvement for permanent delete devices 2019-10-13 11:58:58 +05:30
Amanda Randombage
becaf35546 Permanent delete DAO fix 2019-10-11 08:59:31 +00:00
shamalka
7a9fddf6da Disenroll device 2019-10-11 13:37:04 +05:30
Dharmakeerthi Lasantha
f0d8f4d023 Merge branch 'application-mgt-new' into 'application-mgt-new' 
Bulk actions UI

See merge request entgra/carbon-device-mgt!299
 2019-10-10 20:59:17 +00:00
shamalka
e068317a62 Add devices to groups 2019-10-10 18:05:08 +05:30
shamalka
c69f9c9f1d Fix spelling mistakes 2019-10-10 18:05:08 +05:30
shamalka
5ba56207c9 Improve delete device UI 2019-10-10 18:05:08 +05:30
shamalka
b92046fa3d Change UI structure 2019-10-10 18:05:08 +05:30
shamalka
c762c9d2a7 Change bulk action UI 2019-10-10 18:05:08 +05:30
Saad Sahibjan
354dcd3fd4 Add null and empty check for device location related values 2019-10-10 15:55:03 +05:30
Amanda
7b7d47a2bf Fix delete 
- Fix delete button in UI
- Close connection in DAO
 2019-10-10 07:56:29 +05:30
Entgra Builder
277b114f9c [maven-release-plugin] prepare for next development iteration 2019-10-09 10:41:21 +00:00
Entgra Builder
cd6ff02aff [maven-release-plugin] prepare release v3.2.12 2019-10-09 10:41:15 +00:00
Amanda Randombage
e80589d3b1 Fix Permanent delete for multiple enrollments 2019-10-09 10:19:55 +00:00
Amanda Randombage
8a586eee2c Add UI feature to delete multiple devices permanently 2019-10-09 08:56:32 +00:00
Madawa Soysa
03c550d11b Fix issue with reconfiguring policy 
The cause of the issue is not passing the newly introduced parameter 'policyType' in the policy edit payload. This parameter is marked @NotNull. Hence throwing an error. 

This fix sets the policyType parameter from the existing payload (Doesn't allow to edit as there is no UI interface to edit this parameter ATM

Fixes: entgra/product-iots#175
 2019-10-09 16:50:12 +11:00
Amanda Randombage
824403b97e Change permanent delete HTTP method 2019-10-09 01:54:08 +00:00
Shamalka Navod
bc406b6c92 Add UI feature to delete set of devices 2019-10-08 18:47:08 +00:00
Amanda
0aee974b35 Fix issue in retrieving IoTS devices 2019-10-08 17:33:24 +05:30
charitha
43ba5d7e84 Fix issue in retrieving IoTS devices 2019-10-08 13:26:56 +05:30
shamalka
d43971b1b8 Remove unnecessary comments 2019-10-05 23:26:19 +05:30
shamalka
795edd4c66 Improve device delete UI 2019-10-05 23:13:34 +05:30
Entgra Builder
c1612446e4 [maven-release-plugin] prepare for next development iteration 2019-10-05 12:04:29 +00:00
Entgra Builder
3cecc16145 [maven-release-plugin] prepare release v3.2.11 2019-10-05 12:04:23 +00:00
Entgra Builder
36a91e0e62 [maven-release-plugin]prepare for next development iteration 2019-10-05 06:47:25 +00:00
Entgra Builder
d1cfd12185 [maven-release-plugin]prepare release v3.2.10 2019-10-05 06:47:19 +00:00
Entgra Builder
15b4b6ff37 [maven-release-plugin]prepare for next development iteration 2019-10-04 17:41:23 +00:00
Entgra Builder
bd6ca17381 [maven-release-plugin]prepare release v3.2.9 2019-10-04 17:41:17 +00:00
lasanthaDLPDS
7a5a231974 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into conflicts-fix 2019-10-04 16:25:52 +05:30
achala piyarathna
33cac65dd0 Fix build failure 2019-10-04 10:51:21 +00:00
lasanthaDLPDS
f6098a75af Sync with upstream master 2019-10-04 15:39:02 +05:30
lasanthaDLPDS
298c58e8b8 Fix merge conflicts 2019-10-04 13:57:55 +05:30
nipun
4ac94746fa Merge branch 'application-mgt-new' of https://gitlab.com/nipunnadeen/carbon-device-mgt into appm-new 2019-10-04 12:06:13 +05:30
nipunnadeen
cfdbb919b0 Create an API to get device details with given app installed 2019-10-04 12:04:24 +05:30
nipun
e4311d4e3a Modify the subscribed devices and category APIs 2019-10-04 12:04:24 +05:30
nipunnadeen
c08e631c93 Improve the subscribed devices and category details APIs 2019-10-04 12:04:24 +05:30
nipunnadeen
4c51c0af45 Create an API to get device details with given app installed 2019-10-04 12:04:24 +05:30
Inosh Perara
5cb706f24b Add android enterprise support for IoTS. 2019-10-04 03:08:35 +00:00
Pahansith Gunathilake
db8645e6c5 Add policy type 2019-10-03 17:26:31 +00:00
achala piyarathna
5b50cddea6 Device Location history view feature 2019-10-03 15:51:41 +00:00
Shamalka Navod
fdf660014f UI to generate reports 
Get devices which are enrolled between two date according to device status and ownership
 2019-10-03 13:30:13 +00:00
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
 2019-10-03 10:09:06 +00:00
lasanthaDLPDS
2d58d69d2f Fix incorrect device view issue for different ownerships. 2019-10-03 15:38:07 +05:30
nipun
7323ea0271 Modify the subscribed devices and category APIs 2019-10-01 14:36:11 +05:30
nipunnadeen
61bd91b21f Improve the subscribed devices and category details APIs 2019-10-01 14:36:11 +05:30
nipunnadeen
8a91702975 Create an API to get device details with given app installed 2019-10-01 14:33:22 +05:30
Shamalka Navod
8ff264a044 Fix error logs of DAO implementations 2019-10-01 13:46:53 +05:30
charitha
4e9628dff4 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-01 08:40:23 +05:30
charitha
2b902e878c Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-01 08:33:05 +05:30
milanperera
576ccd2363 Fix issues in fix-172 2019-09-30 15:54:12 +02:00
milanperera
a044bbd385 fix entgra/product-iots#172 2019-09-30 15:47:50 +02:00
Turcy
f28d42d7ce Fix device-type features edit issue 2019-09-30 12:14:35 +05:30
ausamriyaaz
2c27830ecc Fix Null pointer exception 2019-09-27 15:42:01 +05:30
Vinojini Paramasivam
3dcf19dffa Show the applied policies when click view button on policy compliance 2019-09-27 05:51:59 +00:00
charitha
cc2eccae5d Fix configuration retrieval issue with non default admin credentials 2019-09-26 22:38:45 +05:30
Shamalka Navod
59188bcdb3 Fix error logs of DAO implementations 2019-09-26 12:23:10 +00:00
charitha
20dd0b88d2 Merge branch 'application-mgt-new' of https://gitlab.com/charithag/carbon-device-mgt into application-mgt-new 2019-09-26 13:52:17 +05:30
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
 2019-09-26 08:21:46 +00:00
charitha
bfed11080d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-09-26 12:29:49 +05:30
Shamalka Navod
c5793bcf67 API endpoint to get all devices which are enrolled between two dates 2019-09-26 06:23:56 +00:00
Vinojini Paramasivam
8b61bbabea Change search by group name to case insensitive 2019-09-26 04:11:55 +00:00
Ace
545ca7e2a2 Changing status related APIs to honour tenant ID 2019-09-23 23:36:34 +05:30
charitha
20bbb6b91a Re add missing method 2019-09-20 14:02:40 +05:30
charitha
738c4991b9 Merge with upstream/master 2019-09-20 13:55:26 +05:30
Amanda Randombage
a82b4763e2 Fix device management test failures 2019-09-19 21:11:51 +00:00
Amanda Randombage
ff2c038688 Modify permanent delete API to support list of devices 2019-09-19 18:08:56 +00:00
Ace
647099f8a9 Adding debug logs to query-devices API 2019-09-19 10:22:47 +05:30
Ace
8086a54a1a Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-19 08:34:58 +05:30
Ace
7838eaf97b Modifying group devices API to retrieve properties 2019-09-19 07:59:45 +05:30
charitha
2e811aa12b Fix config fetching and device type filtering for tenants 2019-09-18 08:11:20 +05:30
charitha
2c7463a072 Add device transferring across tenants 2019-09-17 20:03:23 +05:30
charitha
30d4a5707a Fix platform config listing 2019-09-17 20:02:50 +05:30
Charitha Goonetilleke
5cf89ec24c Add application installation response via pull notification 2019-09-16 11:49:35 +00:00
charitha
239b1b9bb0 Add application installation response via pull notification 2019-09-16 16:22:24 +05:30
charitha
919eeab2d8 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-09-16 13:05:47 +05:30
Charitha Goonetilleke
c3490c129a Fix issue in deploying event streams 2019-09-16 06:48:01 +00:00
lasanthaDLPDS
ed557fc510 Fix merge conflicts 2019-09-15 20:37:13 +05:30
lasanthaDLPDS
cfd0f709ef Add new application type 
Add new application type for IoT use cases. Further, it is named as CUSTOM
 2019-09-15 18:48:09 +05:30
Ace
fc03c404ad Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-14 13:03:06 +05:30
Dharmakeerthi Lasantha
272077a8d1 Merge branch 'application-mgt-new' into 'application-mgt-new' 
Sync with upstream master

See merge request entgra/carbon-device-mgt!245
 2019-09-13 03:00:41 +00:00
lasanthaDLPDS
bf67894924 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-09-13 07:39:50 +05:30
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.
 2019-09-12 22:20:55 +05:30
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
Ace
4b71c6ec40 Operation retrieval logic changed to retrieve operation details via table merge instead of secondary DB call 2018-10-11 14:21:26 +05:30
Ace
de9cf67977 fixing issues with notification status not getting updated 2018-10-10 22:35:05 +05:30
WSO2 Builder
3782e68f27 [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare for next development iteration 2018-10-10 13:11:05 +00:00
WSO2 Builder
3111680b9f [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare release v3.1.42 2018-10-10 13:10:53 +00:00
Ace
e487ef4627 Fixing issue due to changes in serialVersionUID after adding an additional field to Operation DTO. As a fix, serializationUID of the earlier revision of the class was included in the current code 2018-10-10 18:37:37 +05:30
Ace
deeeb2ce48 Persisting profile operations as string payloads and retriving same as strings, failing which as profile objects to support legacy functonality 2018-10-10 11:20:45 +05:30
Ace
77db878951 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-10-09 13:59:28 +05:30
Ace
a8e52ee781 Fixing issue due to change in serialVersionUID after adding additional field to Operation DTO and correcting flaw in notification sending logic 2018-10-09 13:57:02 +05:30
WSO2 Builder
7186ed2f62 [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare for next development iteration 2018-10-08 18:01:00 +00:00
WSO2 Builder
60aee974ff [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare release v3.1.41 2018-10-08 18:00:47 +00:00
charitha
5d13979629 Increased notification popup time 2018-10-08 23:11:51 +05:30
charitha
9381362a0a Provide workaround to address WS issue 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026
 2018-10-08 23:11:44 +05:30
Ace
1fa0591f4b Fixing issue with notification sending logic 2018-10-08 23:11:38 +05:30
charitha
1f2f85d691 Increased notification popup time 2018-10-08 23:07:36 +05:30
charitha
53e1d3abde Provide workaround to address WS issue 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026
 2018-10-08 22:52:55 +05:30
Ace
4b08dd6053 Fixing issue with notification sending logic 2018-10-06 15:46:47 +05:30
lasanthaDLPDS
7388bcadce Merge master branch 2018-10-01 01:27:45 +05:30
charitha
e12e7a3876 Add validation to event retrial 2018-09-30 21:57:29 +05:30
Ubuntu
e5cc5284e3 [maven-release-plugin] prepare for next development iteration 2018-09-28 17:13:33 +00:00
Ubuntu
ae078fe390 [maven-release-plugin] prepare release v3.2.0 2018-09-28 17:12:41 +00:00
Milan Perera
53f8014730 Whitelabel devicemgt jaggeryapp 2018-09-27 11:09:13 +05:30
charitha
034a15aa59 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 2018-09-26 14:23:04 +05:30
geethkokila
7630cb0fb1 Fix the osgi issues 2018-09-20 11:52:25 +05:30
WSO2 Builder
353d6936db [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare for next development iteration 2018-09-19 15:36:32 +00:00
WSO2 Builder
8e2541b9ac [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare release v3.1.40 2018-09-19 15:36:20 +00:00
Milan Perera
4c7bd0664d Fix issue in order of get pending operations 2018-09-19 16:30:41 +05:30
geethkokila
4ded86a134 Add app manager osgi fixes 2018-09-19 15:55:11 +05:30
charitha
b5ce0fdd03 Merge branch 'iots-3.3.1' into entgra-master 2018-09-19 13:15:21 +05:30
lasanthaDLPDS
f9ec82e4dc Merge with upstream 2018-09-15 12:50:18 +05:30
charitha
b46e45dae4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-09-13 15:29:30 +05:30
charitha
fd8e73480d Order by on operation mapping ID 2018-09-13 15:28:58 +05:30
charitha
7ea609612c Revert "This is the fix for the intermittent issues when applying policies on devices" 
This reverts commit ba8537e
 2018-09-12 13:29:23 +05:30
WSO2 Builder
01991dcc4d [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare for next development iteration 2018-09-12 07:55:38 +00:00
WSO2 Builder
18b81223df [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare release v3.1.39 2018-09-12 07:55:26 +00:00
Milan Perera
576fa40cb0 Modify addOperation logic to improve the performance 2018-09-12 11:10:55 +05:30
Milan Perera
77f7792bc7 Fix wso2/product-iots#1863 2018-09-12 11:00:12 +05:30
WSO2 Builder
cbbd327a02 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare for next development iteration 2018-09-11 06:43:08 +00:00
WSO2 Builder
de07597d53 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare release v3.1.38 2018-09-11 06:42:55 +00:00
aselarbd
ba8537e198 This is the fix for the intermittent issues when applying policies on devices 
Please find the GitHub issue from [1]

[1]: https://github.com/wso2/product-iots/issues/1833
 2018-09-10 11:56:59 +05:30
WSO2 Builder
3401a8c845 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare for next development iteration 2018-08-30 14:38:47 +00:00
WSO2 Builder
ecadadef94 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare release v3.1.37 2018-08-30 14:38:36 +00:00
geethkokila
2f428c8a58 Fix https://github.com/wso2/product-iots/issues/1857 
Filtering the activities based on the user who added the operation
 2018-08-30 18:01:12 +05:30
WSO2 Builder
2b6de6834b [maven-release-plugin] prepare for next development iteration 2018-08-30 09:30:45 +00:00
WSO2 Builder
16c6a27f81 [maven-release-plugin] prepare release v3.1.36 2018-08-30 09:30:34 +00:00
Geeth
a421c12d5e
Merge pull request #1255 from charithag/iots-3.3.1 
Update manager urls and product version
 2018-08-30 14:15:27 +05:30
charitha
22f02c4062 Update manager urls and product version 2018-08-30 11:51:16 +05:30
WSO2 Builder
252b260237 [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare for next development iteration 2018-08-22 10:22:19 +00:00
WSO2 Builder
a2422cb02a [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare release v3.1.35 2018-08-22 10:22:09 +00:00
Geeth
f5515bfa5f
Merge pull request #1252 from abhishekdesilva/master 
Checking for pending operations before adding an operation
 2018-08-22 15:37:21 +05:30
abhishekdesilva
85040f0c68 Log debug process completion 2018-08-21 15:00:14 +05:30
abhishekdesilva
4aad82437b Log info has changed into debug 2018-08-21 14:46:18 +05:30
abhishekdesilva
a0bc1cdd20 Reformatted the code block as necessary 2018-08-21 09:53:23 +05:30
WSO2 Builder
af7aa73886 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare for next development iteration 2018-08-20 15:59:37 +00:00
WSO2 Builder
47ed74c156 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare release v3.1.34 2018-08-20 15:59:26 +00:00
charitha
d54d78a02b Refactoring 2018-08-20 21:16:08 +05:30
charitha
82778f06c6 Add secure web socket proxy to route ws connections in IoTS cluster 2018-08-20 15:44:55 +05:30
lasanthaDLPDS
d293b5b1b8 Fix merge conflixts 2018-08-19 15:06:25 +05:30
WSO2 Builder
4848e271af [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare for next development iteration 2018-08-13 10:09:29 +00:00
WSO2 Builder
c79baf3392 [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare release v3.1.33 2018-08-13 10:09:18 +00:00
geethkokila
7d34928ac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-08-13 14:56:13 +05:30
geethkokila
1d427aef73 Fix https://github.com/wso2/product-iots/issues/1852 2018-08-13 14:55:00 +05:30
charitha
e858f5b627 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-08-13 12:21:24 +05:30