Commit Graph

8784 Commits

Author SHA1 Message Date
Saad Sahibjan
6cd10570b0 Merge branch 'reporting-sync' into 'reporting'
Add report syncing functionality

See merge request entgra/carbon-device-mgt!556
2020-05-25 13:51:49 +00:00
tcdlpds@gmail.com
c74cd7e7d7 Add report syncing functionality 2020-05-25 19:20:31 +05:30
Saad Sahibjan
f1effbdde6 Merge branch 'master' into 'master'
Fix app and app-release deleting issues

Closes product-iots#526

See merge request entgra/carbon-device-mgt!555
2020-05-25 07:55:32 +00:00
tcdlpds@gmail.com
fd8b664f81 Fix app and app-release deleting issues 2020-05-24 15:03:06 +05:30
Entgra Builder
df2256ac44 [maven-release-plugin] prepare for next development iteration 2020-05-24 03:05:29 +00:00
Entgra Builder
2788259974 [maven-release-plugin] prepare release v4.1.8 2020-05-24 03:05:24 +00:00
Saad Sahibjan
ebbe7c5edf Merge branch 'master' into 'master'
Fix incorrect app release loading issue in app store

Closes product-iots#524

See merge request entgra/carbon-device-mgt!554
2020-05-23 19:48:44 +00:00
tcdlpds@gmail.com
07e7d014c5 Fix incorrect app release loading issue in app store 2020-05-23 22:24:59 +05:30
Charitha Goonetilleke
cf3bacc31d Merge branch 'device-delete-db-fix' into 'master'
Fix issue in iOS and Windows policy creation

See merge request entgra/carbon-device-mgt!553
2020-05-23 16:36:06 +00:00
Pahansith
6c643b81a6 Fix issue in policy creation 2020-05-23 12:20:52 +05:30
Entgra Builder
186e9cb216 [maven-release-plugin] prepare for next development iteration 2020-05-22 13:35:45 +00:00
Entgra Builder
5347dd9211 [maven-release-plugin] prepare release v4.1.7 2020-05-22 13:35:39 +00:00
Charitha Goonetilleke
c4f4961a70 Merge branch 'policy-bean' into 'master'
Add Upload bean

See merge request entgra/carbon-device-mgt!548
2020-05-22 12:51:35 +00:00
Charitha Goonetilleke
d57e324820 Merge branch 'work-efficiency-analyzer' into 'master'
Add new variable to store an apllication's events

Closes product-iots#522

See merge request entgra/carbon-device-mgt!551
2020-05-22 12:51:08 +00:00
Charitha Goonetilleke
1a7661c30d Merge branch 'master' into 'master'
Add properties from xml based device types to DEVICE_PROPERTIES table

See merge request entgra/carbon-device-mgt!552
2020-05-22 12:48:01 +00:00
charitha
89618eb200 Add properties from xml based device types to DEVICE_PROPERTIES table 2020-05-22 14:59:35 +05:30
Charitha Goonetilleke
798663fef7 Merge branch 'device-delete-db-fix' into 'master'
Fix sql syntax error in device large response delete

See merge request entgra/carbon-device-mgt!550
2020-05-22 04:24:03 +00:00
Charitha Goonetilleke
07ea66c911 Merge branch 'device-ui-fix' into 'master'
Add created state to device list UI

See merge request entgra/carbon-device-mgt!549
2020-05-22 04:22:51 +00:00
Yohan Avishke
602bcbb2cf Add new variable to store an apllication's events 2020-05-22 08:01:39 +05:30
Pahansith
0647eee0d8 Fix device syntax error in device large response delete 2020-05-22 00:45:41 +05:30
Pahansith
3257db9e3b Add created state to device list UI 2020-05-21 21:32:46 +05:30
shamalka
31d9969e3f Add Upload bean 2020-05-21 13:28:36 +05:30
Dharmakeerthi Lasantha
9c81470369 Merge branch 'bluetooth' into 'master'
Change reporting header param

See merge request entgra/carbon-device-mgt!547
2020-05-19 20:35:42 +00:00
Shamalka Navod
902b7fc654 Change reporting header param 2020-05-19 20:35:42 +00:00
Dharmakeerthi Lasantha
b1e13bdc22 Merge branch 'get-device-list' into 'master'
Get devices by identifier list API

