Imesh Chandrasiri
|
75f2015f5a
|
Group detail view responsive issue fix
|
8 years ago |
kamidu
|
fb89476e16
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
kamidu
|
5f5d19fc1e
|
Enable location history
|
8 years ago |
Rasika Perera
|
27e953cda3
|
API subscription permission added to [devicemgt-user] role
|
8 years ago |
inoshperera
|
346fd28814
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
inoshperera
|
0bb04789a6
|
adding permissions necessery for iOS to config.json
|
8 years ago |
Milan Perera
|
f8de4869d9
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
Milan Perera
|
e9c3a0c3e8
|
Fixed token expiration issue
|
8 years ago |
sameera910409
|
1bec5e5186
|
fixed user password reset failure issue in iot console
|
8 years ago |
Maninda
|
1f5448c2a0
|
Corrected the caching filter pattern
|
8 years ago |
|
Imesh Chandrasiri
|
bdfb816ffc
|
Fix for issue where list item operations getting fired even after cancelling list item selection
|
8 years ago |
|
kamidu
|
bb8985781e
|
removing duplicate methoads
|
8 years ago |
|
kamidu
|
7698c12d80
|
removing duplicate methoads
|
8 years ago |
|
kamidu
|
7b3db2bdd6
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
Rasika Perera
|
51bd2b5bb6
|
UI improvement: Fixing buttons styles
|
8 years ago |
|
Rasika Perera
|
60ac0522d8
|
Fixes for XSS attacks
|
8 years ago |
|
kamidu
|
5de2a233d7
|
Recomended security fixes for data tables
|
8 years ago |
|
Rasika Perera
|
2b46691405
|
Fixing user menu not showing issue
|
8 years ago |
|
Imesh Chandrasiri
|
ba506183b1
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
Imesh Chandrasiri
|
34aac48071
|
Notification bar scroll and trigger issue fix
|
8 years ago |
Rasika Perera
|
68ad05fde2
|
Merge pull request #546 from DimalChandrasiri/release-2.0.x
Fix for multiple popup issue and modal js improvement
|
8 years ago |
|
Maninda
|
8aed7c67a9
|
Added devicemgt web app configs to secure web app
|
8 years ago |
|
Maninda
|
4fbab80782
|
Added security filters to jaggery.conf
|
8 years ago |
|
Rasika Perera
|
2206e258d1
|
Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles
|
8 years ago |
|
Imesh Chandrasiri
|
153e3bb719
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
Imesh Chandrasiri
|
6e1e801ea0
|
Fix for multiple popup 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 |
|
Rasika Perera
|
b9c1141f79
|
Added missing utility module import
|
8 years ago |
|
Rasika Perera
|
0227d5ccbb
|
Fixing https://wso2.org/jira/browse/IOTS-381
|
8 years ago |
|
Rasika Perera
|
4549a34083
|
changed [fw-ok] with [fw-success]
|
8 years ago |
ayyoob
|
44d09e09ea
|
few changes after testing the gateway
|
8 years ago |
|
ayyoob
|
671d931d3e
|
merged with origin after resolving conflicts
|
8 years ago |
|
ayyoob
|
5b3a8091ec
|
fixed Null pointer exception
|
8 years ago |
|
Rasika Perera
|
864020f20e
|
Adding ability to add deviceType level scopes
|
8 years ago |
|
Rasika Perera
|
f57de670ea
|
Adding devices:update into /devices scopes list
|
8 years ago |
|
Rasika Perera
|
e11d2244f5
|
Fixing scope annotation /enrollment-invite
|
8 years ago |
|
Rasika Perera
|
63cb0e1fde
|
Adding swagger annotations and scope for /effective-policy
|
8 years ago |
|
Rasika Perera
|
09aae93fc1
|
Adding perm:admin:certificates:verify scope
|
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
|
311fe7810f
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
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 |
|
ayyoob
|
93ae646c50
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
ayyoob
|
de957bec29
|
few changes after testing the cluster
|
8 years ago |
|
Rasika Perera
|
e05600607a
|
Merge pull request #540 from madawas/release-2.0.x
Refactoring policy view and edit units
|
8 years ago |
|
Rasika Perera
|
c7d489cf2c
|
Merge pull request #538 from madawas/IOTS-377
IOTS-377 : Fixing VFA icon not visible issue
|
8 years ago |
|
Rasika Perera
|
9bd409e502
|
Merge pull request #536 from DimalChandrasiri/release-2.0.x
Updating font wso2 to version 1.2.1
|
8 years ago |
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
|
8 years ago |
Milan Perera
|
f25e82f4ec
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
Milan Perera
|
98ea97d890
|
Fixed permissions adding issue
|
8 years ago |
|
Imesh Chandrasiri
|
957224b905
|
Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
Imesh Chandrasiri
|
d686a9ea57
|
Updating font wso2 to version 1.2.1 - Commit 2
|
8 years ago |
|
Madawa Soysa
|
8a7d0bb3aa
|
IOTS-377 : Fixing VFA icon not visible issue
Fixes IOTS-377
|
8 years ago |
|
Rasika Perera
|
83868303dd
|
Merge branch 'release-2.0.x' into release-2.0.x
|
8 years ago |
|
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
|
ef2a1b84a2
|
IOTS-376 : Fixing cannot delete a device
|
8 years ago |
|
kamidu
|
4588cfbed4
|
Fixing the permission management issue in EMM console
|
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 |
|
Milan Perera
|
562631cc1d
|
Fixed scopes related issue in SAML Granttype
|
8 years ago |
charitha
|
cb7ff7f66a
|
Change package name to lower case
|
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 |
|
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 |
|
charitha
|
5caa688014
|
Fixed issue in populating server.ip property.
|
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 |
|
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
|
ebdba19041
|
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
|
8 years ago |
|
Rasika Perera
|
b4ed33bcd0
|
IOTS-171 : Register form validation message corrected
|
8 years ago |
|
Rasika Perera
|
4de481e501
|
Merge pull request #521 from rasika/release-2.0.x
UI improvement for Datatables
|
8 years ago |
|
Rasika Perera
|
d826ba81d0
|
UI improvement for Datatables
|
8 years ago |
|
Rasika Perera
|
8397b688e9
|
Merge branch 'release-2.0.x' into mutual_ssl_feature
|
8 years ago |
|
Rasika Perera
|
b4a649bdfa
|
Merge pull request #516 from milanperera/release-2.0.x
Improved permission-scope mapping capabilities
|
8 years ago |
geethkokila
|
739a8bdb69
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
8 years ago |
|
Rasika Perera
|
1c1da1f5cd
|
Merge pull request #517 from rasika/release-2.0.x
Fixing CDMF version in footer
|
8 years ago |
|
Rasika Perera
|
ab28d596e7
|
Fixing CDMF version in footer
|
8 years ago |
|
Milan Perera
|
d51ee711fc
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
Rasika Perera
|
79e98a592b
|
Merge pull request #515 from rasika/release-2.0.x
Replaced [EMM] with [IoT Server]
|
8 years ago |
|
Milan Perera
|
228848075c
|
Fixed conflicts and merged
|
8 years ago |
|
Rasika Perera
|
e501724c3c
|
Replaced [EMM] with [IoT Server]
|
8 years ago |
|
Rasika Perera
|
7af63522f2
|
Fixed quick startup guide doc url
|
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 |
|
charitha
|
d65557e03e
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
|
charitha
|
e6e39532b7
|
Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements
|
8 years ago |
|
Rasika Perera
|
3472090d1b
|
Merge pull request #513 from ruwany/wip
Fixing device listing issue
|
8 years ago |
