Commit Graph

7965 Commits

Author SHA1 Message Date
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
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
Shamalka Navod
c5793bcf67 API endpoint to get all devices which are enrolled between two dates 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
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
charitha
239b1b9bb0 Add application installation response via pull notification 2019-09-16 16:22:24 +05:30
Dharmakeerthi Lasantha
d45b153a9a Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix app-install operation adding issue for custom apps

See merge request entgra/carbon-device-mgt!252
2019-09-16 10:14:48 +00:00
lasanthaDLPDS
34f1b25c84 Fix app-install operation adding issue for custom apps 2019-09-16 15:39:22 +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
Dharmakeerthi Lasantha
0a0ac706f3 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix custom app loading issue

See merge request entgra/carbon-device-mgt!249
2019-09-15 17:40:22 +00:00
lasanthaDLPDS
a3e0eb031c Fix custom app loading issue 2019-09-15 23:03:34 +05:30
Dharmakeerthi Lasantha
8ce3318645 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix device type loading issue for custom apps

See merge request entgra/carbon-device-mgt!248
2019-09-15 16:34:10 +00:00
Dharmakeerthi Lasantha
5c92401265 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-15 16:34:10 +00:00
Charitha Goonetilleke
0e22d24e61 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add new application type

See merge request entgra/carbon-device-mgt!247
2019-09-15 15:49:06 +00:00
lasanthaDLPDS
ed557fc510 Fix merge conflicts 2019-09-15 20:37:13 +05:30
Dharmakeerthi Lasantha
6e8d139cbc Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix APPM publisher UI according to custom type app installation feature

See merge request tcdlpds/carbon-device-mgt!5
2019-09-15 14:26:53 +00:00
Jayasanka Weerasinghe
c204e6f9b7 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-15 14:26:53 +00:00
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
Saad Sahibjan
0af060f5b8 Merge branch 'master' into 'master'
Fix server starting issue

See merge request entgra/carbon-device-mgt!244
2019-09-12 16:54:34 +00:00
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