Rasika Perera
|
8311828c5d
|
Merge pull request #537 from ayyoob/release-2.0.x
updated ui config
|
8 years ago |
Imesh Chandrasiri
|
f1954c4f10
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
ayyoob
|
0d721a226b
|
updated ui config
|
8 years ago |
|
Imesh Chandrasiri
|
3230a4e269
|
Updating font wso2 to version 1.2.1
|
8 years ago |
|
Rasika Perera
|
300de93626
|
Merge pull request #535 from rasika/release-2.0.x
IOTS-376 : Fixing cannot delete a device
|
8 years ago |
Rasika Perera
|
ef2a1b84a2
|
IOTS-376 : Fixing cannot delete a device
|
8 years ago |
kamidu
|
4588cfbed4
|
Fixing the permission management issue in EMM console
|
8 years ago |
|
Rasika Perera
|
bc01e5e1e9
|
Merge pull request #534 from ruwany/wip
Adding api for renaming devices
|
8 years ago |
Ace
|
c6d186aa1a
|
Adding missing fix
|
8 years ago |
|
Ace
|
bd45b27cc9
|
Merging with upstream
|
8 years ago |
|
Ace
|
643acd7827
|
Adding api for renaming devices
|
8 years ago |
|
ayyoob
|
471e634790
|
merged with upstream
|
8 years ago |
|
ayyoob
|
06977295ea
|
merged with upstream
|
8 years ago |
Chatura Dilan
|
649d38849d
|
Merge pull request #533 from milanperera/release-2.0.x
Fixed scopes related issue in SAML Grant type in devicemgt jaggery app
|
8 years ago |
Milan Perera
|
562631cc1d
|
Fixed scopes related issue in SAML Granttype
|
8 years ago |
|
Rasika Perera
|
8edde9a0f1
|
Merge pull request #532 from charithag/release-2.0.x
Fixes for Release 2.0.x
|
8 years ago |
charitha
|
cb7ff7f66a
|
Change package name to lower case
|
8 years ago |
|
ayyoob
|
819074833f
|
added missing components
(cherry picked from commit b35e0dd)
|
8 years ago |
|
ayyoob
|
9d5061230c
|
fixing test failures
(cherry picked from commit ac8dae7)
|
8 years ago |
|
charitha
|
c909144589
|
Add select2 controller to select roles to share a group
|
8 years ago |
|
ayyoob
|
ac8dae7ed0
|
fixing test failures
|
8 years ago |
|
ayyoob
|
505f281f9d
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
ayyoob
|
b35e0dd2fa
|
added missing components
|
8 years ago |
|
Rasika Perera
|
e1228b408a
|
Removed [httpsWebURL] from config.json
|
8 years ago |
|
Rasika Perera
|
9afffc6571
|
Merge pull request #530 from charithag/release-2.0.x
Add select2 controller to select roles to share a group
|
8 years ago |
|
charitha
|
1ad9439162
|
Add select2 controller to select roles to share a group
|
8 years ago |
|
Rasika Perera
|
250984f438
|
Merge pull request #529 from rasika/merge-master
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
Rasika Perera
|
0313707cb4
|
Merge pull request #528 from charithag/release-2.0.x
Fixed issue in populating server.ip property.
|
8 years ago |
|
charitha
|
5caa688014
|
Fixed issue in populating server.ip property.
|
8 years ago |
|
Rasika Perera
|
42ff976a41
|
Merge pull request #527 from ayyoob/release-2.0.x
moved adapter configs as global configurations and few changes after testing
|
8 years ago |
|
Rasika Perera
|
0acd273ae1
|
Fixing merge conflicts
|
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 |
|
ayyoob
|
c718d723c0
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
ayyoob
|
ea31637223
|
added scr reference to datasource for deployer and few fixes after the changes in the plugin
|
8 years ago |
|
Rasika Perera
|
dde094ecf8
|
Merge pull request #526 from wso2/release-2.0.6
Release 2.0.6
|
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
|
1745dad5cc
|
Merge pull request #525 from rasika/release-2.0.x
Fixing maven-javadoc-plugin issue
|
8 years ago |
|
Rasika Perera
|
04951bb6ca
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
Rasika Perera
|
5d5f76ca21
|
Merge pull request #524 from geethkokila/release-2.0.x
Removing two unnecessary classes from the project and adding java doc…
|
8 years ago |
geethkokila
|
7059ad1243
|
Changing the package name
|
8 years ago |
|
Rasika Perera
|
1f5de41ffa
|
Fixing maven-javadoc-plugin issue [org.wso2.carbon.apimgt.handlers/] should be [org/wso2/carbon/apimgt/handlers/]
|
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 |
|
Rasika Perera
|
f123f3e61e
|
Merge pull request #523 from rasika/release-2.0.x
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
|
8 years ago |
|
Rasika Perera
|
ebdba19041
|
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
|
8 years ago |
|
Rasika Perera
|
b610c7605f
|
Merge pull request #522 from rasika/release-2.0.x
IOTS-171 : Register form validation message corrected
|
8 years ago |
|
Rasika Perera
|
b4ed33bcd0
|
IOTS-171 : Register form validation message corrected
|
8 years ago |