See merge request entgra/carbon-device-mgt!544
2020-05-19 10:40:41 +00:00
Shamalka Navod
03e87c558f Get devices by identifier list API 2020-05-19 10:40:41 +00:00
Dharmakeerthi Lasantha
38fdfb1005 Merge branch 'device-delete-fix' into 'master'
Remove operation existence check in update operation

See merge request entgra/carbon-device-mgt!546
2020-05-19 10:27:13 +00:00
Pahansith Gunathilake
1112b285d5 Remove operation existence check in update operation 2020-05-19 10:27:13 +00:00
Dharmakeerthi Lasantha
66a30ef131 Merge branch 'master' into 'master'
Change reporting webapp system variable name

See merge request entgra/carbon-device-mgt!545
2020-05-19 08:56:35 +00:00
tcdlpds@gmail.com
5fd5c110aa Change reporting webapp system variable name 2020-05-19 14:25:15 +05:30
Dharmakeerthi Lasantha
62ef8d6bb5 Merge branch 'master' into 'master'
Performance Improvements

See merge request entgra/carbon-device-mgt!541
2020-05-18 05:11:46 +00:00
charitha
9280810b24 Avoid unnecessary db connection 2020-05-18 10:11:25 +05:30
charitha
f59242d6b8 Fix formatting issue 2020-05-18 09:49:11 +05:30
charitha
573a9e598c Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-05-18 09:23:03 +05:30
charitha
dac5c2b511 Fix deadlock in device application list update 2020-05-18 09:22:23 +05:30
Dharmakeerthi Lasantha
18656792bb Merge branch 'bluetooth' into 'master'
Bluetooth beacon

See merge request entgra/carbon-device-mgt!543
2020-05-17 08:39:17 +00:00
Inosh Perara
df0c26f2f7 Bluetooth beacon 2020-05-17 08:39:17 +00:00
Dharmakeerthi Lasantha
aa76a10756 Merge branch 'user-claim-attribute' into 'master'
Add user claim attribute programmatically

See merge request entgra/carbon-device-mgt!525
2020-05-15 07:38:36 +00:00
Shamalka Navod
d4abcf0fc8 Add user claim attribute programmatically 2020-05-15 07:38:36 +00:00
Dharmakeerthi Lasantha
e7fc9c3c74 Merge branch 'master' into 'master'
Improve bean structure in policy UI config

See merge request entgra/carbon-device-mgt!542
2020-05-14 18:18:46 +00:00
tcdlpds@gmail.com
660935e0d6 Improve bean structure in policy UI config 2020-05-14 23:39:21 +05:30
charitha
311ddc307e Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-05-14 14:44:00 +05:30
charitha
3ccc383d12 Add missing interfaces 2020-05-14 14:43:37 +05:30
charitha
a1a313608f Remove attempt count incrementing logic to optimize performance 2020-05-13 23:39:40 +05:30
Saad Sahibjan
8414679608 Merge branch 'device-delete-fix' into 'master'
Fix device delete

## Purpose
> The purpose of this PR is to fix https://gitlab.com/entgra/product-iots/-/issues/510

## Goals
> Fix device permanent delete failing issue

## Approach
> Add method to delete records of DM_DEVICE_OPERATION_RESPONSE_LARGE table

## 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
> N/A

## Test environment
> Ubuntu 18.04 and MySql 5.7

## Learning
> N/A

See merge request entgra/carbon-device-mgt!540
2020-05-13 09:11:38 +00:00
Pahansith
35baf7ca95 Add log records for large response delete 2020-05-12 18:14:16 +05:30
Pahansith
60d67c9fea Change method calling order 2020-05-12 18:03:05 +05:30
Dharmakeerthi Lasantha
4b3ba956d3 Merge branch 'publisher-fix' into 'master'
Fix app name validation issue for webclips

Closes product-iots#509

See merge request entgra/carbon-device-mgt!539
2020-05-12 12:30:12 +00:00
shamalka
e1a5ae1164 Fix app name validation issue for webclip 2020-05-12 17:16:24 +05:30
Pahansith
c9aa47f078 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master 2020-05-12 15:25:27 +05:30