Madawa Soysa
|
a28458cf13
|
Refactoring policy view and edit units
Refactored the units policy.view and policy.edit to be consistant with policy.create unit. Related to IOTS-296
|
2017-01-11 18:34:03 +05:30 |
|
Milan Perera
|
f25e82f4ec
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-11 14:42:08 +05:30 |
|
Milan Perera
|
98ea97d890
|
Fixed permissions adding issue
|
2017-01-11 14:41:54 +05:30 |
|
Rasika Perera
|
8311828c5d
|
Merge pull request #537 from ayyoob/release-2.0.x
updated ui config
|
2017-01-11 13:18:04 +05:30 |
|
ayyoob
|
0d721a226b
|
updated ui config
|
2017-01-11 12:41:34 +05:30 |
|
Rasika Perera
|
ef2a1b84a2
|
IOTS-376 : Fixing cannot delete a device
|
2017-01-11 09:12:46 +05:30 |
|
kamidu
|
4588cfbed4
|
Fixing the permission management issue in EMM console
|
2017-01-10 17:22:42 +05:30 |
|
Ace
|
c6d186aa1a
|
Adding missing fix
|
2017-01-10 16:19:57 +05:30 |
|
Ace
|
bd45b27cc9
|
Merging with upstream
|
2017-01-10 16:17:58 +05:30 |
|
Ace
|
643acd7827
|
Adding api for renaming devices
|
2017-01-10 16:16:31 +05:30 |
|
ayyoob
|
471e634790
|
merged with upstream
|
2017-01-10 12:11:03 +05:30 |
|
ayyoob
|
06977295ea
|
merged with upstream
|
2017-01-10 12:00:13 +05:30 |
|
Milan Perera
|
562631cc1d
|
Fixed scopes related issue in SAML Granttype
|
2017-01-10 11:36:45 +05:30 |
|
charitha
|
cb7ff7f66a
|
Change package name to lower case
|
2017-01-10 10:18:28 +05:30 |
|
ayyoob
|
9d5061230c
|
fixing test failures
(cherry picked from commit ac8dae7)
|
2017-01-10 10:15:14 +05:30 |
|
charitha
|
c909144589
|
Add select2 controller to select roles to share a group
|
2017-01-10 10:00:48 +05:30 |
|
ayyoob
|
ac8dae7ed0
|
fixing test failures
|
2017-01-10 09:27:10 +05:30 |
|
Rasika Perera
|
e1228b408a
|
Removed [httpsWebURL] from config.json
|
2017-01-09 16:36:11 +05:30 |
|
Rasika Perera
|
9afffc6571
|
Merge pull request #530 from charithag/release-2.0.x
Add select2 controller to select roles to share a group
|
2017-01-09 15:04:28 +05:30 |
|
charitha
|
1ad9439162
|
Add select2 controller to select roles to share a group
|
2017-01-09 15:02:10 +05:30 |
|
Rasika Perera
|
250984f438
|
Merge pull request #529 from rasika/merge-master
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2017-01-09 14:47:07 +05:30 |
|
charitha
|
5caa688014
|
Fixed issue in populating server.ip property.
|
2017-01-09 12:35:04 +05:30 |
|
Rasika Perera
|
0acd273ae1
|
Fixing merge conflicts
|
2017-01-08 12:41:09 +05:30 |
|
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
|
2017-01-08 11:45:46 +05:30 |
|
ayyoob
|
c718d723c0
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-08 01:20:28 +05:30 |
|
ayyoob
|
ea31637223
|
added scr reference to datasource for deployer and few fixes after the changes in the plugin
|
2017-01-08 01:19:03 +05:30 |
|
WSO2 Builder
|
5411d93103
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-07 07:48:36 +00:00 |
|
WSO2 Builder
|
3ea83b925a
|
[maven-release-plugin] prepare release v2.0.6
|
2017-01-07 07:33:45 +00:00 |
|
geethkokila
|
7059ad1243
|
Changing the package name
|
2017-01-07 11:21:50 +05:30 |
|
geethkokila
|
2881079b27
|
Removing two unnecessary classes from the project and adding java documentation to class
|
2017-01-07 11:06:48 +05:30 |
|
Rasika Perera
|
08ab946e88
|
Added doc comments
|
2017-01-07 10:28:25 +05:30 |
|
Rasika Perera
|
a16052431c
|
Corrected a typo on [APIMCertificateMGTException]
|
2017-01-07 10:26:35 +05:30 |
|
Rasika Perera
|
c2490347b6
|
Corrected a typo
|
2017-01-07 10:25:32 +05:30 |
|
Rasika Perera
|
ebdba19041
|
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
|
2017-01-07 08:04:48 +05:30 |
|
Rasika Perera
|
b4ed33bcd0
|
IOTS-171 : Register form validation message corrected
|
2017-01-06 21:44:02 +05:30 |
|
Rasika Perera
|
4de481e501
|
Merge pull request #521 from rasika/release-2.0.x
UI improvement for Datatables
|
2017-01-06 20:29:47 +05:30 |
|
Rasika Perera
|
d826ba81d0
|
UI improvement for Datatables
|
2017-01-06 20:27:24 +05:30 |
|
Joseph Fonseka
|
a5640f48b5
|
Changed auth type on API resources as configured in web.xml
|
2017-01-06 19:41:16 +05:30 |
|
Rasika Perera
|
78c413c1ba
|
Merge pull request #519 from hasuniea/release-2.0.x
getting SkippedEndpoint path from URL
|
2017-01-06 19:37:50 +05:30 |
|
Rasika Perera
|
dfcf72cae0
|
Merge pull request #518 from geethkokila/mutual_ssl_feature
Adding gateway support for IOS device type
|
2017-01-06 19:34:36 +05:30 |
|
Rasika Perera
|
8397b688e9
|
Merge branch 'release-2.0.x' into mutual_ssl_feature
|
2017-01-06 19:34:25 +05:30 |
|
Rasika Perera
|
bc93d48927
|
Merge pull request #520 from madhawap/release-2.0.x
fix to WebappPublisherConfig
|
2017-01-06 19:23:29 +05:30 |
|
madhawap
|
d22de197a1
|
fix to WebappPublisherConfig
|
2017-01-06 19:07:49 +05:30 |
|
Rasika Perera
|
b4a649bdfa
|
Merge pull request #516 from milanperera/release-2.0.x
Improved permission-scope mapping capabilities
|
2017-01-06 19:02:12 +05:30 |
|
Hasunie
|
45a543d3ed
|
getting SkippedEndpoint path from URL
|
2017-01-06 18:42:24 +05:30 |
|
geethkokila
|
3795a7e30f
|
Removing the hardcoded apis
|
2017-01-06 17:09:46 +05:30 |
|
geethkokila
|
739a8bdb69
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
2017-01-06 17:04:18 +05:30 |
|
geethkokila
|
44c7383b15
|
Adding support to send ios request the synapse gateway
|
2017-01-06 17:04:00 +05:30 |
|
Rasika Perera
|
1c1da1f5cd
|
Merge pull request #517 from rasika/release-2.0.x
Fixing CDMF version in footer
|
2017-01-06 16:57:16 +05:30 |
|
Rasika Perera
|
ab28d596e7
|
Fixing CDMF version in footer
|
2017-01-06 16:56:20 +05:30 |
|