ayyoob
|
671d931d3e
|
merged with origin after resolving conflicts
|
8 years ago |
Rasika Perera
|
3cc176c121
|
Fixing permission for certificates:verify
|
8 years ago |
|
Rasika Perera
|
09aae93fc1
|
Adding perm:admin:certificates:verify scope
|
8 years ago |
|
ayyoob
|
cdd144237f
|
removed unused parameter
|
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 |
Rasika Perera
|
8397b688e9
|
Merge branch 'release-2.0.x' into mutual_ssl_feature
|
8 years ago |
geethkokila
|
44c7383b15
|
Adding support to send ios request the synapse gateway
|
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 |
Milan Perera
|
637c014866
|
Refactored scope strings
|
8 years ago |
|
Milan Perera
|
157ef998a6
|
Resolved conflicts and merged
|
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 |
GPrathap
|
5d1435c7bc
|
renamed permission string
|
8 years ago |
|
GPrathap
|
0bd7b90e9a
|
added scope annotation
|
8 years ago |
Maninda
|
0fb5a577b8
|
Fixed some issues found in FindBugs security analysis.
|
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 |
|
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 |
|
geethkokila
|
1b4857b7fd
|
Fixing conflicts
|
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 |
|
geethkokila
|
8e2432c47b
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
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 |
amalhub
|
fe2b6b5993
|
IOTS-292: Adding verification services needed for gataway handler
|
8 years ago |
|
Milan Perera
|
bcbf61a886
|
Fixed conflicts
|
8 years ago |
|
Milan Perera
|
dd353e1bfb
|
Commiting permission-scope mapping improvements
|
8 years ago |
|
WSO2 Builder
|
a59edee410
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
8f9b21b41b
|
[maven-release-plugin] prepare release v2.0.3
|
8 years ago |
|
geethkokila
|
b9d104e9b2
|
Fixing the certificate mgt issue
|
8 years ago |
|
geethkokila
|
d911281ad1
|
Merging master branch with release-2.0.x
|
8 years ago |
charitha
|
161fe62a08
|
Fix for https://wso2.org/jira/browse/IOTS-323
|
8 years ago |
|
WSO2 Builder
|
228b24ca79
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
5dbb258f55
|
[maven-release-plugin] prepare release v2.0.2
|
8 years ago |
|
WSO2 Builder
|
8431b30ddc
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
ae2e283f14
|
[maven-release-plugin] prepare release v2.0.1
|
8 years ago |
|
GPrathap
|
6efc5bc1ed
|
removed @API and @Permission annotations
|
8 years ago |
|
WSO2 Builder
|
19c1b3566d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
cff6e242c8
|
[maven-release-plugin] prepare release v2.0.0
|
8 years ago |
|
charitha
|
a6064d2561
|
Update component versions for IoTS-1.0.0 release
|
8 years ago |
|
WSO2 Builder
|
9517a3d30f
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
a8568299b9
|
[maven-release-plugin] prepare release v1.2.6
|
8 years ago |
Madawa Soysa
|
774eaadb71
|
EMM-1298: Extracting serial number from the certificate itself when adding a certificate
|
8 years ago |
|
WSO2 Builder
|
27a2c9b979
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
eae935f91c
|
[maven-release-plugin] prepare release v1.2.5
|
8 years ago |
Kamidu Sachith Punchihewa
|
7666bbfd05
|
Merge pull request #395 from Megala21/master
Fixing EMM-1752 and EMM-1755
|
8 years ago |
|
WSO2 Builder
|
6a55e1be83
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
11c2e59f61
|
[maven-release-plugin] prepare release v1.2.4
|
8 years ago |
Megala
|
4ec6883ec8
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Shavindri
|
28cb653b06
|
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
|
8 years ago |
|
Megala
|
e55b3a6d5f
|
Fixes related to having special characters in role name
|
8 years ago |
|
Shavindri
|
c64581dc59
|
Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
|
8 years ago |
Chatura Dilan Perera
|
c16cc4cae1
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
Chatura Dilan Perera
|
ed4bca7032
|
[maven-release-plugin] prepare release v1.2.2
|
8 years ago |
|
Megala
|
47d6268c9e
|
Correcting the problem related with oracle syntax
|
8 years ago |
|
Megala
|
82be4ef5a8
|
Fixing oracle script issues
|
8 years ago |
|
amalhub
|
428ce25b6f
|
Fixing issue: https://wso2.org/jira/browse/EMM-1646
|
8 years ago |
Ace
|
6aad76eff1
|
Synching with master and updating jscep and bcpkix dependencies
|
8 years ago |
|
Ace
|
154a6082ce
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
|
8 years ago |
|
Ace
|
f4d6eb6898
|
Upgrading jscep and other fixes
|
8 years ago |
|
Ace
|
9548bdc263
|
Fixing dependency related issues
|
8 years ago |
|
Ace
|
5f90587564
|
Synching with master
|
8 years ago |
|
Chatura Dilan Perera
|
50d8885f8b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
Chatura Dilan Perera
|
a00d6aafd4
|
[maven-release-plugin] prepare release v1.2.1
|
8 years ago |
|
Ace
|
6a8a5cbd5a
|
Merging with master
|
8 years ago |
|
Ace
|
1dfb8e22e1
|
Updating to latest appm/apim/identity dependencies
|
8 years ago |
|
Chatura Dilan Perera
|
de23a8cf27
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
Chatura Dilan Perera
|
8905fae0d9
|
[maven-release-plugin] prepare release v1.2.0
|
8 years ago |
thusithakalugamage
|
0d02e88955
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
kamidu
|
878daae5c5
|
Permission modifications
|
8 years ago |
|
Chatura Dilan Perera
|
2d5262e21e
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
Chatura Dilan Perera
|
5ccd752404
|
[maven-release-plugin] prepare release v1.2.0
|
8 years ago |
mharindu
|
115099c8fe
|
Implemented permission based authorization
|
8 years ago |
|
mharindu
|
24930b3042
|
Partial commit of migration
|
8 years ago |
|
Chatura Dilan Perera
|
8b17cbb339
|
Fix conflicts
|
8 years ago |
|
Chatura Dilan Perera
|
654e1d9938
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
Chatura Dilan Perera
|
aa24821667
|
[maven-release-plugin] prepare release v1.1.2
|
8 years ago |
harshanl
|
f82ce82648
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
harshanl
|
08ff70bb3c
|
Refactored CertMgt component
|
9 years ago |
madhawap
|
d0d101297f
|
changes to removeCertificate endpoint, fix for the jira EMM-1490
|
9 years ago |
|
madhawap
|
f12d2a5d69
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
madhawap
|
324e7fd4c6
|
changes to removeCertificate endpoint, fix for the jira EMM-1490
|
9 years ago |
|
mharindu
|
2e79dd290e
|
Modified scopes
|
9 years ago |
|
mharindu
|
acf6d7ecd7
|
Fixed conflicts and merged
|
9 years ago |
|
mharindu
|
ed4c762bfd
|
Refactored scopes
|
9 years ago |
Prabath Abeysekara
|
cc90bef42b
|
Merge pull request #318 from Securepoint/master
Minor bug fixies and code improvements
|
9 years ago |
|
mharindu
|
84090fb16c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
9 years ago |
prabathabey
|
5adfab9f8a
|
Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API
|
9 years ago |
|
mharindu
|
564c2b280e
|
Fixed conflicts and merged
|
9 years ago |
|
prabathabey
|
bd1322e801
|
Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl
|
9 years ago |
hasuniea
|
a02f7a5db1
|
fixing formatting issue
|
9 years ago |
|
mharindu
|
bdec8880bb
|
Fixed conflicts and merged
|
9 years ago |
|
mharindu
|
186432e1df
|
Fixed webapp name resolving issue
|
9 years ago |
|
Ace
|
ca8859c80a
|
Fixing broken build due to new javax.xml imports
|
9 years ago |
