2519 Commits

Author	SHA1	Message	Date
ayyoob	274d3e9aeb	used jwt grant type instead of saml	2017-02-04 20:51:56 +05:30
Kamidu Sachith Punchihewa	559fe98cc9	Merge pull request #585 from wso2/master ... Cloud ui fixes and the new master fixes	2017-02-03 17:24:49 +05:30
WSO2 Builder	54a278a1bc	[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration	2017-02-03 16:08:26 +05:30
WSO2 Builder	3bc46c4d2d	[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15	2017-02-03 16:08:12 +05:30
kamidu	befa75af9a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-02-03 12:44:09 +05:30
kamidu	6af09cdd31	Remove the defaut black color for icons	2017-02-03 12:44:01 +05:30
WSO2 Builder	1bc8f5c28d	[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration	2017-02-02 15:56:43 +05:30
WSO2 Builder	1483503790	[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14	2017-02-02 15:56:36 +05:30
Hasunie	54d0d7a5ee	Merge pull request #582 from charithag/master-update-swagger-docs ... Update swagger docs	2017-02-02 14:59:06 +05:30
kamidu	41fd402619	DIABLE CLOUD UI IN THE MASTER	2017-02-02 13:13:39 +05:30
kamidu	43b0d1f1ce	Enable appstore and app publisher	2017-02-02 13:07:41 +05:30
Milan Perera	a5f41ef734	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud	2017-02-01 12:14:59 +05:30
ayyoob	4ec7762a5c	made it use the default saml grant type	2017-01-31 23:06:19 +05:30
kamidu	4b396cf321	enable location without das	2017-01-31 13:41:49 +05:30
charitha	8e01a98ded	Removed unused Dashboard API	2017-01-30 20:41:31 +05:30
charitha	423879bee7	Updated swagger docs	2017-01-30 20:41:05 +05:30
charitha	3cf797fba6	Removed hardcoded device types in swagger docs	2017-01-30 17:25:27 +05:30
WSO2 Builder	5dc55bb5b5	[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration	2017-01-30 16:05:41 +05:30
WSO2 Builder	c7fe9c3a20	[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13	2017-01-30 16:05:29 +05:30
lakshani	3b32635cf9	removed unwanted new lines	2017-01-30 15:48:15 +05:30
lakshani	bbcdf7aeda	removed unwanted new line	2017-01-30 07:54:43 +05:30
lakshani	26f2e2d2ae	added role query param to getdevices restapis	2017-01-30 07:50:10 +05:30
WSO2 Builder	c17bead1fc	[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration	2017-01-29 19:46:03 +05:30
WSO2 Builder	14100d3cc8	[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12	2017-01-29 19:45:51 +05:30
GPrathap	9cdcb58103	uncommenting required fields	2017-01-29 17:02:38 +05:30
GPrathap	e7e8cb62b6	fixing permission issue when viewing device analytics dashboard	2017-01-29 16:51:59 +05:30
GPrathap	47e6f6d292	adding username as parameter	2017-01-29 16:51:37 +05:30
Milan Perera	2b4a3cde61	Fixed conflicts and merged	2017-01-26 14:59:05 +05:30
Milan Perera	21d8d14b7e	Fixed multy tenancy issues related to android device type	2017-01-26 14:50:12 +05:30
geethkokila	713ddbf416	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-01-26 12:08:10 +05:30
geethkokila	2988357eb9	Changing the task to run for all the tenants	2017-01-26 12:07:29 +05:30
ayyoob	b42505c1fe	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y	2017-01-25 14:01:03 +05:30
ayyoob	1a7a215441	added missing license headers	2017-01-25 14:00:31 +05:30
WSO2 Builder	cd7e0feaa6	[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration	2017-01-24 23:22:44 +05:30
WSO2 Builder	abb150d9bd	[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11	2017-01-24 23:22:33 +05:30
ayyoob	3423ef025d	merged with upstream	2017-01-24 19:39:49 +05:30
ayyoob	e74b4e23c4	removed apim dependency from cdmf	2017-01-24 19:32:59 +05:30
WSO2 Builder	002fb8719b	[maven-release-plugin] prepare for next development iteration	2017-01-23 20:24:47 +00:00
WSO2 Builder	04f32902fd	[maven-release-plugin] prepare release v2.0.10	2017-01-23 20:21:44 +00:00
Rasika Perera	704680d68d	Fixing null pointer when roles are not specified on creating new user	2017-01-24 01:54:37 +05:30
Rasika Perera	9a0ba9137b	Fixed permissions issue on grouping	2017-01-23 16:24:20 +05:30
Rasika Perera	d723e22a8c	Fixed roleUpdate issue	2017-01-23 14:35:03 +05:30
WSO2 Builder	5c207897ad	[maven-release-plugin] prepare for next development iteration	2017-01-20 12:44:14 +00:00
WSO2 Builder	233d14edbd	[maven-release-plugin] prepare release v2.0.9	2017-01-20 12:41:33 +00:00
Rasika Perera	8e6855a203	Adding DEFAULT_DEVICE_USER on adding user	2017-01-20 18:01:56 +05:30
Rasika Perera	5ce413012e	Adding DEFAULT_DEVICE_USER and DEFAULT_DEVICE_ADMIN	2017-01-20 18:01:55 +05:30
Rasika Perera	5aa8776bfe	Fixing iot.analytics.host%:%iot.analytics.https.host => iot.analytics.host%:%iot.analytics.https.port	2017-01-20 15:50:35 +05:30
Rasika Perera	42816101bb	Merge pull request #566 from wso2/release-2.0.8 ... Release 2.0.8	2017-01-20 15:42:12 +05:30
Imesh Chandrasiri	3983780f7f	Fix for multiple advance search element	2017-01-20 15:09:00 +05:30
Imesh Chandrasiri	a5d1f70c93	git status	2017-01-20 15:08:27 +05:30
Imesh Chandrasiri	ef80d62307	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-20 11:50:46 +05:30
Imesh Chandrasiri	9f262c1afb	Message container markup fix for advance search	2017-01-20 11:50:39 +05:30
WSO2 Builder	eedecf00ed	[maven-release-plugin] prepare for next development iteration	2017-01-19 23:23:04 +00:00
WSO2 Builder	ef57fc463b	[maven-release-plugin] prepare release v2.0.8	2017-01-19 23:20:20 +00:00
Ayyoob Hamza	96f0c633d9	Merge pull request #563 from madhawap/release-2.0.x ... parameterizing sso config	2017-01-20 01:05:19 +05:30
madhawap	348b349a37	parameterizing sso config	2017-01-20 00:27:36 +05:30
Rasika Perera	212cc52eb2	Merge pull request #562 from Kamidu/release-2.0.x ... improvements for location view	2017-01-19 22:45:38 +05:30
kamidu	eb17093747	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-19 22:37:19 +05:30
kamidu	bf38ad5f70	adding location history to map view	2017-01-19 22:37:08 +05:30
Rasika Perera	fb1f7771c4	Fixing "process" not found on devicemgt	2017-01-19 22:36:21 +05:30
Rasika Perera	b39caade98	Adding system params picking up for app-conf.json	2017-01-19 19:42:41 +05:30
Rasika Perera	ff2cd32bce	Merge pull request #561 from geethkokila/release-2.0.x ... Adding the fixes for device search	2017-01-19 19:32:39 +05:30
geethkokila	2743bf9458	Fixing the security issue due to not using prepared statement	2017-01-19 17:51:42 +05:30
geethkokila	7359b4c536	Fixing the security issue due to not using prepared statement	2017-01-19 17:51:32 +05:30
kamidu	bd75b789c2	Enable location histry for android sense	2017-01-19 17:43:33 +05:30
Imesh Chandrasiri	bc59ac6819	Adding action buttons to listing views	2017-01-19 14:08:59 +05:30
Imesh Chandrasiri	ba23e5cfd9	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-19 10:58:47 +05:30
Imesh Chandrasiri	9533bc9ac8	Adding advance search to devices page	2017-01-19 10:58:05 +05:30
Rasika Perera	e86776eb0b	Fixing "process" not found issues	2017-01-19 07:41:12 +05:30
Rasika Perera	3ff4e37937	Merge pull request #557 from DimalChandrasiri/release-2.0.x ... Group detail view responsive issue fix	2017-01-19 01:25:19 +05:30
Rasika Perera	6733190760	Merge pull request #556 from Kamidu/release-2.0.x ... Enable location history	2017-01-19 01:24:58 +05:30
Rasika Perera	15a919b8a7	Added parameters for configs	2017-01-19 00:55:30 +05:30
Rasika Perera	252eb78124	Now UI configs supports system parameters with eg. %iot.core.host%	2017-01-19 00:55:02 +05:30
Imesh Chandrasiri	75f2015f5a	Group detail view responsive issue fix	2017-01-18 23:27:16 +05:30
kamidu	fb89476e16	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-18 22:39:07 +05:30
kamidu	5f5d19fc1e	Enable location history	2017-01-18 22:38:37 +05:30
Rasika Perera	27e953cda3	API subscription permission added to [devicemgt-user] role	2017-01-18 21:29:54 +05:30
inoshperera	346fd28814	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-18 20:50:55 +05:30
inoshperera	0bb04789a6	adding permissions necessery for iOS to config.json	2017-01-18 20:48:39 +05:30
Milan Perera	f8de4869d9	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-18 18:15:09 +05:30
Milan Perera	e9c3a0c3e8	Fixed token expiration issue	2017-01-18 18:14:55 +05:30
sameera910409	1bec5e5186	fixed user password reset failure issue in iot console	2017-01-18 14:53:44 +05:30
Maninda	1f5448c2a0	Corrected the caching filter pattern	2017-01-18 12:36:11 +05:30
Imesh Chandrasiri	bdfb816ffc	Fix for issue where list item operations getting fired even after cancelling list item selection	2017-01-18 11:43:49 +05:30
kamidu	bb8985781e	removing duplicate methoads	2017-01-18 10:22:11 +05:30
kamidu	7698c12d80	removing duplicate methoads	2017-01-18 10:07:59 +05:30
kamidu	7b3db2bdd6	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-18 09:59:53 +05:30
Rasika Perera	51bd2b5bb6	UI improvement: Fixing buttons styles	2017-01-18 08:29:21 +05:30
Rasika Perera	60ac0522d8	Fixes for XSS attacks	2017-01-18 08:14:17 +05:30
kamidu	5de2a233d7	Recomended security fixes for data tables	2017-01-18 00:16:18 +05:30
Rasika Perera	2b46691405	Fixing user menu not showing issue	2017-01-17 20:17:40 +05:30
ayyoob	4128e2d355	pointed to gateway node	2017-01-17 15:51:30 +05:30
Imesh Chandrasiri	ba506183b1	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-17 15:09:52 +05:30
Imesh Chandrasiri	34aac48071	Notification bar scroll and trigger issue fix	2017-01-17 15:09:40 +05:30
Rasika Perera	68ad05fde2	Merge pull request #546 from DimalChandrasiri/release-2.0.x ... Fix for multiple popup issue and modal js improvement	2017-01-17 11:49:05 +05:30
ayyoob	8a883ccd41	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-16 18:29:40 +05:30
ayyoob	2a538ff959	fixed multi tenant login issue	2017-01-16 16:07:36 +05:30
Maninda	8aed7c67a9	Added devicemgt web app configs to secure web app	2017-01-16 15:00:03 +05:30
Maninda	4fbab80782	Added security filters to jaggery.conf	2017-01-16 14:40:33 +05:30
Rasika Perera	2206e258d1	Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles	2017-01-16 09:37:52 +05:30
Imesh Chandrasiri	153e3bb719	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-14 23:53:04 +05:30
Imesh Chandrasiri	6e1e801ea0	Fix for multiple popup issue	2017-01-14 23:50:34 +05:30
WSO2 Builder	585b9bde4d	[maven-release-plugin] prepare for next development iteration	2017-01-14 01:50:45 +00:00
WSO2 Builder	d206148841	[maven-release-plugin] prepare release v2.0.7	2017-01-14 01:46:41 +00:00
Rasika Perera	b9c1141f79	Added missing utility module import	2017-01-14 07:11:26 +05:30
Rasika Perera	0227d5ccbb	Fixing https://wso2.org/jira/browse/IOTS-381	2017-01-13 18:00:36 +05:30
Rasika Perera	4549a34083	changed [fw-ok] with [fw-success]	2017-01-13 17:50:18 +05:30
ayyoob	44d09e09ea	few changes after testing the gateway	2017-01-13 04:49:17 +05:30
ayyoob	671d931d3e	merged with origin after resolving conflicts	2017-01-12 23:24:35 +05:30
ayyoob	5b3a8091ec	fixed Null pointer exception	2017-01-12 23:18:54 +05:30
Rasika Perera	864020f20e	Adding ability to add deviceType level scopes	2017-01-12 22:42:44 +05:30
Rasika Perera	f57de670ea	Adding devices:update into /devices scopes list	2017-01-12 22:42:44 +05:30
Rasika Perera	e11d2244f5	Fixing scope annotation /enrollment-invite	2017-01-12 22:42:44 +05:30
Rasika Perera	63cb0e1fde	Adding swagger annotations and scope for /effective-policy	2017-01-12 22:42:44 +05:30
Rasika Perera	09aae93fc1	Adding perm:admin:certificates:verify scope	2017-01-12 22:42:43 +05:30
ayyoob	d4ec0705e7	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-12 19:09:12 +05:30
ayyoob	cdd144237f	removed unused parameter	2017-01-12 19:09:01 +05:30
Milan Perera	311fe7810f	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-12 19:02:30 +05:30
Milan Perera	21c50c9a55	Fixed NPE occurred due to scope mapping	2017-01-12 19:01:57 +05:30
ayyoob	2fbaf31b93	fixed permission and assigned environment variables for url context	2017-01-12 18:13:43 +05:30
ayyoob	93ae646c50	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-12 11:13:49 +05:30
ayyoob	de957bec29	few changes after testing the cluster	2017-01-12 11:12:28 +05:30
Rasika Perera	e05600607a	Merge pull request #540 from madawas/release-2.0.x ... Refactoring policy view and edit units	2017-01-11 22:39:53 +05:30
Rasika Perera	c7d489cf2c	Merge pull request #538 from madawas/IOTS-377 ... IOTS-377 : Fixing VFA icon not visible issue	2017-01-11 22:33:45 +05:30
Rasika Perera	9bd409e502	Merge pull request #536 from DimalChandrasiri/release-2.0.x ... Updating font wso2 to version 1.2.1	2017-01-11 21:26:03 +05:30
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
Imesh Chandrasiri	957224b905	Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x	2017-01-11 14:40:48 +05:30
Imesh Chandrasiri	d686a9ea57	Updating font wso2 to version 1.2.1 - Commit 2	2017-01-11 14:39:59 +05:30
Madawa Soysa	8a7d0bb3aa	IOTS-377 : Fixing VFA icon not visible issue ... Fixes IOTS-377	2017-01-11 14:03:12 +05:30
Rasika Perera	83868303dd	Merge branch 'release-2.0.x' into release-2.0.x	2017-01-11 13:26:53 +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
Imesh Chandrasiri	f1954c4f10	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-11 13:06:14 +05:30
ayyoob	0d721a226b	updated ui config	2017-01-11 12:41:34 +05:30
Imesh Chandrasiri	3230a4e269	Updating font wso2 to version 1.2.1	2017-01-11 11:11:33 +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
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
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
Rasika Perera	8397b688e9	Merge branch 'release-2.0.x' into mutual_ssl_feature	2017-01-06 19:34:25 +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
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
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
Milan Perera	d51ee711fc	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-06 16:46:56 +05:30
Rasika Perera	79e98a592b	Merge pull request #515 from rasika/release-2.0.x ... Replaced [EMM] with [IoT Server]	2017-01-06 16:46:44 +05:30
Milan Perera	228848075c	Fixed conflicts and merged	2017-01-06 16:46:42 +05:30
Rasika Perera	e501724c3c	Replaced [EMM] with [IoT Server]	2017-01-06 16:26:59 +05:30
Rasika Perera	7af63522f2	Fixed quick startup guide doc url	2017-01-06 16:14:24 +05:30
Milan Perera	42a587904f	Fixed issues in permission-scope mapping	2017-01-06 16:10:52 +05:30
geethkokila	9200adebed	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature	2017-01-06 15:17:44 +05:30
charitha	d65557e03e	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-06 14:55:41 +05:30
charitha	e6e39532b7	Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements	2017-01-06 14:55:26 +05:30
Rasika Perera	3472090d1b	Merge pull request #513 from ruwany/wip ... Fixing device listing issue	2017-01-06 14:16:47 +05:30
Ace	6a69d8cf4b	merging with upstream	2017-01-06 13:27:33 +05:30
Ace	b83479b214	Fixing device listing issue	2017-01-06 13:20:56 +05:30
Milan Perera	637c014866	Refactored scope strings	2017-01-06 10:15:21 +05:30
Milan Perera	157ef998a6	Resolved conflicts and merged	2017-01-06 09:22:49 +05:30
Milan Perera	e0ee2fc1e5	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-06 09:19:12 +05:30
ayyoob	b20a2e0997	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-05 17:51:34 +05:30
Chatura Dilan	e0627bf748	Merge pull request #509 from rasika/release-2.0.x ... Fixing https://wso2.org/jira/browse/IOTS-362	2017-01-05 16:49:29 +05:30
GPrathap	5d1435c7bc	renamed permission string	2017-01-05 16:47:53 +05:30
Rasika Perera	25a35dcf20	Changing title [WSO2 IoT] into [WSO2 IoT Server]	2017-01-05 16:43:48 +05:30
Rasika Perera	7612f064fe	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-05 15:19:25 +05:30
Maninda	00a5a07373	Fixed some security issues found after running FindBugs security scan.	2017-01-05 14:28:30 +05:30
Milan Perera	f3409adc21	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-05 12:41:22 +05:30
Milan Perera	2a4a636eb4	Resolved conflicts and merged	2017-01-05 12:41:08 +05:30
Milan Perera	d13dadff08	Renamed prefix of scopes	2017-01-05 12:35:02 +05:30
GPrathap	0bd7b90e9a	added scope annotation	2017-01-05 12:26:07 +05:30
ayyoob	db2ddc7bed	policy manager refactored to support tenancy	2017-01-05 12:24:41 +05:30
Milan Perera	7b8a7c0b52	Merge pull request #1 from GPrathap/release-2.0.x ... removed setting APIs secured as default.	2017-01-05 11:58:52 +05:30
Maninda	0fb5a577b8	Fixed some issues found in FindBugs security analysis.	2017-01-05 11:47:09 +05:30
Rasika Perera	235b41c9df	config.json [usernameLength] moved to [userValidationConfig][usernameLength]	2017-01-04 22:28:13 +05:30
Rasika Perera	2a7e62f857	config.json [apimgt-gateway] renamed to [gatewayEnabled]	2017-01-04 22:15:01 +05:30
Rasika Perera	e5062abcc2	Removed unneccesary configs	2017-01-04 20:00:18 +05:30
charitha	f6f99ed06a	Fixed following issues: ... https://wso2.org/jira/browse/IOTS-271	2017-01-04 15:09:36 +05:30
Milan Perera	b860be0150	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-04 10:34:57 +05:30
geethkokila	65cb12b5ac	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature	2017-01-03 14:13:49 +05:30
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	2017-01-03 11:35:08 +05:30
Milan Perera	02d75b757c	Fixed conflicts and merged	2017-01-03 10:37:46 +05:30
GPrathap	4c9578ebe2	resized buffer size to 0 for each scope	2017-01-01 21:53:53 +05:30
WSO2 Builder	6aea6195e9	[maven-release-plugin] prepare for next development iteration	2016-12-23 19:20:14 +00:00
WSO2 Builder	3db5b289ac	[maven-release-plugin] prepare release v2.0.5	2016-12-23 19:18:26 +00:00
Rasika Perera	acb2c38799	Fixing user is not authorized to view devices	2016-12-24 00:42:04 +05:30
WSO2 Builder	ed47094964	[maven-release-plugin] prepare for next development iteration	2016-12-23 07:05:25 +00:00
WSO2 Builder	8d409a7248	[maven-release-plugin] prepare release v2.0.4	2016-12-23 07:00:40 +00:00
charitha	1a93868424	Fixed https://wso2.org/jira/browse/IOTS-335	2016-12-23 12:19:57 +05:30
charitha	61d1710614	Fixed https://wso2.org/jira/browse/IOTS-341	2016-12-23 11:12:42 +05:30
Ace	674048ab27	Coorecting version import ranges	2016-12-23 09:57:47 +05:30
Rasika Perera	d001cf2ee1	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-23 08:22:43 +05:30
Rasika Perera	fea128d29e	Fixing grid-view cropped on group view	2016-12-23 08:22:12 +05:30
Ayyoob Hamza	4960fd0d05	Merge pull request #499 from charithag/release-2.0.x-IOTS-342 ... Fixed https://wso2.org/jira/browse/IOTS-342	2016-12-22 19:56:45 +05:30
charitha	a625ccecf0	Fixed https://wso2.org/jira/browse/IOTS-342	2016-12-22 19:53:12 +05:30
Ruwan	46c3b015fa	Merge pull request #498 from charithag/release-2.0.x-email-invites ... Release 2.0.x email invites	2016-12-22 18:41:22 +05:30
charitha	58a9ea80c7	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-22 18:39:26 +05:30
Charitha Goonetilleke	5318601df0	Add license header	2016-12-22 18:37:31 +05:30
charitha	2b1d46f45f	Finalized enrollment invitations	2016-12-22 18:30:07 +05:30
Charitha Goonetilleke	af8902f392	Merge pull request #497 from rasika/release-2.0.x ... Removing device-view button	2016-12-22 16:14:08 +05:30
Rasika Perera	b0d32a140e	Adding context for anchor links	2016-12-22 16:12:04 +05:30
Rasika Perera	ad92a5278e	Adding on-image anchor links instead of separate btn for device-view	2016-12-22 15:59:10 +05:30
Rasika Perera	6f7d87a590	Merge pull request #496 from madhawap/release-2.0.x ... Task operation config related changes	2016-12-22 14:01:09 +05:30
madhawap	d486ad14fd	Task operation config related changes	2016-12-22 13:47:39 +05:30
Ace	64da9479a1	Bumping identity dependencies	2016-12-22 12:32:24 +05:30
Ace	1d2a5dc9ef	Updating identity/auth-saml dependencies to latest	2016-12-22 10:58:59 +05:30
charitha	795ccb740c	Add backend support for enrollment invitations	2016-12-20 23:46:55 +05:30
geethkokila	1b4857b7fd	Fixing conflicts	2016-12-20 11:19:58 +05:30
Supun94	a831dc6a9a	Changing cdm-config file	2016-12-19 16:19:36 +05:30
Supun94	3d6f5ee64d	Changing policy compliance view	2016-12-19 16:19:36 +05:30
Supun94	09572a9977	Removed redundant classes	2016-12-19 16:19:36 +05:30
Supun94	2751d4b856	Code refactoring	2016-12-19 16:19:36 +05:30
Supun94	eb1575126f	Minor refactoring on policy merging	2016-12-19 16:19:36 +05:30
Supun94	35f3fcc8f9	Changed policy evaluation point	2016-12-19 16:19:36 +05:30
Supun94	936e71a743	Adding configurations for different policy evaluation service components	2016-12-19 16:19:36 +05:30
Supun94	5a1c73b119	Adding cdmf effective policy unit	2016-12-19 16:19:36 +05:30
Supun94	2847ff2095	Adding cdmf effective policy page	2016-12-19 16:19:36 +05:30
Supun94	33b79dcbba	Adding effective policy service	2016-12-19 16:19:36 +05:30
charitha	7acbc5cd0b	Moved qr modal to device mgt core	2016-12-19 15:25:06 +05:30
Charitha Goonetilleke	f4b3313ad7	Merge pull request #491 from DimalChandrasiri/release-2.0.x ... UI update on email invites	2016-12-19 13:42:43 +05:30
Charitha Goonetilleke	8216ea3a79	Merge pull request #488 from madawas/IOTS-296 ... Fixing generic policy saving issues	2016-12-19 13:41:39 +05:30
Rasika Perera	1465c56822	Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4" ... This reverts commit f9b6939cb7.	2016-12-19 12:39:56 +05:30
Ace	47d8baccf7	upgrading to latest version of identity	2016-12-19 11:38:03 +05:30
Imesh Chandrasiri	765f97f5a0	email invite sender changes	2016-12-19 11:27:01 +05:30
Imesh Chandrasiri	e696b5bd0c	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-19 11:02:57 +05:30
WSO2 Builder	f9b6939cb7	[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4	2016-12-19 09:06:04 +05:30
Rasika Perera	42930fe8c4	Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4" ... This reverts commit 78b9052c37.	2016-12-19 08:45:19 +05:30
Harshan Liyanage	a2a03a523e	Refactored RoleMgtServiceImpl.	2016-12-16 19:46:14 +05:30
Harshan Liyanage	de2f85de2e	IOTS-337:Fixed permission remove issue when updating role permissions.	2016-12-16 19:30:41 +05:30
WSO2 Builder	78b9052c37	[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4	2016-12-16 17:03:06 +05:30