Commit Graph

8035 Commits

Author SHA1 Message Date
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
Jayasanka
740ad2a6b7 Add image upload previews and validation in add new app form 2019-09-30 17:28:01 +05:30
Jayasanka
a2341e8afc Fix subscription method issue 2019-09-30 14:08:28 +05:30
Charitha Goonetilleke
4c78c1bf13 Merge branch 'master' into 'master'
Fix device-type features edit issue

See merge request entgra/carbon-device-mgt!266
2019-09-30 07:13:17 +00:00
Turcy
f28d42d7ce Fix device-type features edit issue 2019-09-30 12:14:35 +05:30
Dharmakeerthi Lasantha
6f21f472b6 Merge branch 'GroupNameCase' into 'master'
Fix Null pointer exception in group management

See merge request entgra/carbon-device-mgt!265
2019-09-27 15:46:41 +00:00
ausamriyaaz
2c27830ecc Fix Null pointer exception 2019-09-27 15:42:01 +05:30
Dharmakeerthi Lasantha
0dac130e91 Show the applied policies when click view button on policy compliance 2019-09-27 05:51:59 +00:00
Vinojini Paramasivam
3dcf19dffa Show the applied policies when click view button on policy compliance 2019-09-27 05:51:59 +00:00
Milan Perera
513b8efaee Merge branch 'fix-141' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt!263
2019-09-26 20:34:23 +00:00
milanperera
a716d28046 Fix build failure 2019-09-26 22:33:26 +02:00
charitha
cc2eccae5d Fix configuration retrieval issue with non default admin credentials 2019-09-26 22:38:45 +05:30
Dharmakeerthi Lasantha
7e62c6a781 Improve error logs in DAO implementations 2019-09-26 12:23:10 +00:00
Shamalka Navod
59188bcdb3 Fix error logs of DAO implementations 2019-09-26 12:23:10 +00:00
Milan Perera
3747e98be3 Merge branch 'fix-141' into 'master'
Fix for entgra/product-iots#141

Closes product-iots#141

See merge request entgra/carbon-device-mgt!260
2019-09-26 09:33:29 +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
Milan Perera
52de9b85e9 Merge branch 'reports' into 'application-mgt-new'
API endpoint to get all devices which are enrolled between two dates

## Purpose
> Building a new feature which lets users to generate reports according to various parameters.

## Goals
> Get all the devices which enrolled between two dates. Use as a one feature of report generating feature.

## Approach
*  Created a new service for reports.
*  Added a new method to DeviceDAO to get reports between two dates.
*  Called the DeviceDAO in Reports service and called the above method

## Documentation
**New API endpoints** : 
* Get all devices between two dates : /reports/devices?from=[date]&to=[date] 
* Filter by device status : /reports/devices?status=[status]&from=[date]&to=[date]  
* Filter by device ownership : /reports/devices?ownership=[ownership]&from=[date]&to=[date] 

Date format : YYYY-MM-DD




See merge request entgra/carbon-device-mgt!237
2019-09-26 06:23:56 +00:00
Dharmakeerthi Lasantha
6344ff4950 Change search by group name to case insensitive 2019-09-26 04:11:55 +00:00
Vinojini Paramasivam
8b61bbabea Change search by group name to case insensitive 2019-09-26 04:11:55 +00:00
milanperera
5e19455882 Fix for entgra/product-iots#141 2019-09-25 16:26:19 +02:00
Ace
545ca7e2a2 Changing status related APIs to honour tenant ID 2019-09-23 23:36:34 +05:30
Dharmakeerthi Lasantha
8e9d64038b Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with master & fixes

See merge request entgra/carbon-device-mgt!258
2019-09-22 06:49:28 +00:00
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
Dharmakeerthi Lasantha
73793b5971 Fix device management test failures 2019-09-19 21:11:51 +00:00
Amanda Randombage
a82b4763e2 Fix device management test failures 2019-09-19 21:11:51 +00:00
Saad Sahibjan
d6bc33b0a2 Merge branch 'permanent-delete' into 'master'
Permanent delete API modification

## Purpose
> Delete multple devices from one API call.

## Goals
> Avoid invoking the API multiple times to delete a set of devices.

## Approach
> Delete the records of the devices as batch operations in the core level via a DEeviceDAO object and in the plugin level by creating a DeviceManager object for each device type.

## Documentation
> N/A

## Automation tests
 - Unit tests 
   > None
 - Integration tests
   > None

## Security checks
 - Followed secure coding standards? (yes)
 - Ran FindSecurityBugs plugin and verified report? (no)
 - Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? (yes)

## Related MRs
> https://gitlab.com/entgra/carbon-device-mgt/merge_requests/198

## Test environment
> N/A

## Learning
> N/A

See merge request entgra/carbon-device-mgt!241
2019-09-19 18:08:56 +00:00
Amanda Randombage
ff2c038688 Modify permanent delete API to support list of devices 2019-09-19 18:08:56 +00:00
Charitha Goonetilleke
5c2af197d3 Merge branch 'master' into 'master'
Fixing issues in the /query-devices API

See merge request entgra/carbon-device-mgt!243
2019-09-19 05:21:35 +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
Dharmakeerthi Lasantha
d9999ad5b2 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix image loading issue in tenants

See merge request entgra/carbon-device-mgt!255
2019-09-18 14:17:14 +00:00
lasanthaDLPDS
28b4d52d23 Fix app loading issue 2019-09-18 19:33:26 +05:30
lasanthaDLPDS
c129fb1c41 Fix image loading issue in tenant mode 2019-09-18 19:32:59 +05:30
Dharmakeerthi Lasantha
5e8f6903e5 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add tenant domain to the login form

See merge request tcdlpds/carbon-device-mgt!7
2019-09-18 14:02:50 +00:00
Jayasanka Weerasinghe
27e01e80a8 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-18 14:02:50 +00:00
lasanthaDLPDS
73ec7dd173 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-09-18 08:13:57 +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
705f6fbbe4 Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-09-17 09:14:41 +05:30
Dharmakeerthi Lasantha
fd7436eaa6 Merge branch 'application-mgt-new' into 'application-mgt-new'
Handle API error in APPM store

See merge request entgra/carbon-device-mgt!254
2019-09-16 12:14:32 +00:00
Jayasanka Weerasinghe
85fe985a94 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-16 12:14:32 +00:00
Dharmakeerthi Lasantha
1eb70051e0 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add application installation response via pull notification

See merge request entgra/carbon-device-mgt!253
2019-09-16 11:49:35 +00:00
Charitha Goonetilleke
5cf89ec24c Add application installation response via pull notification 2019-09-16 11:49:35 +00:00