1762 Commits

Author	SHA1	Message	Date
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
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
tcdlpds@gmail.com	90dac0a101	Add location bean classes and format the source	2020-09-24 08:53:35 +05:30
Pahansith	ca6b937a3a	Create geofence API definitions	2020-09-21 12:04:25 +05:30
Kaveesha	6104d26ebe	Add device name to Geo Cluster Locations data list	2020-09-15 13:32:19 +05:30
Saad Sahibjan	7558f82a76	Add error log for backend policy validation failure	2020-08-27 18:40:21 +05:30
Pahansith	a24879f551	Add payload parsing for old type corrective actions	2020-08-26 06:47:38 +05:30
Pahansith	e486db868e	Change policy	2020-08-26 06:47:38 +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
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	d97de23ece	Modify send-invitation API to send enrollment steps and OTP token	2020-08-17 12:15:54 +05:30
tcdlpds@gmail.com	8494f0bc58	Improve OTP creating logic	2020-08-10 10:42:53 +05:30
Shamalka Navod	1ff61da1c4	Sort getAllNotifications API in DESC order	2020-08-06 18:09:35 +00:00
Dharmakeerthi Lasantha	efee2b01bf	Improve OTP creating functionality	2020-08-03 09:11:02 +05:30
tcdlpds@gmail.com	0d48f9d38c	Improve One Time Token Authenticator	2020-07-30 03:06:57 +05:30
Inosh Perara	d8f6e6765a	Merge branch 'master' into 'tenant-improve' ... Add OTP managing functionality See merge request entgra/carbon-device-mgt!602	2020-07-26 05:33:33 +00:00
tcdlpds@gmail.com	709a7ab592	Add OTP managing functionality	2020-07-25 07:56:38 +05:30
Ace	c1c736b607	Adding fix for policy application upon adding devices to group	2020-07-21 08:23:30 +05:30