7380 Commits (1b3390f1b9ab216f7b9c69ae4c8c06a9e762ec5f)

 

All Branches   

Search

Author	SHA1	Message	Date
Charitha Goonetilleke	e78a2a1279	Merge remote-tracking branch 'entgra/master' into entgra-master	6 years ago
Charitha Goonetilleke	75dd9321af	Add methods to get device count based on status and device type	6 years ago
Dharmakeerthi Lasantha	b90f188e9b	Merge branch 'master' into 'master' ... Enrollment application install feature for policy See merge request entgra/carbon-device-mgt!37	6 years ago
Saad Sahibjan	ae9dd807cc	Enrollment application install feature for policy	6 years ago
Madawa Soysa	b902763eac	Merge branch 'fix-advance-search' into 'master' ... Fix issue with advanced search to pick the correct enrollment Closes product-iots#14 and product-iots#13 See merge request entgra/carbon-device-mgt!36	6 years ago
Madawa Soysa	6f80d1993d	Move private constants to a public constant class	6 years ago
Madawa Soysa	eea040f391	Remove redundant authorization check and fix the test	6 years ago
Madawa Soysa	001649e5fd	Fix issue with advanced search to pick the correct enrollment ... This commit addresses following two issues, 1. Advanced search feature returns the oldest enrollment instance This issue occurs when the same device is enrolled for multiple users. The cause of the issue is filtering the devices by device identifier which is a unique property for a device. This commit fixes the issue by filtering the devices from enrollment id and owner instead of the device identifier. 2. All devices do not return for privileged users when searched through advanced-search The cause of the issue is not considering the user permissions when filtering the devices. This commit fixes the issue by validating the permissions of the logged in user before filtering. Fixes entgra/product-iots#13 Fixes entgra/product-iots#14	6 years ago
Rephy Quaphy	c8daa00ad2	Merge branch 'application-mgt-new' into 'application-mgt-new' ... Adding app release creating API See merge request entgra/carbon-device-mgt!26	6 years ago
lasanthaDLPDS	f810c1a7e4	Fix minor issues and add app manager UI into the feature	6 years ago
Charitha Goonetilleke	e46047589b	Merge branch 'fyp-stable2' into 'master' ... Replace WSO2 naming to Entgra See merge request entgra/carbon-device-mgt!34	6 years ago
Nuwan	0dbe2b30d7	Replace WSO2 naming to Entgra	6 years ago
lasanthaDLPDS	b6a0b75f05	Fix build failure	6 years ago
lasanthaDLPDS	7e1397637a	Upgrade app management feature	6 years ago
lasanthaDLPDS	bc8e91a78e	Upgrade application mgt version	6 years ago
lasanthaDLPDS	8841741567	Fiz merge conflicts	6 years ago
Entgra Builder	cbe85378d8	[maven-release-plugin] prepare for next development iteration	6 years ago
Entgra Builder	4b1f83b168	[maven-release-plugin] prepare release v3.2.1	6 years ago
Charitha Goonetilleke	c3893d93bb	Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master	6 years ago
Charitha Goonetilleke	0e3f3bb2c7	Merge branch 'master' into 'master' ... Fixing issue with task scheduler See merge request entgra/carbon-device-mgt!33	6 years ago
Charitha Goonetilleke	4deb71229c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master ... # Conflicts: # components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml # components/apimgt-extensions/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml # components/certificate-mgt/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml # components/device-mgt-extensions/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml # components/device-mgt/pom.xml # components/email-sender/org.wso2.carbon.email.sender.core/pom.xml # components/email-sender/pom.xml # components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml # components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml # components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml # components/identity-extensions/pom.xml # components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml # components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml # components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml # components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml # components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml # components/policy-mgt/pom.xml # components/test-coverage/pom.xml # components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml # components/webapp-authenticator-framework/pom.xml # features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml # features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml # features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml # features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml # features/apimgt-extensions/pom.xml # features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml # features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml # features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml # features/certificate-mgt/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml # features/device-mgt-extensions/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml # features/device-mgt/pom.xml # features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml # features/email-sender/pom.xml # features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml # features/jwt-client/pom.xml # features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml # features/oauth-extensions/pom.xml # features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml # features/policy-mgt/pom.xml # features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml # features/webapp-authenticator-framework/pom.xml # pom.xml	6 years ago
Ace	880720a72f	Fixing issue with task scheduler	6 years ago
WSO2 Builder	b4e8bb4da0	[WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare for next development iteration	6 years ago
WSO2 Builder	e482894fbd	[WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare release v3.1.51	6 years ago
Geeth	ab6223021c	Merge pull request #1272 from charithag/master ... Fixed date format issue in geo fencing	6 years ago
Charitha Goonetilleke	10672ea534	Fixed date format issue in geofencing	6 years ago
Charitha Goonetilleke	f847e4e733	Update .gitlab-ci.yml	6 years ago
Charitha Goonetilleke	d936aea03a	Fixed pom issues	6 years ago
Charitha Goonetilleke	f0ec4a3520	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master ... # Conflicts: # components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml # components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml # components/apimgt-extensions/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml # components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml # components/certificate-mgt/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml # components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml # components/device-mgt-extensions/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/Operation.java # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/ProfileOperationDAOImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml # components/device-mgt/pom.xml # components/email-sender/org.wso2.carbon.email.sender.core/pom.xml # components/email-sender/pom.xml # components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml # components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml # components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml # components/identity-extensions/pom.xml # components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml # components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml # components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml # components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml # components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml # components/policy-mgt/pom.xml # components/test-coverage/pom.xml # components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml # components/webapp-authenticator-framework/pom.xml # features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml # features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml # features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml # features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml # features/apimgt-extensions/pom.xml # features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml # features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml # features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml # features/certificate-mgt/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml # features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml # features/device-mgt-extensions/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml # features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml # features/device-mgt/pom.xml # features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml # features/email-sender/pom.xml # features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml # features/jwt-client/pom.xml # features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml # features/oauth-extensions/pom.xml # features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml # features/policy-mgt/pom.xml # features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml # features/webapp-authenticator-framework/pom.xml # pom.xml	6 years ago
WSO2 Builder	1bd160f551	[WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare for next development iteration	6 years ago
WSO2 Builder	b45aef9fec	[WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare release v3.1.50	6 years ago
Geeth	4d67016736	Merge pull request #1271 from charithag/master ... Fixed https://github.com/wso2/product-iots/issues/1184	6 years ago
Charitha Goonetilleke	86029752f8	Fixed https://github.com/wso2/product-iots/issues/1184	6 years ago
Charitha Goonetilleke	e25d536210	Introduce new API for user search based on user attributes ... Closes product-iots#6 See merge request entgra/carbon-device-mgt!31	6 years ago
Ruwan Yatawara	c05d85646e	Merge branch 'improve-device-search' into 'master' ... Fix issues with Advanced Device Search Closes product-iots#8 and product-iots#7 See merge request entgra/carbon-device-mgt!32	6 years ago
WSO2 Builder	764b119ae5	[WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare for next development iteration	6 years ago
WSO2 Builder	1bbbce9ac3	[WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare release v3.1.49	6 years ago
inoshperera	ebb51a11da	Merge pull request #1270 from geethkokila/master ... Fixing the SQL	6 years ago
geethkokila	2bb3e2cdc0	Fixing the SQL	6 years ago
WSO2 Builder	5005cebbff	[WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare for next development iteration	6 years ago
WSO2 Builder	5d688d8c4f	[WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare release v3.1.48	6 years ago
Geeth	dbf102f6ae	Merge pull request #1269 from lasanthaDLPDS/master ... Fix device monitoring task disabling issue	6 years ago
lasanthaDLPDS	e76fe92ebe	Fix device monitoring task disabling issue	6 years ago
Madawa Soysa	6795cbb180	Add IMEI parameter to custom parameters of the advanced search ... Fixes entgra/product-iots#8	6 years ago
Madawa Soysa	5300a7f363	Fix device advanced search ... Device search button was not functioning due to a id mismatch. This commit fixes the issue. Fixes entgra/product-iots#7	6 years ago
WSO2 Builder	a18b4550ef	[WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare for next development iteration	6 years ago
WSO2 Builder	9c77054795	[WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare release v3.1.47	6 years ago
Hasunie	6fafde1d16	Merge pull request #1268 from charithag/master ... Fixed NPE in sending push notifications	6 years ago
Madawa Soysa	9b5cb1ef6a	Fix issue with search not updating ... Related: entgra/product-iots#6	6 years ago
Charitha Goonetilleke	128b5f64aa	Fixed NPE in sending push notifications	6 years ago