Commit Graph

870 Commits

Author SHA1 Message Date
Amalka Subasinghe
f9274b0d1a update from master 2021-08-02 11:18:15 +05:30
Pahansith Gunathilake
dc6856fc0e Merge branch 'master' into 'master'
Block Uninstall Policy Feature

See merge request entgra/carbon-device-mgt!787
2021-08-02 05:09:51 +00:00
Muhammad Rashad
556886daec Block Uninstall Policy Feature 2021-08-02 05:09:51 +00:00
Amalka Subasinghe
fc9a9ca210 fixed permission issues 2021-07-13 09:28:30 +05:30
Amalka Subasinghe
f9a9cff0b9 updated user roles 2021-06-28 13:04:13 +05:30
Amalka Subasinghe
94dd33ffa5 scope-role-permission refactoring and webapp authorization 2021-06-26 13:45:27 +05:30
Saad Sahibjan
24e69d5492 Fix test cases related to hierarchical group changes 2021-06-24 21:06:30 +05:30
Saad Sahibjan
e18aa57fe8 Add and update api layer related to hierarchical changes 2021-06-24 20:46:44 +05:30
Amalka Subasinghe
51dd72ff79 commented braking changes related to analytics 2021-06-22 11:26:01 +05:30
Amalka Subasinghe
d090fef2ac updated from master and added oauth2 component 2021-06-21 21:31:44 +05:30
Amalka Subasinghe
83b31f0d02 updated from master and fixed conf copying issue 2021-05-24 16:40:05 +05:30
charithag
e5fb17aceb Add geo view API 2021-05-19 17:12:50 +05:30
Amalka Subasinghe
056987141b cleaned up components/device-mgt 2021-05-10 12:30:38 +05:30
Amalka Subasinghe
c33e13b04c updating to kernel 4.6.1 2021-05-10 09:41:45 +05:30
MalshaPiumini
6f325862ec Formatting the SQL query. 2021-05-06 14:12:03 +05:30
MalshaPiumini
b2691996ab Added device filter using serial number. 2021-05-05 14:37:45 +05:30
tcdlpds@gmail.com
51fface401 Append tenant domain when getting default access token 2021-01-27 15:05:38 +05:30
Malsha Piumini
89298f933e Uninstall applications via Apps Tab - (For Android devices only) 2021-01-06 19:07:09 +00:00
charitha
a9cb2ae84d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
 Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
2020-12-11 17:26:53 +05:30
Shamalka Navod
eccb39d6f4 Improve metadata API 2020-12-07 20:15:18 +00:00
Ace
4df57ede61 incoorporating review comments 2020-12-07 13:09:14 +05:30
Ace
bac6e3ba67 merging with upstream 2020-12-04 07:45:10 +05:30
Pahansith Gunathilake
caba7fc673 Add missing error logs to OperationManagerImpl 2020-11-30 15:51:52 +00:00
Pahansith
e5dd609dc2 Add method comments and format code 2020-11-30 15:41:51 +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
Pahansith
a3629d5932 Add group data into geofence response, Format code 2020-11-21 12:24:55 +05:30
Pahansith
8c80185610 Add doc comments and format code 2020-11-21 12:22:53 +05:30
Pahansith
d9d0ba5d90 Add event delete API 2020-11-21 12:22:53 +05:30
Pahansith
f073ee9276 Add H2 DAO for event configuration 2020-11-21 12:22:53 +05:30
Pahansith
efe116d87e Modify geofence get API 2020-11-21 12:22:53 +05:30
Pahansith
af85ca47e0 Change Geo fence edit API - Attach Events 2020-11-21 12:22:53 +05:30
Pahansith
bd8cf5237d Change Geo fence create API - Attach Event creation 2020-11-21 12:22:53 +05:30
Ace
b1d95af5b0 remvoing restriction that prevents activity count to be returned when if-modified-since header is present 2020-11-20 23:37:48 +05:30
tcdlpds@gmail.com
b9c2190762 Fix merge conflicts 2020-11-15 00:32:24 +05:30
Malsha Piumini
f347861000 Add functionality to filter Operation Logs 2020-11-14 17:25:36 +00:00
tcdlpds@gmail.com
d25779774b Improve MDM policy functionality 2020-11-12 01:28:23 +05:30
Dharmakeerthi Lasantha
94bdff30ed Merge branch 'geofence-api' into 'corrective-policy'
Fix issue in Geo fence get by fence name

See merge request entgra/carbon-device-mgt!677
2020-11-11 14:36:55 +00:00
Kaveesha
a38e91499e Add API for get devices history snapshots 2020-11-05 15:36:59 +05:30
Pahansith
84608f2f58 Fix issue in Geo fence get by fence name 2020-11-05 09:49:39 +05:30
Inosh Perara
f97d9307e7 Merge branch 'geofence-api' into 'corrective-policy'
Add geo fence search and geo cache

See merge request entgra/carbon-device-mgt!670
2020-10-19 07:52:23 +00:00
Pahansith
bc7e39c883 Add geo fence search and geo cache 2020-10-15 10:05:37 +05:30
shamalka
90ed562647 Improve device location history API 2020-10-13 16:11:46 +05:30
tcdlpds@gmail.com
a0b882f755 Fix geo fence deleting issue 2020-10-02 06:33:58 +05:30
Pahansith
83236eb3ac Fix geofence update issue 2020-10-01 19:48:00 +05:30
tcdlpds@gmail.com
b3d1badd1f Improve API interface text 2020-10-01 00:41:22 +05:30
tcdlpds@gmail.com
6014592f2c Add mail sending feature when policy violating 2020-10-01 00:35:22 +05:30
Pahansith
b33c5a312f Fix geofence creation validation 2020-09-30 19:42:00 +05:30
Pahansith
47dc8ec708 Add Geo Json and fence shape attributes 2020-09-30 14:05:06 +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