83aea1fd01
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-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.webapp.publisher/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
# 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.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/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.dashboard/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
# 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/dao/DeviceDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
# 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/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.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.push.notification.provider.gcm.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.dashboard.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.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/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
# features/dynamic-client-registration/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
8 years ago
5411d93103
[maven-release-plugin] prepare for next development iteration
8 years ago
3ea83b925a
[maven-release-plugin] prepare release v2.0.6
8 years ago
7059ad1243
Changing the package name
8 years ago
2881079b27
Removing two unnecessary classes from the project and adding java documentation to class
8 years ago
08ab946e88
Added doc comments
8 years ago
a16052431c
Corrected a typo on [APIMCertificateMGTException]
8 years ago
c2490347b6
Corrected a typo
8 years ago
a5640f48b5
Changed auth type on API resources as configured in web.xml
8 years ago
dfcf72cae0
Merge pull request #518 from geethkokila/mutual_ssl_feature
...
Adding gateway support for IOS device type
8 years ago
8397b688e9
Merge branch 'release-2.0.x' into mutual_ssl_feature
8 years ago
bc93d48927
Merge pull request #520 from madhawap/release-2.0.x
...
fix to WebappPublisherConfig
8 years ago
d22de197a1
fix to WebappPublisherConfig
8 years ago
3795a7e30f
Removing the hardcoded apis
8 years ago
44c7383b15
Adding support to send ios request the synapse gateway
8 years ago
228848075c
Fixed conflicts and merged
8 years ago
42a587904f
Fixed issues in permission-scope mapping
8 years ago
9200adebed
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
8706636b51
Merge pull request #511 from ayyoob/release-2.0.x
...
Made Policy Monitoring for device type to be multitenance & Added default values for push notification dynamic configuration
8 years ago
e6a70b2394
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
11d2ecac10
removing basic auth headers from API definitions.
8 years ago
e0ee2fc1e5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
b20a2e0997
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
c69513e0f5
removed tenant domain from the web.xml
8 years ago
f3409adc21
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
7b8a7c0b52
Merge pull request #1 from GPrathap/release-2.0.x
...
removed setting APIs secured as default.
8 years ago
0fb5a577b8
Fixed some issues found in FindBugs security analysis.
8 years ago
c4a2ba0cea
adding http api publisher for Android agent to work out of the box
8 years ago
65cb12b5ac
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
02d75b757c
Fixed conflicts and merged
8 years ago
f508bcfd0e
corrected method name
8 years ago
649879f998
removed setting APIs secured as default.
...
Because if secured is enabled, it is to be needed to provided parameters which are related to basic oauth, when this is false, jwt token is being used.
8 years ago
6aea6195e9
[maven-release-plugin] prepare for next development iteration
8 years ago
3db5b289ac
[maven-release-plugin] prepare release v2.0.5
8 years ago
ed47094964
[maven-release-plugin] prepare for next development iteration
8 years ago
8d409a7248
[maven-release-plugin] prepare release v2.0.4
8 years ago
1d2a5dc9ef
Updating identity/auth-saml dependencies to latest
8 years ago
83b9fd46cd
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
a633547d19
IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext
8 years ago
8ca28fa1fd
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7
8 years ago
47d8baccf7
upgrading to latest version of identity
8 years ago
8e2432c47b
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
200740eca6
Partial commit for the git update
8 years ago
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
8 years ago
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
d4e9c43ff1
Fixing race condition in creating and subscribing application in api-manager side
8 years ago
7e90fde461
IOTS-292: Adding new filter configs
8 years ago
0bd298e6d7
IOTS-292: Code refactoring
8 years ago
Rasika Perera
WSO2 Builder
geethkokila
Joseph Fonseka
Rasika Perera
madhawap
Milan Perera
inoshperera
ayyoob
Milan Perera
Maninda
GPrathap
Ace
Megala
amalhub