643acd7827
Adding api for renaming devices
8 years ago
471e634790
merged with upstream
8 years ago
06977295ea
merged with upstream
8 years ago
562631cc1d
Fixed scopes related issue in SAML Granttype
8 years ago
cb7ff7f66a
Change package name to lower case
8 years ago
9d5061230c
fixing test failures
...
(cherry picked from commit ac8dae7
8 years ago
c909144589
Add select2 controller to select roles to share a group
8 years ago
ac8dae7ed0
fixing test failures
8 years ago
e1228b408a
Removed [httpsWebURL] from config.json
8 years ago
9afffc6571
Merge pull request #530 from charithag/release-2.0.x
...
Add select2 controller to select roles to share a group
8 years ago
1ad9439162
Add select2 controller to select roles to share a group
8 years ago
250984f438
Merge pull request #529 from rasika/merge-master
...
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
5caa688014
Fixed issue in populating server.ip property.
8 years ago
0acd273ae1
Fixing merge conflicts
8 years ago
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
c718d723c0
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ea31637223
added scr reference to datasource for deployer and few fixes after the changes in the plugin
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
ebdba19041
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
8 years ago
b4ed33bcd0
IOTS-171 : Register form validation message corrected
8 years ago
4de481e501
Merge pull request #521 from rasika/release-2.0.x
...
UI improvement for Datatables
8 years ago
d826ba81d0
UI improvement for Datatables
8 years ago
a5640f48b5
Changed auth type on API resources as configured in web.xml
8 years ago
78c413c1ba
Merge pull request #519 from hasuniea/release-2.0.x
...
getting SkippedEndpoint path from URL
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
b4a649bdfa
Merge pull request #516 from milanperera/release-2.0.x
...
Improved permission-scope mapping capabilities
8 years ago
45a543d3ed
getting SkippedEndpoint path from URL
8 years ago
3795a7e30f
Removing the hardcoded apis
8 years ago
739a8bdb69
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
44c7383b15
Adding support to send ios request the synapse gateway
8 years ago
1c1da1f5cd
Merge pull request #517 from rasika/release-2.0.x
...
Fixing CDMF version in footer
8 years ago
ab28d596e7
Fixing CDMF version in footer
8 years ago
d51ee711fc
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
79e98a592b
Merge pull request #515 from rasika/release-2.0.x
...
Replaced [EMM] with [IoT Server]
8 years ago
228848075c
Fixed conflicts and merged
8 years ago
e501724c3c
Replaced [EMM] with [IoT Server]
8 years ago
7af63522f2
Fixed quick startup guide doc url
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
d65557e03e
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
e6e39532b7
Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements
8 years ago
3472090d1b
Merge pull request #513 from ruwany/wip
...
Fixing device listing issue
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
6a69d8cf4b
merging with upstream
8 years ago
b83479b214
Fixing device listing issue
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
637c014866
Refactored scope strings
8 years ago
157ef998a6
Resolved conflicts and merged
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
20c3940ca4
made MonitoringTask to get config from device management service
8 years ago
09a148d476
disabled ui and capp deployers
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
e0627bf748
Merge pull request #509 from rasika/release-2.0.x
...
Fixing https://wso2.org/jira/browse/IOTS-362
8 years ago
5d1435c7bc
renamed permission string
8 years ago
25a35dcf20
Changing title [WSO2 IoT] into [WSO2 IoT Server]
8 years ago
7612f064fe
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
0a6ef8daf7
Added some security fixes for issues reported by FindBugs
8 years ago
00a5a07373
Fixed some security issues found after running FindBugs security scan.
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
2a4a636eb4
Resolved conflicts and merged
8 years ago
d13dadff08
Renamed prefix of scopes
8 years ago
0bd7b90e9a
added scope annotation
8 years ago
db2ddc7bed
policy manager refactored to support tenancy
8 years ago
9995f4293e
Default values set for push notification dynamic configuration
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
f511dc2bce
device type deployer for UI and plugin
8 years ago
235b41c9df
config.json [usernameLength] moved to [userValidationConfig][usernameLength]
8 years ago
2a7e62f857
config.json [apimgt-gateway] renamed to [gatewayEnabled]
8 years ago
e5062abcc2
Removed unneccesary configs
8 years ago
148c8046fe
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
c4a2ba0cea
adding http api publisher for Android agent to work out of the box
8 years ago
f6f99ed06a
Fixed following issues:
...
https://wso2.org/jira/browse/IOTS-271
8 years ago
b860be0150
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
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
295921b289
Fixed following issues:
...
https://wso2.org/jira/browse/IOTS-218
https://wso2.org/jira/browse/IOTS-236
https://wso2.org/jira/browse/IOTS-263
https://wso2.org/jira/browse/IOTS-173
8 years ago
02d75b757c
Fixed conflicts and merged
8 years ago
f508bcfd0e
corrected method name
8 years ago
4c9578ebe2
resized buffer size to 0 for each scope
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
acb2c38799
Fixing user is not authorized to view devices
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
1a93868424
Fixed https://wso2.org/jira/browse/IOTS-335
8 years ago
61d1710614
Fixed https://wso2.org/jira/browse/IOTS-341
8 years ago
674048ab27
Coorecting version import ranges
8 years ago
d001cf2ee1
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Ace
ayyoob
Milan Perera
charitha
Rasika Perera
Rasika Perera
WSO2 Builder
geethkokila
Joseph Fonseka
madhawap
Hasunie
inoshperera
Chatura Dilan
GPrathap
Maninda
Milan Perera