Commit Graph

8994 Commits

Author SHA1 Message Date
charitha
31a6497950 Fix enrollment modification issues 2020-11-29 10:47:06 +05:30
charitha
d75f48166e Provide response based on headers 2020-11-29 10:47:06 +05:30
charitha
10d114ba1e Improve activity retrieval logic 2020-11-29 10:47:05 +05:30
Dharmakeerthi Lasantha
2959cab240 Merge branch 'master' into 'master'
Use device updated timestamp to filter updated devices

See merge request entgra/carbon-device-mgt!687
2020-11-17 03:01:44 +00:00
Dharmakeerthi Lasantha
09a2dd3a1d Merge branch 'master' into 'master'
Add functionality to filter Operation Logs

See merge request entgra/carbon-device-mgt!610
2020-11-14 17:25:36 +00:00
Malsha Piumini
f347861000 Add functionality to filter Operation Logs 2020-11-14 17:25:36 +00:00
Dharmakeerthi Lasantha
92e23ca03a Merge branch 'issue-works' into 'master'
Fix new app publishing feature if there is an app release already published for the same application

Closes product-iots#678

See merge request entgra/carbon-device-mgt!686
2020-11-12 05:32:14 +00:00
Farheen99
01e5e30173 Remove added setState method in componentDidMount 2020-11-12 10:01:58 +05:30
Farheen99
fdaf8bd7ef Update changes for lifecycle check method 2020-11-12 06:05:33 +05:30
Farheen99
0df8c8d91c Disable publish button for releases with a published app 2020-11-12 06:05:33 +05:30
Dharmakeerthi Lasantha
c4927c3508 Merge branch 'issue-work-287' into 'master'
Hide package name METADATA showing as "default.app.com" for web-clip apps

Closes product-iots#287

See merge request entgra/carbon-device-mgt!688
2020-11-11 04:42:07 +00:00
Inosh Perara
b372856af6 Merge branch 'master' into 'master'
Handle re-applying of failed policies via monitoring through a different operation code

Closes product-iots#265

See merge request entgra/carbon-device-mgt!682
2020-11-11 03:33:18 +00:00
Farheen99
bbf580d43a Hide package name METADATA for web clip apps only 2020-11-10 22:16:57 +05:30
charitha
9e3ec5e24e Use device updated timestamp to filter updated devices 2020-11-10 21:25:42 +05:30
Charitha Goonetilleke
7b82fbd8a5 Merge branch 'master' into 'master'
Add new Enrollment statuses for IoT devices

See merge request entgra/carbon-device-mgt!685
2020-11-10 03:27:00 +00:00
charitha
5d34b0671e Add new Enrollment statuses for IoT devices 2020-11-10 08:08:48 +05:30
Saad Sahibjan
65266e0685 Handle re-applying of failed policies via monitoring through a different operation code 2020-11-09 19:48:24 +05:30
Ruwan Yatawara
2cb0936c66 Merge branch 'lasantha' into 'master'
fixing issues with activity retrieval

See merge request entgra/carbon-device-mgt!669
2020-10-26 05:06:06 +00:00
Ace
d831ef3284 code improvements 2020-10-26 09:40:50 +05:30
Ace
ad299e676c removing un-necessary files 2020-10-23 17:21:23 +05:30
Ace
61c05143c4 Fixing activity retrieval with intiatedBy 2020-10-23 16:59:35 +05:30
Ace
22eba43aa9 including missing files 2020-10-15 21:05:33 +05:30
Ace
2ae8c126e8 fixing issues with activity retrieval 2020-10-15 21:01:24 +05:30
Dharmakeerthi Lasantha
8712b221e4 Merge branch 'master' into 'master'
Fixes for device enrollment status change issues

See merge request entgra/carbon-device-mgt!663
2020-10-08 13:17:54 +00:00
charitha
fb3da8c94d Fixes for device enrollment status change issues 2020-10-08 17:14:00 +05:30
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
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
charitha
64e349c75d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-09-22 19:27:35 +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