Commit Graph

9083 Commits

Author SHA1 Message Date
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
Kaveesha
e9400a0888 Fix QR generating issue in Cloud App 2020-09-09 23:40:06 +05:30
Saad Sahibjan
cf94fbd8b5 Merge branch 'master' into 'master'
Add report invoker for the product distribution

See merge request entgra/carbon-device-mgt!638
2020-09-09 05:49:30 +00:00
tcdlpds@gmail.com
400c9a2ac9 Add report invoker for the product distribution 2020-09-09 11:17:20 +05:30
Saad Sahibjan
d355638bcc Merge branch 'master' into 'master'
Improve APPM subscribing flow

See merge request entgra/carbon-device-mgt!637
2020-09-09 05:41:32 +00:00
tcdlpds@gmail.com
e96145db25 Improve APPM subscribing flow 2020-09-09 09:52:30 +05:30
charitha
0abde116ca Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-09-03 15:14:55 +05:30
Dharmakeerthi Lasantha
7b71947073 Merge branch 'eslint' into 'master'
Remove duplicated EsLint dependencies from APPM publisher

Closes product-iots#583

See merge request entgra/carbon-device-mgt!583
2020-08-29 02:06:37 +00:00
anjula-sack
d9c12bfca6 Remove duplicated EsLint dependencies from APPM publisher 2020-08-27 20:33:35 +05:30
Dharmakeerthi Lasantha
c4008efed0 Merge branch 'master' into 'master'
Add error log for backend policy validation failure

See merge request entgra/carbon-device-mgt!635
2020-08-27 13:41:34 +00:00
Saad Sahibjan
7558f82a76 Add error log for backend policy validation failure 2020-08-27 18:40:21 +05:30
Saad Sahibjan
423f1f5a55 Merge branch 'master' into 'master'
Fix APPM custom permission loading issue

See merge request entgra/carbon-device-mgt!633
2020-08-27 04:38:55 +00:00
charitha
5d6c614a7a Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
 Conflicts:
	components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java
2020-08-27 09:40:33 +05:30
tcdlpds@gmail.com
ef8af6b454 Fix APPM custom permission loading issue 2020-08-27 05:30:47 +05:30
Dharmakeerthi Lasantha
c043517189 Merge branch 'master' into 'master'
Fix formatting issues

See merge request entgra/carbon-device-mgt!632
2020-08-26 23:50:20 +00:00
tcdlpds@gmail.com
215b8fb630 Fix formatting issues 2020-08-27 05:18:02 +05:30
Pahansith
d08f20d90e Fix code review discussions 2020-08-26 06:47:38 +05:30
Pahansith
a24879f551 Add payload parsing for old type corrective actions 2020-08-26 06:47:38 +05:30
Pahansith
2724d8ac03 Optimize policy pick strategy for corrective action implementation 2020-08-26 06:47:38 +05:30
Pahansith
684ff5df7f Fix test failures 2020-08-26 06:47:38 +05:30
Pahansith
e486db868e Change policy 2020-08-26 06:47:38 +05:30
Saad Sahibjan
eecb3704d5 Merge branch 'feature/appm/sync' into 'master'
Add new feature to install applications for device

See merge request entgra/carbon-device-mgt!629
2020-08-25 18:04:46 +00:00
Dharmakeerthi Lasantha
1919fbde16 Add new feature to install applications for device 2020-08-25 18:04:46 +00:00
Saad Sahibjan
05055937e7 Merge branch 'master' into 'master'
Update device enrollment of user mail template URL

See merge request entgra/carbon-device-mgt!630
2020-08-25 18:02:41 +00:00
Saad Sahibjan
4eb523cc83 Update device enrollment of user mail template URL 2020-08-25 23:31:33 +05:30
Dharmakeerthi Lasantha
813a150060 Merge branch 'master' into 'master'
Add unrestricted roles editing functionality

See merge request entgra/carbon-device-mgt!627
2020-08-25 17:44:26 +00:00
Saad Sahibjan
a615f14ec5 Replace Icon with EditOutlined 2020-08-25 19:27:02 +05:30
Saad Sahibjan
b15ae2c48c Add unrestricted roles editing functionality 2020-08-25 18:53:44 +05:30
Inosh Perara
fcd92bc10e Merge branch 'tenant-improve' into 'master'
Add OTP service and it's features

See merge request entgra/carbon-device-mgt!624
2020-08-23 07:49:59 +00:00
Dharmakeerthi Lasantha
1ee2807826 Merge branch 'tenant-improve' into 'tenant-improve'
Improve code formatting

See merge request entgra/carbon-device-mgt!625
2020-08-21 03:51:57 +00:00
tcdlpds@gmail.com
8aeb4d22ea Improve code formatting 2020-08-21 09:18:55 +05:30
Dharmakeerthi Lasantha
dc8c4ef3a4 Merge branch 'tenant-improve' into 'tenant-improve'
Add tenant creation completing functionality in OTP service

See merge request entgra/carbon-device-mgt!623
2020-08-19 17:12:14 +00:00