Commit Graph

9514 Commits

Author SHA1 Message Date
Dharmakeerthi Lasantha
4f2d2f03ce Merge branch 'corrective-policy' into 'corrective-policy'
Fix mail sending issue when policy violated

See merge request entgra/carbon-device-mgt!657
2020-10-01 08:55:02 +00:00
tcdlpds@gmail.com
7fad79643e Fix mail sending issue when policy violated 2020-10-01 14:23:53 +05:30
Inosh Perara
fcd4bc1a41 Merge branch 'corrective-policy' into 'corrective-policy'
Improve mail sending logic

See merge request entgra/carbon-device-mgt!656
2020-10-01 07:13:04 +00:00
Pahansith Gunathilake
bda0a46429 Merge branch 'corrective-policy' into 'corrective-policy'
Fix payload parsing issue

See merge request entgra/carbon-device-mgt!655
2020-10-01 07:12:16 +00:00
tcdlpds@gmail.com
f32e76346f Improve mail sending logic 2020-10-01 12:38:22 +05:30
Pahansith
635adbb04f Fix payload parsing issue 2020-10-01 12:36:30 +05:30
Inosh Perara
4c905358e9 Merge branch 'corrective-policy' into 'corrective-policy'
Fix SQL syntax error

See merge request entgra/carbon-device-mgt!654
2020-10-01 06:48:58 +00:00
tcdlpds@gmail.com
4fdfc07e64 Fix SQL syntax error 2020-10-01 12:09:20 +05:30
Dharmakeerthi Lasantha
725afbcc42 Merge branch 'corrective-policy' into 'corrective-policy'
Improve API interface text

See merge request entgra/carbon-device-mgt!653
2020-09-30 19:12:41 +00:00
tcdlpds@gmail.com
b3d1badd1f Improve API interface text 2020-10-01 00:41:22 +05:30
Inosh Perara
f41bf699ec Merge branch 'corrective-policy' into 'corrective-policy'
Add mail sending feature as corrective action

See merge request entgra/carbon-device-mgt!652
2020-09-30 19:07:28 +00:00
tcdlpds@gmail.com
6014592f2c Add mail sending feature when policy violating 2020-10-01 00:35:22 +05:30
tcdlpds@gmail.com
f9bcb808f9 Improve device location history getting and storing functionalities 2020-10-01 00:35:21 +05:30
Inosh Perara
f7843e5c35 Merge branch 'geofence-api' into 'corrective-policy'
Fix geofence creation validation

See merge request entgra/carbon-device-mgt!651
2020-09-30 18:33:40 +00:00
Inosh Perara
cc8fa5dfb5 Merge branch 'geofencing-feature' into 'corrective-policy'
Add geofence policy transform

See merge request entgra/carbon-device-mgt!644
2020-09-30 18:33:19 +00:00
Pahansith
618b8962b3 Add doc comments 2020-09-30 22:08:31 +05:30
Pahansith
243d6d5400 Fix conflicts 2020-09-30 21:50:47 +05:30
Pahansith
48e1241de6 Add email type corrective action transform 2020-09-30 21:44:03 +05:30
Pahansith
b33c5a312f Fix geofence creation validation 2020-09-30 19:42:00 +05:30
Inosh Perara
f9b25b95a2 Merge branch 'geofence-api' into 'corrective-policy'
Fix issue in geofence creation

See merge request entgra/carbon-device-mgt!650
2020-09-30 13:45:48 +00:00
Dharmakeerthi Lasantha
daaa44a2ea Merge branch 'corrective-policy' into 'corrective-policy'
Add APISelect class to policy mgt ui pack

See merge request entgra/carbon-device-mgt!647
2020-09-30 13:44:29 +00:00
Charitha Goonetilleke
542fea8992 Merge branch 'master' into 'master'
Allow suspended status to update the device status

