Commit Graph

9514 Commits

Author SHA1 Message Date
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
tcdlpds@gmail.com
b1845d9b42 Update user welcome mail body 2020-08-19 22:38:34 +05:30
Saad Sahibjan
2aad505251 Merge branch 'tenant-improve' into 'tenant-improve'
Update user enrollment email template

See merge request entgra/carbon-device-mgt!622
2020-08-19 06:54:00 +00:00
Saad Sahibjan
d0b90dba5e Update user enrollment email template 2020-08-19 12:22:56 +05:30
tcdlpds@gmail.com
d53f56c96b Complete self registration via OTP service 2020-08-18 08:17:56 +05:30
Dharmakeerthi Lasantha
7f7fbf21b4 Merge branch 'tenant-improve' into 'tenant-improve'
Modify invite-user API to have enrollment steps included in the mail and add OTP token as query param

See merge request entgra/carbon-device-mgt!619
2020-08-18 02:44:19 +00:00
Saad Sahibjan
d1c894abfe Modify user enrollment mail template to have enrollment steps 2020-08-17 12:15:54 +05:30
Saad Sahibjan
322981fe5a Use DEVICE_ENROLLMENT email type to create OTP 2020-08-17 12:15:54 +05:30
Saad Sahibjan
0e018679b8 Modify test cases related to device enrollment invitation 2020-08-17 12:15:54 +05:30
Saad Sahibjan
1b0c19cb02 Add device enrollment invitation beans 2020-08-17 12:15:54 +05:30
Saad Sahibjan
ff00f26c83 Implement retrieval of DeviceEnrollmentInvitationDetails from the device management service 2020-08-17 12:15:54 +05:30
Saad Sahibjan
d2ab4c6710 Implement retrieval of DeviceEnrollmentInvitationDetails from device type xml files 2020-08-17 12:15:54 +05:30
Saad Sahibjan
d97de23ece Modify send-invitation API to send enrollment steps and OTP token 2020-08-17 12:15:54 +05:30
Saad Sahibjan
58217ac77a Implement service to create OTP and to send device enrollment invitation 2020-08-17 12:15:54 +05:30
Dharmakeerthi Lasantha
f0dbc4100e Merge branch 'tenant-improve' into 'tenant-improve'
Fix invoker loading issue

See merge request entgra/carbon-device-mgt!621
2020-08-16 19:37:32 +00:00
tcdlpds@gmail.com
ea6b8c7536 Fix invoker loading issue 2020-08-17 01:03:55 +05:30
Dharmakeerthi Lasantha
bf7316a3a8 Merge branch 'tenant-improve' into 'tenant-improve'
Improve OTP service

See merge request entgra/carbon-device-mgt!620
2020-08-16 03:19:11 +00:00
tcdlpds@gmail.com
a55a3b6ebd Improve OTP service 2020-08-16 08:46:59 +05:30
Saad Sahibjan
ec07772302 Merge branch 'tenant-improve' into 'tenant-improve'
Add email enum

See merge request entgra/carbon-device-mgt!618
2020-08-13 06:47:43 +00:00
tcdlpds@gmail.com
a3510cbee1 Add email enum 2020-08-13 12:15:06 +05:30