ayyoob
dac7d3c1ee
made device management to be default tag
8 years ago
ayyoob
67ae4c7c68
fixed api subscription issue
8 years ago
ayyoob
6c96d228ae
added subscription fix
8 years ago
ayyoob
b7566f4e4a
added artifact deployment support through UI
8 years ago
ayyoob
274d3e9aeb
used jwt grant type instead of saml
8 years ago
Kamidu Sachith Punchihewa
559fe98cc9
Merge pull request #585 from wso2/master
...
Cloud ui fixes and the new master fixes
8 years ago
WSO2 Builder
54a278a1bc
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare for next development iteration
8 years ago
WSO2 Builder
3bc46c4d2d
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare release v2.0.15
8 years ago
WSO2 Builder
1bc8f5c28d
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare for next development iteration
8 years ago
WSO2 Builder
1483503790
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare release v2.0.14
8 years ago
Milan Perera
701d6e4522
Updated the snapshot version of intergration client
8 years ago
Milan Perera
a5f41ef734
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
8 years ago
ayyoob
38f61adf94
few changes after testing multi tenancy
8 years ago
WSO2 Builder
5dc55bb5b5
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare for next development iteration
8 years ago
WSO2 Builder
c7fe9c3a20
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare release v2.0.13
8 years ago
WSO2 Builder
c17bead1fc
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare for next development iteration
8 years ago
WSO2 Builder
14100d3cc8
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare release v2.0.12
8 years ago
Milan Perera
2b4a3cde61
Fixed conflicts and merged
8 years ago
Milan Perera
21d8d14b7e
Fixed multy tenancy issues related to android device type
8 years ago
ayyoob
0c4a78f3e9
fixed api Id issue for subscription
8 years ago
ayyoob
3c45f9af11
fixed api Id issue for subscription
8 years ago
ayyoob
159e067fed
changed integration client version
8 years ago
ayyoob
b42505c1fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
8 years ago
ayyoob
1a7a215441
added missing license headers
8 years ago
ayyoob
1370b87618
fixed apim application issue
8 years ago
WSO2 Builder
cd7e0feaa6
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare for next development iteration
8 years ago
WSO2 Builder
abb150d9bd
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare release v2.0.11
8 years ago
ayyoob
7348ae2f2a
resolved merge issues
8 years ago
ayyoob
3423ef025d
merged with upstream
8 years ago
ayyoob
e74b4e23c4
removed apim dependency from cdmf
8 years ago
WSO2 Builder
002fb8719b
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
04f32902fd
[maven-release-plugin] prepare release v2.0.10
8 years ago
WSO2 Builder
5c207897ad
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
233d14edbd
[maven-release-plugin] prepare release v2.0.9
8 years ago
WSO2 Builder
eedecf00ed
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
ef57fc463b
[maven-release-plugin] prepare release v2.0.8
8 years ago
ayyoob
5927064435
apim seperation
8 years ago
ayyoob
2a538ff959
fixed multi tenant login issue
8 years ago
WSO2 Builder
585b9bde4d
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
d206148841
[maven-release-plugin] prepare release v2.0.7
8 years ago
geethkokila
bf8ab0da11
Adding support for identifying the device type from the url
8 years ago
ayyoob
5b3a8091ec
fixed Null pointer exception
8 years ago
ayyoob
d4ec0705e7
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
cdd144237f
removed unused parameter
8 years ago
Milan Perera
21c50c9a55
Fixed NPE occurred due to scope mapping
8 years ago
ayyoob
2fbaf31b93
fixed permission and assigned environment variables for url context
8 years ago
Rasika Perera
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
WSO2 Builder
5411d93103
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
3ea83b925a
[maven-release-plugin] prepare release v2.0.6
8 years ago
geethkokila
7059ad1243
Changing the package name
8 years ago
geethkokila
2881079b27
Removing two unnecessary classes from the project and adding java documentation to class
8 years ago
Rasika Perera
08ab946e88
Added doc comments
8 years ago
Rasika Perera
a16052431c
Corrected a typo on [APIMCertificateMGTException]
8 years ago
Rasika Perera
c2490347b6
Corrected a typo
8 years ago
Joseph Fonseka
a5640f48b5
Changed auth type on API resources as configured in web.xml
8 years ago
Rasika Perera
dfcf72cae0
Merge pull request #518 from geethkokila/mutual_ssl_feature
...
Adding gateway support for IOS device type
8 years ago
Rasika Perera
8397b688e9
Merge branch 'release-2.0.x' into mutual_ssl_feature
8 years ago
Rasika Perera
bc93d48927
Merge pull request #520 from madhawap/release-2.0.x
...
fix to WebappPublisherConfig
8 years ago
madhawap
d22de197a1
fix to WebappPublisherConfig
8 years ago
geethkokila
3795a7e30f
Removing the hardcoded apis
8 years ago
geethkokila
44c7383b15
Adding support to send ios request the synapse gateway
8 years ago
Milan Perera
228848075c
Fixed conflicts and merged
8 years ago
Milan Perera
42a587904f
Fixed issues in permission-scope mapping
8 years ago
geethkokila
9200adebed
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Rasika Perera
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
inoshperera
e6a70b2394
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
inoshperera
11d2ecac10
removing basic auth headers from API definitions.
8 years ago
Milan Perera
e0ee2fc1e5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
b20a2e0997
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
c69513e0f5
removed tenant domain from the web.xml
8 years ago
Milan Perera
f3409adc21
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera
7b8a7c0b52
Merge pull request #1 from GPrathap/release-2.0.x
...
removed setting APIs secured as default.
8 years ago
Maninda
0fb5a577b8
Fixed some issues found in FindBugs security analysis.
8 years ago
inoshperera
c4a2ba0cea
adding http api publisher for Android agent to work out of the box
8 years ago
geethkokila
65cb12b5ac
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Milan Perera
02d75b757c
Fixed conflicts and merged
8 years ago
GPrathap
f508bcfd0e
corrected method name
8 years ago
GPrathap
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
WSO2 Builder
6aea6195e9
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
3db5b289ac
[maven-release-plugin] prepare release v2.0.5
8 years ago
WSO2 Builder
ed47094964
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
8d409a7248
[maven-release-plugin] prepare release v2.0.4
8 years ago
Ace
1d2a5dc9ef
Updating identity/auth-saml dependencies to latest
8 years ago
geethkokila
83b9fd46cd
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Rasika Perera
a633547d19
IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext
8 years ago
geethkokila
8ca28fa1fd
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Rasika Perera
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7
.
8 years ago
Ace
47d8baccf7
upgrading to latest version of identity
8 years ago
geethkokila
8e2432c47b
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
geethkokila
200740eca6
Partial commit for the git update
8 years ago
WSO2 Builder
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
Rasika Perera
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
.
8 years ago
WSO2 Builder
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
Megala
d4e9c43ff1
Fixing race condition in creating and subscribing application in api-manager side
8 years ago
amalhub
7e90fde461
IOTS-292: Adding new filter configs
8 years ago
amalhub
0bd298e6d7
IOTS-292: Code refactoring
8 years ago
amalhub
871970002a
IOTS-292: Adding android cert verification for gateway handler
8 years ago
amalhub
610163d705
IOTS-292: Adding IOS synapse config for gatway change
8 years ago
amalhub
d00817268e
IOTS-292: Adding the api-mgt handler for gateway change
8 years ago
Milan Perera
bcbf61a886
Fixed conflicts
8 years ago