See merge request entgra/carbon-device-mgt!649
2020-09-30 13:21:23 +00:00
Saad Sahibjan
9998ec3669 Allow other statuses to update the device status 2020-09-30 18:14:57 +05:30
Pahansith
5e98e816cf Fix issue in geofence creation 2020-09-30 18:04:28 +05:30
Pahansith
206f433a9f Improve code 2020-09-30 16:49:45 +05:30
Pahansith
9c362eabf0 Add geofence policy transform 2020-09-30 16:49:45 +05:30
Inosh Perara
691d6c6d7d Merge branch 'geofence-api' into 'corrective-policy'
Add Geo Json and fence shape attributes

See merge request entgra/carbon-device-mgt!648
2020-09-30 10:36:38 +00:00
Pahansith
47dc8ec708 Add Geo Json and fence shape attributes 2020-09-30 14:05:06 +05:30
Kaveesha
ac41aa7119 Add APISelect class to policy mgt ui pack 2020-09-30 13:35:07 +05:30
Ruwan Yatawara
0137976e59 Merge branch 'master' into 'master'
Add task operation with list of device ids

See merge request entgra/carbon-device-mgt!646
2020-09-30 05:30:23 +00:00
charitha
c6fef5d0d1 Add task operation with list of device ids 2020-09-30 10:13:10 +05:30
Pahansith
0a9fbe3654 Improve code 2020-09-30 00:23:30 +05:30
Dharmakeerthi Lasantha
d9294c83f3 Merge branch 'corrective-policy' into 'corrective-policy'
Add permission for geo fence service

See merge request entgra/carbon-device-mgt!645
2020-09-29 15:41:43 +00:00
Kaveesha
cb23d55e8f Add permission for geo fence service 2020-09-29 20:33:52 +05:30
Pahansith
d06fc0e5f3 Add geofence policy transform 2020-09-29 19:31:30 +05:30
Inosh Perara
de4f3f64fe Merge branch 'geofence-api' into 'corrective-policy'
Create geofence APIs

See merge request entgra/carbon-device-mgt!641
2020-09-29 08:32:41 +00:00
Inosh Perara
49a83a2995 Merge branch 'corrective-action' into 'corrective-policy'
Update corrective action

See merge request entgra/carbon-device-mgt!634
2020-09-29 08:32:07 +00:00
Pahansith
91e28b71ab Merge branch 'corrective-policy' of https://gitlab.com/entgra/carbon-device-mgt into corrective-action
 Conflicts:
	components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
2020-09-29 13:11:36 +05:30
Inosh Perara
490a3d854f Merge branch 'master' into 'corrective-policy'
Add location bean classes and format the source

See merge request entgra/carbon-device-mgt!643
2020-09-24 08:30:12 +00:00
tcdlpds@gmail.com
90dac0a101 Add location bean classes and format the source 2020-09-24 08:53:35 +05:30
charitha
64e349c75d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-09-22 19:27:35 +05:30
Pahansith
3c7c05b5e9 Fix reactive action issue 2020-09-21 21:03:10 +05:30
Pahansith
ca6b937a3a Create geofence API definitions 2020-09-21 12:04:25 +05:30
Pahansith
291859bf55 Add test DB scripts 2020-09-21 11:53:13 +05:30
Pahansith
3241831ead Change reactive action 2020-09-21 11:27:46 +05:30
Dharmakeerthi Lasantha
92cca00af0 Merge branch 'master' into 'master'
Add DeviceName to Geo Cluster Locations Details

See merge request entgra/carbon-device-mgt!640
2020-09-15 09:01:56 +00:00
Kaveesha
6104d26ebe Add device name to Geo Cluster Locations data list 2020-09-15 13:32:19 +05:30
Dharmakeerthi Lasantha
01e6cb0522 Merge branch 'master' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt!639
2020-09-12 04:15:44 +00:00
tcdlpds@gmail.com
bbecbb6f8a Fix build failure 2020-09-12 08:43:38 +05:30
Dharmakeerthi Lasantha
3e6e55fa1e Merge branch 'master' into 'master'
Fixed QR generating issue in Cloud App

See merge request entgra/carbon-device-mgt!636
2020-09-09 20:21:05 +00:00