2392 Commits (f1b761d9879caaa5ce8ec433100539a59bbd5766)

Author	SHA1	Message	Date
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
ayyoob	4128e2d355	pointed to gateway node	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
ayyoob	8a883ccd41	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
ayyoob	2a538ff959	fixed multi tenant login issue	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
Ace	6a69d8cf4b	merging with upstream	8 years ago
Ace	b83479b214	Fixing device listing issue	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
ayyoob	b20a2e0997	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Chatura Dilan	e0627bf748	Merge pull request #509 from rasika/release-2.0.x ... Fixing https://wso2.org/jira/browse/IOTS-362	8 years ago
GPrathap	5d1435c7bc	renamed permission string	8 years ago
Rasika Perera	25a35dcf20	Changing title [WSO2 IoT] into [WSO2 IoT Server]	8 years ago
Rasika Perera	7612f064fe	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Maninda	00a5a07373	Fixed some security issues found after running FindBugs security scan.	8 years ago
Milan Perera	f3409adc21	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Milan Perera	2a4a636eb4	Resolved conflicts and merged	8 years ago
Milan Perera	d13dadff08	Renamed prefix of scopes	8 years ago
GPrathap	0bd7b90e9a	added scope annotation	8 years ago
ayyoob	db2ddc7bed	policy manager refactored to support tenancy	8 years ago
Milan Perera	7b8a7c0b52	Merge pull request #1 from GPrathap/release-2.0.x ... removed setting APIs secured as default.	8 years ago
Maninda	0fb5a577b8	Fixed some issues found in FindBugs security analysis.	8 years ago
Rasika Perera	235b41c9df	config.json [usernameLength] moved to [userValidationConfig][usernameLength]	8 years ago
Rasika Perera	2a7e62f857	config.json [apimgt-gateway] renamed to [gatewayEnabled]	8 years ago
Rasika Perera	e5062abcc2	Removed unneccesary configs	8 years ago
charitha	f6f99ed06a	Fixed following issues: ... https://wso2.org/jira/browse/IOTS-271	8 years ago
Milan Perera	b860be0150	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	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
charitha	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
Milan Perera	02d75b757c	Fixed conflicts and merged	8 years ago
GPrathap	4c9578ebe2	resized buffer size to 0 for each scope	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
Rasika Perera	acb2c38799	Fixing user is not authorized to view devices	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
charitha	1a93868424	Fixed https://wso2.org/jira/browse/IOTS-335	8 years ago
charitha	61d1710614	Fixed https://wso2.org/jira/browse/IOTS-341	8 years ago
Ace	674048ab27	Coorecting version import ranges	8 years ago
Rasika Perera	d001cf2ee1	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Rasika Perera	fea128d29e	Fixing grid-view cropped on group view	8 years ago
Ayyoob Hamza	4960fd0d05	Merge pull request #499 from charithag/release-2.0.x-IOTS-342 ... Fixed https://wso2.org/jira/browse/IOTS-342	8 years ago
charitha	a625ccecf0	Fixed https://wso2.org/jira/browse/IOTS-342	8 years ago
Ruwan	46c3b015fa	Merge pull request #498 from charithag/release-2.0.x-email-invites ... Release 2.0.x email invites	8 years ago
charitha	58a9ea80c7	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Charitha Goonetilleke	5318601df0	Add license header	8 years ago
charitha	2b1d46f45f	Finalized enrollment invitations	8 years ago
Charitha Goonetilleke	af8902f392	Merge pull request #497 from rasika/release-2.0.x ... Removing device-view button	8 years ago
Rasika Perera	b0d32a140e	Adding context for anchor links	8 years ago
Rasika Perera	ad92a5278e	Adding on-image anchor links instead of separate btn for device-view	8 years ago
Rasika Perera	6f7d87a590	Merge pull request #496 from madhawap/release-2.0.x ... Task operation config related changes	8 years ago
madhawap	d486ad14fd	Task operation config related changes	8 years ago
Ace	64da9479a1	Bumping identity dependencies	8 years ago
Ace	1d2a5dc9ef	Updating identity/auth-saml dependencies to latest	8 years ago
charitha	795ccb740c	Add backend support for enrollment invitations	8 years ago
geethkokila	1b4857b7fd	Fixing conflicts	8 years ago
Supun94	a831dc6a9a	Changing cdm-config file	8 years ago
Supun94	3d6f5ee64d	Changing policy compliance view	8 years ago
Supun94	09572a9977	Removed redundant classes	8 years ago
Supun94	2751d4b856	Code refactoring	8 years ago
Supun94	eb1575126f	Minor refactoring on policy merging	8 years ago
Supun94	35f3fcc8f9	Changed policy evaluation point	8 years ago
Supun94	936e71a743	Adding configurations for different policy evaluation service components	8 years ago
Supun94	5a1c73b119	Adding cdmf effective policy unit	8 years ago
Supun94	2847ff2095	Adding cdmf effective policy page	8 years ago
Supun94	33b79dcbba	Adding effective policy service	8 years ago
charitha	7acbc5cd0b	Moved qr modal to device mgt core	8 years ago
Charitha Goonetilleke	f4b3313ad7	Merge pull request #491 from DimalChandrasiri/release-2.0.x ... UI update on email invites	8 years ago
Charitha Goonetilleke	8216ea3a79	Merge pull request #488 from madawas/IOTS-296 ... Fixing generic policy saving issues	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
Ace	47d8baccf7	upgrading to latest version of identity	8 years ago
Imesh Chandrasiri	765f97f5a0	email invite sender changes	8 years ago
Imesh Chandrasiri	e696b5bd0c	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	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
Harshan Liyanage	a2a03a523e	Refactored RoleMgtServiceImpl.	8 years ago
Harshan Liyanage	de2f85de2e	IOTS-337:Fixed permission remove issue when updating role permissions.	8 years ago
WSO2 Builder	78b9052c37	[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4	8 years ago
Imesh Chandrasiri	f70be13bf2	Common unit for email invite modal for devices screens	8 years ago
Madawa Soysa	5b1a68280c	Moving codemirror to a lib unit ... This commit moves the codemirror library and modes to a lib unit and reuse the unit when necessary.	8 years ago
Madawa Soysa	0f291d5d04	Fixing generic policy saving issues ... This commit changes the generic policy mode to application/json and add generic policy add/edit/view units.	8 years ago
Milan Perera	bcbf61a886	Fixed conflicts	8 years ago
Milan Perera	36ee55f493	Implemented permission-scope mapping for IoTs	8 years ago
Rasika Perera	9f615916d0	Fixing analyticsEnabled and groupingEnabled not working	8 years ago
Rasika Perera	1bee155d9a	Fixing formatting issue	8 years ago
Rasika Perera	91437ff81c	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Rasika Perera	c284732192	Displaying SSO auth failure messages	8 years ago
Rasika Perera	9fd6145605	Fixing SSO issue	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
charitha	d8881244fd	Fix issue in task operation	8 years ago
charitha	0a7f8ac22c	Update error pages and CsrfGuard property file.	8 years ago
charitha	78dfddbbed	Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x	8 years ago
madhawap	fa171ef079	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
madhawap	d62a9c8b83	resolving conflicts	8 years ago
Madawa Soysa	ea1371a008	Fixing generic policy payload	8 years ago
madhawap	b889f6e384	adding separate tasks for each device type	8 years ago
charitha	0b3183e3be	Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x	8 years ago
charitha	312098b1de	Fix issues in generic policy editor	8 years ago
Hasunie	9a1c12d730	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	8 years ago
Hasunie	60d1281949	fixing windows device name issue	8 years ago
geethkokila	87b2fb3603	Fixing the login issue	8 years ago
geethkokila	9def8aa609	Fixing the login issue	8 years ago
geethkokila	a0615d3d63	Merge branch 'release-2.0.x' into merge-master	8 years ago