lasanthaDLPDS
f810c1a7e4
Fix minor issues and add app manager UI into the feature
2018-11-21 08:01:51 +05:30
lasanthaDLPDS
b6a0b75f05
Fix build failure
2018-11-18 14:04:14 +05:30
lasanthaDLPDS
7e1397637a
Upgrade app management feature
2018-11-18 09:50:10 +05:30
lasanthaDLPDS
bc8e91a78e
Upgrade application mgt version
2018-11-18 08:07:55 +05:30
lasanthaDLPDS
8841741567
Fiz merge conflicts
2018-11-18 08:05:35 +05:30
Entgra Builder
cbe85378d8
[maven-release-plugin] prepare for next development iteration
2018-11-11 13:25:02 +00:00
Entgra Builder
4b1f83b168
[maven-release-plugin] prepare release v3.2.1
2018-11-11 13:24:57 +00:00
charitha
c3893d93bb
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master
2018-11-11 14:28:00 +05:30
Charitha Goonetilleke
0e3f3bb2c7
Merge branch 'master' into 'master'
...
Fixing issue with task scheduler
See merge request entgra/carbon-device-mgt!33
2018-11-11 08:57:43 +00:00
charitha
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
2018-11-11 14:27:32 +05:30
Ace
880720a72f
Fixing issue with task scheduler
2018-11-09 21:51:42 +05:30
WSO2 Builder
b4e8bb4da0
[WSO2 Release] [Jenkins #3054 ] [Release 3.1.51] prepare for next development iteration
2018-10-30 16:02:55 +00:00
WSO2 Builder
e482894fbd
[WSO2 Release] [Jenkins #3054 ] [Release 3.1.51] prepare release v3.1.51
2018-10-30 16:02:44 +00:00
Geeth
ab6223021c
Merge pull request #1272 from charithag/master
...
Fixed date format issue in geo fencing
2018-10-30 21:19:39 +05:30
charitha
10672ea534
Fixed date format issue in geofencing
2018-10-30 20:47:31 +05:30
Charitha Goonetilleke
f847e4e733
Update .gitlab-ci.yml
2018-10-30 09:44:17 +00:00
charitha
d936aea03a
Fixed pom issues
2018-10-30 14:45:54 +05:30
charitha
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
2018-10-30 14:29:37 +05:30
WSO2 Builder
1bd160f551
[WSO2 Release] [Jenkins #3052 ] [Release 3.1.50] prepare for next development iteration
2018-10-30 07:42:23 +00:00
WSO2 Builder
b45aef9fec
[WSO2 Release] [Jenkins #3052 ] [Release 3.1.50] prepare release v3.1.50
2018-10-30 07:42:11 +00:00
Geeth
4d67016736
Merge pull request #1271 from charithag/master
...
Fixed https://github.com/wso2/product-iots/issues/1184
2018-10-30 12:54:30 +05:30
charitha
86029752f8
Fixed https://github.com/wso2/product-iots/issues/1184
2018-10-29 21:03:24 +05:30
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
2018-10-27 12:26:59 +00:00
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
2018-10-27 12:20:18 +00:00
WSO2 Builder
764b119ae5
[WSO2 Release] [Jenkins #3050 ] [Release 3.1.49] prepare for next development iteration
2018-10-24 19:03:29 +00:00
WSO2 Builder
1bbbce9ac3
[WSO2 Release] [Jenkins #3050 ] [Release 3.1.49] prepare release v3.1.49
2018-10-24 19:03:17 +00:00
inoshperera
ebb51a11da
Merge pull request #1270 from geethkokila/master
...
Fixing the SQL
2018-10-25 00:14:55 +05:30
geethkokila
2bb3e2cdc0
Fixing the SQL
2018-10-25 00:11:49 +05:30
WSO2 Builder
5005cebbff
[WSO2 Release] [Jenkins #3048 ] [Release 3.1.48] prepare for next development iteration
2018-10-24 04:01:39 +00:00
WSO2 Builder
5d688d8c4f
[WSO2 Release] [Jenkins #3048 ] [Release 3.1.48] prepare release v3.1.48
2018-10-24 04:01:27 +00:00
Geeth
dbf102f6ae
Merge pull request #1269 from lasanthaDLPDS/master
...
Fix device monitoring task disabling issue
2018-10-24 09:18:13 +05:30
lasanthaDLPDS
e76fe92ebe
Fix device monitoring task disabling issue
2018-10-24 08:29:35 +05:30
Madawa Soysa
6795cbb180
Add IMEI parameter to custom parameters of the advanced search
...
Fixes entgra/product-iots#8
2018-10-24 13:53:13 +11:00
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
2018-10-24 13:52:28 +11:00
WSO2 Builder
a18b4550ef
[WSO2 Release] [Jenkins #3046 ] [Release 3.1.47] prepare for next development iteration
2018-10-22 19:13:35 +00:00
WSO2 Builder
9c77054795
[WSO2 Release] [Jenkins #3046 ] [Release 3.1.47] prepare release v3.1.47
2018-10-22 19:13:23 +00:00
Hasunie
6fafde1d16
Merge pull request #1268 from charithag/master
...
Fixed NPE in sending push notifications
2018-10-22 06:56:17 -07:00
Madawa Soysa
9b5cb1ef6a
Fix issue with search not updating
...
Related: entgra/product-iots#6
2018-10-22 17:47:32 +11:00
charitha
128b5f64aa
Fixed NPE in sending push notifications
2018-10-22 10:36:58 +05:30
Madawa Soysa
6aca4650e2
Introduce new API for user search based on user attributes
...
This commit introduces a new API to search users based on user claims such as First Name, Last Name, Email, etc. This new API can be used to filter users through a search query. Also this commit includes the UI modifications to modify the exiting user listing page to allow filter users by attributes.
Fixes to entgra/product-iots#6
2018-10-22 13:41:30 +11:00
WSO2 Builder
8eaa7c6698
[WSO2 Release] [Jenkins #3044 ] [Release 3.1.46] prepare for next development iteration
2018-10-21 13:35:14 +00:00
WSO2 Builder
03b88248b8
[WSO2 Release] [Jenkins #3044 ] [Release 3.1.46] prepare release v3.1.46
2018-10-21 13:34:59 +00:00
Geeth
5cec8ae8d5
Merge pull request #1267 from charithag/master
...
Fixed issue in deploying execution plans as non admin user
2018-10-21 18:47:57 +05:30
charitha
3856a25449
Fixed authentication issue in deploying execution plans as non admin user
2018-10-21 14:30:06 +05:30
WSO2 Builder
bfff9e7a7e
[WSO2 Release] [Jenkins #3042 ] [Release 3.1.45] prepare for next development iteration
2018-10-18 06:51:09 +00:00
WSO2 Builder
af64244ab3
[WSO2 Release] [Jenkins #3042 ] [Release 3.1.45] prepare release v3.1.45
2018-10-18 06:50:57 +00:00
Geeth
866ca72416
Merge pull request #1266 from ruwany/master
...
Fixing issue with retrieving tenant aware username when retrieving geo location info
2018-10-18 12:06:16 +05:30
Ace
3f77a3b27c
Adding correct tenant ID
2018-10-18 11:55:20 +05:30
Ace
92bf6f4140
Fixing formatting issues
2018-10-18 11:36:12 +05:30
Ace
b39be48919
Adding constants
2018-10-18 11:31:10 +05:30
