3162 Commits

Author	SHA1	Message	Date
kamidu	f9a03133fa	device cloude related ui improvements	2017-03-08 12:49:52 +05:30
ayyoob	5e4b0564b7	added permission fix for operation and synchronised application creation to avoid duplicate subscription	2017-03-03 17:02:36 +05:30
ayyoob	6a0c0cb299	added default permissions	2017-03-02 20:27:32 +05:30
Megala	a2d0c59e17	Revert 2988357eb9	2017-03-02 15:18:34 +05:30
Megala	4fdeec89cc	Revert f3f7635d3b	2017-03-02 15:11:59 +05:30
ayyoob	d66e439f49	added carbon local ip as config	2017-03-02 14:05:57 +05:30
ayyoob	c088a9bc93	fixed api subscribe issue for device specific app creation	2017-03-01 23:26:17 +05:30
WSO2 Builder	7f98d37835	[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration	2017-02-28 21:22:53 +05:30
WSO2 Builder	b03936ca49	[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19	2017-02-28 21:19:50 +05:30
charitha	14dfc1b538	Fix minor issues found with jmeter tests	2017-02-28 21:18:22 +05:30
madhawap	f1b761d987	Minor code formating	2017-02-28 21:16:56 +05:30
Kamidu Sachith Punchihewa	8e530b0523	adding the removed tenant based token handlers	2017-02-28 21:16:21 +05:30
WSO2 Builder	82888e1d20	[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration	2017-02-28 21:15:10 +05:30
WSO2 Builder	b11c2e451b	[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18	2017-02-28 21:14:44 +05:30
WSO2 Builder	67a091ff5a	[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration	2017-02-28 21:12:47 +05:30
WSO2 Builder	dcc2088455	[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17	2017-02-28 21:12:14 +05:30
lakshani	eb12e5b9f1	Adding commit 'added java doc comments'	2017-02-28 21:11:15 +05:30
lakshani	9e5574dccc	Adding commit 'added change device status to device view page'	2017-02-28 21:09:05 +05:30
lakshani	3f90b403c0	Adding lakshani's commit 'updated device status button'	2017-02-28 21:03:53 +05:30
WSO2 Builder	927b2d451d	[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration	2017-02-28 21:00:32 +05:30
WSO2 Builder	dfe9b1ff9c	[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16	2017-02-28 21:00:08 +05:30
charitha	7374a0825d	Fix https://wso2.org/jira/browse/IOTS-436	2017-02-28 20:56:32 +05:30
charitha	d2991585aa	Applying charithas commit on IOTS-436	2017-02-28 20:56:25 +05:30
geethkokila	e90dc8b6c1	Fixing the compile error	2017-02-24 12:32:00 +05:30
geethkokila	d8303356cd	Fixing the conflicts	2017-02-24 12:16:14 +05:30
kamidu	b7e3b28722	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-20 18:20:14 +05:30
kamidu	4e16e29b1c	removing group sharing	2017-02-20 18:20:04 +05:30
Imesh Chandrasiri	3c90f8ad49	temporary removal of view analytics	2017-02-20 17:19:20 +05:30
Imesh Chandrasiri	8cf92e8a5b	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-20 15:11:08 +05:30
Imesh Chandrasiri	a938d57a65	Removing analytics link from groups listing	2017-02-20 15:11:00 +05:30
Kamidu Sachith Punchihewa	587c798f09	Merge pull request #613 from Kamidu/cloud-3.1.0 ... remove tennent related token handlers	2017-02-19 21:49:58 +05:30
Kamidu Sachith Punchihewa	4a5c99af78	remove tennent related token handlers	2017-02-19 21:49:19 +05:30
Imesh Chandrasiri	5097416d69	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-19 19:34:35 +05:30
Imesh Chandrasiri	368647f176	Temporary advance search removal commit	2017-02-19 19:34:28 +05:30
Kamidu Sachith Punchihewa	112efda8d5	Merge pull request #611 from Kamidu/cloud-3.1.0 ... removing device edit option	2017-02-19 18:45:07 +05:30
Kamidu Sachith Punchihewa	0da8847787	removing device edit option	2017-02-19 18:44:39 +05:30
Imesh Chandrasiri	f5e5dce872	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-19 18:25:07 +05:30
Imesh Chandrasiri	ee209064e3	Tooltip css fix	2017-02-19 18:24:59 +05:30
Kamidu Sachith Punchihewa	367dc1a30b	resolving return type issue in group mgt	2017-02-19 17:48:11 +05:30
Kamidu Sachith Punchihewa	527b844ee3	Error handled on the user session invalidation	2017-02-19 16:03:49 +05:30
Kamidu Sachith Punchihewa	318fbf9215	role loading issues	2017-02-19 15:54:53 +05:30
Kamidu Sachith Punchihewa	282801c814	updating cloud dashboard	2017-02-19 15:32:28 +05:30
kamidu	7480ccaa15	fixing datatable issues	2017-02-17 17:56:29 +05:30
kamidu	3e061f6e8b	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-17 16:29:22 +05:30
kamidu	6a67f251ac	cloud related ui fixs	2017-02-17 16:29:11 +05:30
Hasunie	8bb75d291c	Avoiding package exporting org.wso2.carbon.device.mgt.core.internal	2017-02-16 18:30:40 +05:30
Hasunie	2a9027a15e	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-16 18:19:35 +05:30
Imesh Chandrasiri	3786ef2636	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-16 16:49:54 +05:30
Imesh Chandrasiri	0cddd896d4	Tooltip fix	2017-02-16 16:49:44 +05:30
kamidu	4725eb3c3b	chenge the group creating steps	2017-02-16 11:59:47 +05:30
kamidu	486e02fd71	adding ui changes to the cloud related uis	2017-02-16 06:11:42 +05:30
Hasunie	315be0a3c7	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-15 18:09:29 +05:30
Rasika Perera	9ca552584a	Merge pull request #602 from rasika/cloud-3.1.0 ... Adding tooltips	2017-02-15 13:49:28 +05:30
Rasika Perera	b8a1b945bb	Adding tooltips	2017-02-15 13:47:59 +05:30
Imesh Chandrasiri	9d80fcfd54	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 22:38:27 +05:30
Imesh Chandrasiri	7bc5d35746	data table padding fix	2017-02-14 22:38:09 +05:30
Kamidu Sachith Punchihewa	4d02f9971e	Merge pull request #591 from Kamidu/cloud-3.1.0 ... enable cloud related configurations to the devicemgt application	2017-02-14 22:29:25 +05:30
Hasunie	476e439fe2	Fixing the task to get the only device registered tenants	2017-02-14 22:16:55 +05:30
Rasika Perera	d92c52b89b	Adding cloud error pages for jaggery.conf	2017-02-14 19:49:41 +05:30
Rasika Perera	8931478a55	Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json	2017-02-14 19:38:11 +05:30
kamidu	aba4ceaf76	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 19:28:22 +05:30
kamidu	587f847934	ui improvements to device cloud	2017-02-14 19:28:09 +05:30
Imesh Chandrasiri	c26d7fd15d	Changed device loading icon for device loading page	2017-02-14 15:15:38 +05:30
Imesh Chandrasiri	dcb29b7792	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 14:48:48 +05:30
Imesh Chandrasiri	5a7fa99e0a	Fix data table icon padding issue	2017-02-14 14:48:38 +05:30
Rasika Perera	fbae181f07	Fixing footer getting cluttered on /devicemgt/devices/search page	2017-02-14 14:46:17 +05:30
Rasika Perera	dd645a9fda	Fixing footer getting cluttered on /devicemgt/devices/search page	2017-02-14 14:43:16 +05:30
Imesh Chandrasiri	b579870672	Data table icon cursor added	2017-02-14 13:21:59 +05:30
Imesh Chandrasiri	23edb1de7a	Model Popup title space issue fix	2017-02-14 10:23:58 +05:30
Imesh Chandrasiri	8bbb612de6	Fixing cloud header height issue and theme color	2017-02-13 16:06:28 +05:30
geethkokila	f3f7635d3b	Fixing the task to get the only the device enrolled tenants	2017-02-13 12:34:09 +05:30
kamidu	8a07639d6b	Fix responsive issue in clud header	2017-02-10 03:25:01 +05:30
kamidu	6e19ec31e3	fix url issues in the config.json	2017-02-10 02:47:25 +05:30
kamidu	b946eeae74	fix url issues in the config.json	2017-02-09 23:24:15 +05:30
kamidu	f772b35769	enable cloud related configurations to the devicemgt application	2017-02-09 20:15:49 +05:30
kamidu	4eaf2b41c8	enable cloud related configurations to the devicemgt application	2017-02-09 20:02:28 +05:30
ayyoob	018b230b5a	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-08 13:12:30 +05:30
ayyoob	87910bc92b	transferred mutual authenticator to jwt authenticator	2017-02-08 13:10:36 +05:30
kamidu	ddef86e226	stylish issues	2017-02-07 20:38:10 +05:30
kamidu	9cba33a6dc	Modification to the header panel	2017-02-07 15:28:19 +05:30
WSO2 Builder	b051bd108b	[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration	2017-02-06 22:57:33 +05:30
WSO2 Builder	ce78ac277e	[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17	2017-02-06 22:57:23 +05:30
lakshani	18cb2b3e1f	added java doc comments	2017-02-06 22:33:50 +05:30
lakshani	a2679fde4c	added change device status to device view page	2017-02-06 22:23:55 +05:30
kamidu	fd3ff5496c	cloud relatd ui fixes	2017-02-06 17:23:28 +05:30
lakshani	2d83033b26	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicestatus	2017-02-06 14:05:32 +05:30
lakshani	a9a6883adc	updated device status button	2017-02-06 14:05:11 +05:30
WSO2 Builder	c954731870	[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration	2017-02-06 12:15:58 +05:30
WSO2 Builder	e68c3d170b	[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16	2017-02-06 12:15:44 +05:30
Kamidu Sachith Punchihewa	681c320542	Update user-menu.hbs	2017-02-06 12:02:13 +05:30
Kamidu Sachith Punchihewa	00b1f982c6	Update user-menu.hbs	2017-02-06 12:01:27 +05:30
ayyoob	b7566f4e4a	added artifact deployment support through UI	2017-02-05 17:51:48 +05:30
ayyoob	0999bb70a0	exposed artefact deployment through api ... Merged Jasintha’s code	2017-02-05 17:51:15 +05:30
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
Imesh Chandrasiri	f70be13bf2	Common unit for email invite modal for devices screens	2016-12-16 14:53:51 +05:30
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.	2016-12-16 10:17:59 +05:30
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.	2016-12-15 11:29:14 +05:30
Milan Perera	bcbf61a886	Fixed conflicts	2016-12-14 08:50:17 +05:30
Milan Perera	36ee55f493	Implemented permission-scope mapping for IoTs	2016-12-14 08:45:42 +05:30
Rasika Perera	9f615916d0	Fixing analyticsEnabled and groupingEnabled not working	2016-12-11 14:56:31 +05:30
Rasika Perera	1bee155d9a	Fixing formatting issue	2016-12-09 19:06:00 +05:30
Rasika Perera	91437ff81c	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-09 18:39:39 +05:30
Rasika Perera	c284732192	Displaying SSO auth failure messages	2016-12-09 18:22:09 +05:30
Rasika Perera	9fd6145605	Fixing SSO issue	2016-12-09 17:34:56 +05:30
Milan Perera	dd353e1bfb	Commiting permission-scope mapping improvements	2016-12-08 20:30:49 +05:30
WSO2 Builder	a59edee410	[maven-release-plugin] prepare for next development iteration	2016-12-08 14:39:00 +00:00
WSO2 Builder	8f9b21b41b	[maven-release-plugin] prepare release v2.0.3	2016-12-08 14:37:11 +00:00
charitha	d8881244fd	Fix issue in task operation	2016-12-08 20:03:54 +05:30
charitha	0a7f8ac22c	Update error pages and CsrfGuard property file.	2016-12-08 19:41:43 +05:30
charitha	78dfddbbed	Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x	2016-12-08 18:58:47 +05:30
madhawap	fa171ef079	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-08 17:38:24 +05:30
madhawap	d62a9c8b83	resolving conflicts	2016-12-08 17:38:12 +05:30
Madawa Soysa	ea1371a008	Fixing generic policy payload	2016-12-08 17:31:50 +05:30
madhawap	b889f6e384	adding separate tasks for each device type	2016-12-08 17:21:07 +05:30
charitha	0b3183e3be	Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x	2016-12-08 17:19:27 +05:30
charitha	312098b1de	Fix issues in generic policy editor	2016-12-08 17:19:12 +05:30
Hasunie	9a1c12d730	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-08 15:59:30 +05:30
Hasunie	60d1281949	fixing windows device name issue	2016-12-08 15:58:32 +05:30
geethkokila	87b2fb3603	Fixing the login issue	2016-12-08 14:28:33 +05:30
geethkokila	9def8aa609	Fixing the login issue	2016-12-08 14:08:46 +05:30
geethkokila	a0615d3d63	Merge branch 'release-2.0.x' into merge-master	2016-12-08 12:36:53 +05:30
geethkokila	d911281ad1	Merging master branch with release-2.0.x	2016-12-08 12:34:50 +05:30
Madawa Soysa	630a1105a9	IOTS-296: Refactoring generic policy unit code ... This code is refactored to use the device type specific operation mod functions (payload generation etc.) in the device type plugins.	2016-12-08 10:29:12 +05:30
Ruwan	a0c842c6c6	Merge pull request #473 from charithag/release-2.0.x ... Update the way we are checking existence of policy operations.	2016-12-07 14:52:47 +05:30
Rasika Perera	6edbb8330f	Merge pull request #472 from rasika/release-2.0.x ... Fixing enrollment broken issue	2016-12-07 14:45:13 +05:30
charitha	4b5c69d2d7	Update the way we are checking existence of policy operations.	2016-12-07 14:40:56 +05:30
Rasika Perera	641cc58bbf	Fixing enrollment broken issue	2016-12-07 14:37:10 +05:30
Imesh Chandrasiri	da2fd787c4	Fix for datatable icon not showing issue	2016-12-07 12:50:23 +05:30
Ruwan	f2f304ccc4	Merge pull request #470 from rasika/release-2.0.x ... Fixing device identifier is null and Throwing exception when device not found	2016-12-07 12:15:17 +05:30
Rasika Perera	289987db8e	Throwing exception on getDevice when device is not found	2016-12-07 12:05:48 +05:30
Hasunie	40d8488466	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-07 09:08:10 +05:30
Ruwan	4bda6d89cb	Merge pull request #469 from menakaj/release-2.0.x ... Android sense stabilization	2016-12-07 08:55:22 +05:30
Hasunie	b9e0b099a1	fixing device update issue	2016-12-07 08:37:00 +05:30
charitha	7368b2cf64	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-06 19:09:24 +05:30
charitha	8348002f66	Merge branch 'release-2.0.x' of https://github.com/ruwany/carbon-device-mgt into release-2.0.x	2016-12-06 19:07:21 +05:30
Charitha Goonetilleke	e137644677	Merge pull request #467 from madawas/IOTS-296 ... IOTS-296: Genaralizing policy view UI	2016-12-06 19:06:19 +05:30
charitha	161fe62a08	Fix for https://wso2.org/jira/browse/IOTS-323	2016-12-06 18:59:43 +05:30
Ace	34225bd9da	fixing operations loading spinner and other ui issues	2016-12-06 17:13:56 +05:30
Menaka Jayawardena	84a0b398fe	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-06 14:44:05 +05:30
Menaka Jayawardena	ca2a79a001	Added entries for portal app in config files.	2016-12-06 14:43:05 +05:30
Madawa Soysa	de95c99ea7	IOTS-296: Genaralizing policy view UI ... This commit inclued the generic policy view UI unit	2016-12-06 12:17:46 +05:30
Hasunie	631ea6e80f	Merge pull request #465 from harshanL/release-2.0.x ... Added security filters to devicemgt jaggery app	2016-12-06 12:12:14 +05:30
Harshan Liyanage	24c0966dce	Merge pull request #462 from madawas/IOTS-322 ... IOTS-322: Infroming users when device types are not installed	2016-12-06 12:06:21 +05:30
Harshan Liyanage	b4eb86e985	Added security filters to devicemgt jaggery app	2016-12-06 11:54:31 +05:30
Rasika Perera	e8d8373d46	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-06 11:36:18 +05:30
Rasika Perera	4c1fb558d3	Fixing sso infinite redirection	2016-12-06 10:50:46 +05:30
Madawa Soysa	1d1f399477	IOTS-322: Infroming users when device types are not installed ... Currently policy platfom selection page is empty if no device types are installed. This will add an meaningful message to user if no device types are added. This commit resolves IOTS-322	2016-12-05 16:59:25 +05:30
Imesh Chandrasiri	f8d03e992e	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-05 14:35:59 +05:30
Imesh Chandrasiri	09fa48c4c2	Removed fade-edge class from template markups for better listing readability	2016-12-05 14:35:36 +05:30
Charitha Goonetilleke	22990087a0	Merge pull request #459 from GPrathap/release-2.0.x ... removed hardcoded validity period while creating application in APIM	2016-12-05 12:50:33 +05:30
charitha	78d0172d5d	Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x	2016-12-05 12:35:58 +05:30
charitha	ee5459dc79	Fix for https://wso2.org/jira/browse/IOTS-321	2016-12-05 12:35:33 +05:30
Rasika Perera	2cfff85ee2	Merge pull request #458 from ruwany/release-2.0.x ... Adding content-type to descriptor	2016-12-05 10:51:22 +05:30
Ace	7eaee141e0	Adding content-type to descriptor	2016-12-05 10:34:11 +05:30
GPrathap	6e69fc8e84	changed application creation endpoint	2016-12-05 09:48:26 +05:30
Madawa Soysa	5c356914e8	IOTS-296: Commenting and refactoring	2016-12-02 16:52:05 +05:30
WSO2 Builder	228b24ca79	[maven-release-plugin] prepare for next development iteration	2016-12-01 12:14:01 +00:00
WSO2 Builder	5dbb258f55	[maven-release-plugin] prepare release v2.0.2	2016-12-01 12:10:10 +00:00
Charitha Goonetilleke	67a73189e1	Merge pull request #456 from rasika/IoTS-1.0.0 ... Fixing iOS UI issues	2016-12-01 17:03:21 +05:30
Rasika Perera	bec0f58e38	Adding semi-colon on context variable on service invoker Js	2016-12-01 16:50:06 +05:30
Rasika Perera	884bbe66b5	Adding iOS enrollment path into config.json	2016-12-01 16:50:06 +05:30
Rasika Perera	098ae372f7	Adding new css class for device type view image	2016-12-01 16:50:06 +05:30
charitha	3b97b3296e	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-01 16:47:05 +05:30
Megala	ed325ee576	Adding dashboard feature	2016-12-01 16:41:35 +05:30
Chatura Dilan	82d865b104	Merge pull request #453 from madhawap/release-2.0.x ... Seperate out task operations	2016-12-01 16:39:29 +05:30
madhawap	2b00645779	refactored code	2016-12-01 16:31:27 +05:30
charitha	e718ab5504	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-01 15:30:29 +05:30
charitha	cad686b43c	Bug fixes & UI/UX improvements	2016-12-01 15:28:39 +05:30
madhawap	bec4ae681d	Seperate out task operations	2016-12-01 15:28:22 +05:30
Madawa Soysa	b2650e439c	Fix issue with policy wrapper group select	2016-12-01 15:23:00 +05:30
Madawa Soysa	345fdc0ced	IOTS-296: Removing ownership selection when policy creation ... Removes ownership selection when creating and editing policies. Ownership management is done by the groups.	2016-12-01 12:34:15 +05:30
charitha	d9b670ef19	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-11-30 17:11:18 +05:30
charitha	564cece94b	Bug fixes	2016-11-30 17:11:01 +05:30
Charitha Goonetilleke	e1d2d8a73f	Merge pull request #447 from ruwany/release-2.0.x ... Adding android operations bar related changes	2016-11-30 17:08:08 +05:30
Ace	6126776fcf	Adding android operations bar related changes	2016-11-30 16:51:30 +05:30
Madawa Soysa	8cdc8cfb24	IOTS-296: Refactoring Policy create/edit units	2016-11-30 14:18:57 +05:30
Charitha Goonetilleke	d9763ff5b7	Merge pull request #445 from GPrathap/release-2.0.x ... added creating an application for WebSocket	2016-11-30 13:05:36 +05:30
GPrathap	64ce41f571	added creating an application for WebSocket	2016-11-30 12:44:26 +05:30
Charitha Goonetilleke	bf48f57f84	Merge pull request #442 from DimalChandrasiri/release-2.0.x ... Validation error fix	2016-11-30 11:41:01 +05:30
Charitha Goonetilleke	c84d7fd13d	Merge pull request #440 from DimalChandrasiri/IoTS-1.0.0 ... Data table fix when list view	2016-11-30 11:40:27 +05:30
Madawa Soysa	c61cd484a0	IOTS-296: Adding group selection capability when adding a policy ... This commit introduces the device group select capabilty and saving the policy when creating and editing policies.	2016-11-29 18:34:25 +05:30
Imesh Chandrasiri	a56b953fcb	Validation error fix	2016-11-29 13:32:29 +05:30
Madawa Soysa	a4ca74c6c0	IOTS-296: Generalizing policy UI for policy edit ... This commit removes device type specific client side logic and UI components from the `cdmf.unit.policy.edit` unit.	2016-11-28 16:36:12 +05:30
Madawa Soysa	7aada58472	IOTS-296: Fixing issue with device type icon ... This commit fixes an issue which is unable to load device type icons in the policy listing page.	2016-11-28 16:36:12 +05:30
Madawa Soysa	0dfde40b7c	IOTS-296: Generalizing policy UI for policy create wizard ... This commit is done to seperate policy related client side logic and UIs from device type specific logics. This is a part of creating self contained plugins for device types. This commit generalizes the policy creation wizard in the CDMF core and removes device type specific UIs and client side logic from the core. Also, this introduces a generic policy configuration UI in a new unit.	2016-11-28 16:36:12 +05:30
Imesh Chandrasiri	d90c9ab68a	Data table fix when list view	2016-11-28 11:33:16 +05:30
WSO2 Builder	8431b30ddc	[maven-release-plugin] prepare for next development iteration	2016-11-25 08:06:30 +00:00
WSO2 Builder	ae2e283f14	[maven-release-plugin] prepare release v2.0.1	2016-11-25 07:43:34 +00:00
Rasika Perera	4789aafd28	Minor ui changes to the group listing	2016-11-25 12:28:48 +05:30
Charitha Goonetilleke	027498895a	Merge pull request #436 from DimalChandrasiri/IoTS-1.0.0 ... Merging UI fixes	2016-11-25 11:48:23 +05:30
Imesh Chandrasiri	54bb91d428	IoT Build UI Fixes	2016-11-25 11:19:14 +05:30
Rasika Perera	03f965adf6	Decrease group listing page loading time with lazy roles listing	2016-11-25 11:18:17 +05:30
Imesh Chandrasiri	07a0dee2d9	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	2016-11-25 11:18:15 +05:30
Rasika Perera	05453e7379	Removed 'role' suffix from roles listing page	2016-11-25 10:35:45 +05:30
Rasika Perera	ce4b389df0	Merge branch 'IoTS-1.0.0' of https://github.com/charithag/carbon-device-mgt into IoTS-1.0.0	2016-11-25 08:23:20 +05:30
Rasika Perera	aaade2363c	Adding new api to create combined roles	2016-11-25 08:18:10 +05:30
Rasika Perera	3fe18ba4bb	Refactoring group sharing modal	2016-11-25 08:17:39 +05:30
charitha	ca5d96df67	Add test cases to verify DAO functionality	2016-11-24 13:29:25 +05:30
Rasika Perera	54211bc3cc	Fixing minor issues on GroupDAO	2016-11-24 09:58:42 +05:30
Imesh Chandrasiri	5525c42eae	Removed Unneccsary title and added padding	2016-11-23 16:43:16 +05:30
charitha	a2db592d69	Updated group management APIs and service	2016-11-23 14:06:24 +05:30
charitha	726bbcd35d	Merged with upstream	2016-11-23 13:51:50 +05:30
Madawa Soysa	55bc5042bb	Merge pull request #422 from madawas/grouping-policy ... Generalize Policy Implementation - Creating system groups based on ownership	2016-11-23 10:00:17 +05:30
charitha	c07d77b85d	Updated group sharing model	2016-11-22 21:13:18 +05:30
ayyoob	ec3dbd37dd	fixed commit comments	2016-11-22 15:03:23 +05:30
Madawa Soysa	2f431504fe	creating groups from ownership and changing group owner ... This commit includes following changes, Creating groups using the device ownership Changing the default system group owner to wso2.system.user	2016-11-22 13:25:27 +05:30
ayyoob	e3849ef21e	removed feature lifecycle implementation	2016-11-21 20:49:27 +05:30
ayyoob	3fb42ef32e	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	2016-11-21 19:16:32 +05:30
ayyoob	fede8ec409	few changes after testing with authoriser	2016-11-21 19:13:59 +05:30
Madawa Soysa	8ab73ce07d	fixing issue with javadocs	2016-11-21 16:16:33 +05:30
Madawa Soysa	2164a30f88	changing group owner to super user ... Changing the owner of the default system generated groups from the group creator to the super user of the system.	2016-11-21 16:16:00 +05:30
Madawa Soysa	c29bf24a75	Adding mobile devices to default groupes based on device ownership ... Adding mobile devices to default system generated groups based on the device ownership (BYOD, COPE)	2016-11-21 09:21:44 +05:30
GPrathap	6efc5bc1ed	removed @API and @Permission annotations	2016-11-20 19:10:45 +05:30
ayyoob	fe263efe60	changed device access verification approach	2016-11-20 02:37:37 +05:30
ayyoob	28faf53802	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	2016-11-19 11:07:00 +05:30
ayyoob	59e2a33e4a	exposed device access authorisation as a service	2016-11-19 11:02:48 +05:30
ayyoob	20e7dd9e86	picked icon from features config	2016-11-17 23:33:04 +05:30
ayyoob	8a6af051dc	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	2016-11-17 18:37:38 +05:30
ayyoob	a0c8aeb159	few changes after testing feature manager implementation	2016-11-17 18:35:40 +05:30
WSO2 Builder	19c1b3566d	[maven-release-plugin] prepare for next development iteration	2016-11-16 12:18:48 +00:00
WSO2 Builder	cff6e242c8	[maven-release-plugin] prepare release v2.0.0	2016-11-16 12:16:25 +00:00
Ace	16d2a062da	Adding android device-view changes	2016-11-16 15:44:28 +05:30
Ace	a0616cf9a2	Adding config changes	2016-11-16 15:08:43 +05:30
charitha	a6064d2561	Update component versions for IoTS-1.0.0 release	2016-11-16 13:32:13 +05:30
charitha	40c59c2f16	Fix issues in policy UI	2016-11-16 12:46:10 +05:30
charitha	589ba9c40b	Add missing units	2016-11-15 15:59:40 +05:30
charitha	b8d8b35847	Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0	2016-11-15 13:54:59 +05:30
sameera910409	02eec1033e	add group sharing role create functionality	2016-11-15 12:20:58 +05:30
sinthuja	2f59f1566c	Changing the port to the default port of the analytics pack.	2016-11-09 16:12:58 +05:30
ayyoob	44ac6b13b5	changes in UI after refactoring	2016-11-07 00:51:08 +05:30
Ace	5eaca0b1b1	merging with upstream	2016-11-04 20:09:01 +05:30
Ace	2aa1c98d0b	bringing common features to cdmf	2016-11-04 19:12:06 +05:30
charitha	bb60acd105	Fix device listing issue	2016-11-02 12:59:43 +05:30
ayyoob	33bb9b5a14	merged with IoTS-1.0.0 branch	2016-11-02 06:51:28 +05:30
sinthuja	a5212213cf	Changing the default wbsocket URL to DAS endpoint.	2016-11-01 19:55:22 +05:30
charitha	d1a6353195	Synced with changes in master	2016-11-01 15:41:51 +05:30
charitha	4a115e5d3f	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0	2016-11-01 15:01:53 +05:30
Charitha Goonetilleke	e1a1f710a0	Merge pull request #406 from sameeragunarathne/IoTS-1.0.0 ... fixed share groups and group analytics in device grouping	2016-11-01 15:01:38 +05:30
charitha	ac30e7eb3e	Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs # components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js	2016-11-01 14:47:21 +05:30
WSO2 Builder	9517a3d30f	[maven-release-plugin] prepare for next development iteration	2016-10-31 10:34:22 +00:00
WSO2 Builder	a8568299b9	[maven-release-plugin] prepare release v1.2.6	2016-10-31 10:32:11 +00:00
kamidu	0867b3d075	updating the footer	2016-10-31 15:39:10 +05:30
Rasika Perera	fbe423b824	Using permissionsUtil.hasPermission for clientside permission check	2016-10-29 23:46:49 +05:30
Rasika Perera	b1b6b94570	Adding permissionsUtil	2016-10-29 23:13:52 +05:30
sameera910409	f8f7dd08cd	fixed share groups and group analytics in device grouping	2016-10-28 14:07:50 +05:30
Harshan Liyanage	261e8c510c	Fixed syntax issue in device.js file	2016-10-27 15:32:38 +05:30
Charitha Goonetilleke	353707c9c7	Merge pull request #404 from sameeragunarathne/IoTS-1.0.0 ... add group listing and group device listing fixes	2016-10-26 17:55:03 +05:30
charitha	1bfba25c5e	Remove user list and role list attributes from group object ... Move group components to same devicemgt package levels	2016-10-26 17:51:38 +05:30
kamidu	12e609c737	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-26 17:40:05 +05:30
kamidu	0c70c87406	fix for EMM-1673	2016-10-26 17:39:47 +05:30
Kamidu Sachith Punchihewa	02d3adf51e	Merge pull request #401 from madawas/modal-refactor ... Refactoring pages to use new modal unit	2016-10-26 17:29:50 +05:30
Kamidu Sachith Punchihewa	33874f95b6	Merge pull request #399 from saadsahibjan/master ... Fix incorrect spacing	2016-10-26 17:28:59 +05:30
Kamidu Sachith Punchihewa	9d90411189	Merge pull request #402 from madawas/EMM-1298 ... Fix for EMM-1298	2016-10-26 17:27:33 +05:30
Kamidu Sachith Punchihewa	a295c88dc0	Merge pull request #405 from Megala21/master ... Refactoring code	2016-10-26 17:27:04 +05:30
sameera910409	204a0ed943	fixes for the comments of the PR#404	2016-10-26 15:14:53 +05:30
Megala	a088392b2f	Adding css for required fields	2016-10-26 11:58:23 +05:30
sameera910409	fef7c07cb2	add device group deleting and updating fixes	2016-10-26 10:08:48 +05:30
Harshan Liyanage	72522ad759	Fixed SQL syntax issue	2016-10-26 09:49:59 +05:30
Harshan Liyanage	9bf5ca94fb	Fixed SQL syntax issue	2016-10-25 18:50:38 +05:30
sameera910409	41f367abfa	add group listing and group device listing fixes	2016-10-25 17:48:16 +05:30
kamidu	1c2d339fed	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-25 17:22:26 +05:30
kamidu	7212e969d8	Fix for SQL query issue in mysql	2016-10-25 17:22:18 +05:30
Ruwan	072119d7df	Merge pull request #403 from ayyoob/commit-fixes ... Commit fixes	2016-10-25 15:29:04 +05:30
charitha	5f68953b11	Merge branch 'master' into IoTS-1.0.0 ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml	2016-10-25 14:22:44 +05:30
Harshan Liyanage	1ba2e2f768	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-25 11:51:16 +05:30
Harshan Liyanage	f961b57f9f	EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.	2016-10-25 11:50:38 +05:30
Madawa Soysa	774eaadb71	EMM-1298: Extracting serial number from the certificate itself when adding a certificate	2016-10-25 11:43:58 +05:30
kamidu	65ed6c2f6e	include owner for the operations api	2016-10-25 11:31:00 +05:30
ayyoob	8293ed43ae	added missing imports	2016-10-24 02:17:20 +05:30
ayyoob	d17241e51e	added comments and license	2016-10-23 14:18:15 +05:30
ayyoob	45c0d2d2f5	added logs if device type registration failed	2016-10-23 10:51:14 +05:30
ayyoob	d6090dd812	added device type deployer initial commit	2016-10-22 01:37:01 +05:30
Madawa Soysa	f6ee6aeb8d	Refactoring pages to use new modal unit	2016-10-21 17:19:36 +05:30
Saad Sahibjan	1cb969eb6d	Fix incorrect spacing	2016-10-21 13:52:33 +05:30
Megala	35d6d311a7	Fixing EMM-1763	2016-10-19 11:55:00 +05:30
WSO2 Builder	27a2c9b979	[maven-release-plugin] prepare for next development iteration	2016-10-18 12:17:27 +00:00
WSO2 Builder	eae935f91c	[maven-release-plugin] prepare release v1.2.5	2016-10-18 12:09:16 +00:00
Kamidu Sachith Punchihewa	fa7c8e85ce	Merge pull request #393 from thusithak/master ... Fixing modal dialog markup defects in unit	2016-10-18 16:58:48 +05:30
Kamidu Sachith Punchihewa	7666bbfd05	Merge pull request #395 from Megala21/master ... Fixing EMM-1752 and EMM-1755	2016-10-18 16:58:24 +05:30
WSO2 Builder	6a55e1be83	[maven-release-plugin] prepare for next development iteration	2016-10-17 14:15:22 +00:00
WSO2 Builder	11c2e59f61	[maven-release-plugin] prepare release v1.2.4	2016-10-17 14:13:25 +00:00
Megala	3416ae78c4	Fixing the problems in displaying user list when the user names has special chracters	2016-10-17 16:35:58 +05:30
Megala	1ff86289fd	Fixing the problems that happend when we have special chracters in roles	2016-10-17 15:47:32 +05:30
Megala	4ec6883ec8	Merge remote-tracking branch 'upstream/master'	2016-10-17 14:51:20 +05:30
Kamidu Sachith Punchihewa	0d6364d77a	Merge pull request #394 from shavidissa/master ... Continued adding swagger annotations and created the swagger extensions file	2016-10-17 14:28:07 +05:30
Megala	4a71be850c	Refactoring code	2016-10-17 14:23:55 +05:30
Shavindri	28cb653b06	Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.	2016-10-17 14:21:30 +05:30
Rasika Perera	b8f623e04a	Supporting custom contentTypes for service invoker	2016-10-17 10:51:39 +05:30
Megala	d9ec203727	Fixing EMM-1755	2016-10-16 13:24:32 +05:30
Megala	d5c62f74dc	Merge remote-tracking branch 'upstream/master'	2016-10-15 21:49:37 +05:30
thusithakalugamage	521a30c260	Fixing modal dialog markup defects in unit	2016-10-14 17:57:11 +05:30
harshanl	6e1fdabaad	EMM-1342:Added policy revoke operation	2016-10-14 17:13:43 +05:30
Megala	d90d51d412	Merge remote-tracking branch 'upstream/master'	2016-10-14 16:04:01 +05:30
Megala	e55b3a6d5f	Fixes related to having special characters in role name	2016-10-14 16:03:14 +05:30
kamidu	39bc2e6747	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-14 15:20:14 +05:30
kamidu	1af8184889	positioning modal content	2016-10-14 15:20:05 +05:30
thusithakalugamage	3aae81d9e4	resolving conflicts - removing deprecated modal related methods	2016-10-14 14:16:53 +05:30
thusithakalugamage	47ca8942b6	resolving conflicts - removing deprecated modal related methods	2016-10-14 14:11:49 +05:30
thusithakalugamage	308eeb6cf8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-14 13:52:42 +05:30
harshanl	a89b50197f	EMM-1757:Fixed admin device-detail view issue	2016-10-14 13:21:51 +05:30
Megala	a04f91cddb	Fixing issues related to mapping users and roles from different user stores	2016-10-14 10:59:56 +05:30
harshanl	954a2eb870	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-14 10:14:12 +05:30
Megala	87150f5074	Fixing secondary role deletion	2016-10-14 00:01:15 +05:30
Megala	2195a164e5	Merge remote-tracking branch 'upstream/master'	2016-10-13 21:28:51 +05:30
kamidu	6886233bb9	removing unnecessary   and improving styling in modal unit	2016-10-13 19:53:54 +05:30
thusithakalugamage	6667a41378	resolving conflicts	2016-10-13 19:03:44 +05:30
harshanl	24c38602b8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-13 17:11:42 +05:30
harshanl	51910ee67a	EMM-1675:Added policy revoke operation	2016-10-13 17:11:36 +05:30
Megala	0756294724	Merge remote-tracking branch 'upstream/master'	2016-10-13 17:01:32 +05:30
Megala	d8555c34ab	Fixing issues related with roles of secondary user store	2016-10-13 16:58:22 +05:30
kamidu	bbfa1c334d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-13 15:16:31 +05:30
kamidu	ed70cb02b6	Sample implimentation using the new cdmf.ui.modal unit	2016-10-13 15:16:09 +05:30
Kamidu Sachith Punchihewa	cce4428a9d	Merge pull request #390 from shavidissa/master ... Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations	2016-10-13 14:01:49 +05:30
Shavindri	c64581dc59	Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex	2016-10-13 13:45:02 +05:30
Kamidu Sachith Punchihewa	cb825a7f26	Merge pull request #389 from susinda/master ... Device delete implemented (only in api level) for iot and the fix for the EMM-1715	2016-10-13 12:25:56 +05:30
kamidu	2ea21a6fdc	renaming public js to match the unit structure	2016-10-13 12:22:07 +05:30
susinda	eb20d1fc1c	Device delete implemented (only in api level) for iot	2016-10-13 12:02:00 +05:30
kamidu	959e3a63af	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-13 11:17:32 +05:30
kamidu	bfc04a7f16	Fixing EMM-EMM-1753	2016-10-13 11:17:15 +05:30
hasuniea	2128f08658	fixing EMM-1750	2016-10-13 10:00:08 +05:30
Rasika Perera	790ca36443	Removed unnecessary debug log	2016-10-13 08:22:37 +05:30
Rasika Perera	135b6e8881	Fixing device view page	2016-10-13 08:16:51 +05:30
kamidu	c4a0ac4bf3	Enable centralized modal handling unit for cdmf	2016-10-12 17:39:31 +05:30
kamidu	6605a86bf7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-12 16:11:00 +05:30
kamidu	43b1a9f278	Fix for EMM-1651	2016-10-12 16:09:28 +05:30
charitha	528687bde3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-12 12:59:41 +05:30
charitha	0498c68ca5	Add validation to maximum limit value ... (cherry picked from commit 4ed757f)	2016-10-12 12:57:57 +05:30
Megala	4999b84169	Reformatting code	2016-10-12 09:41:43 +05:30
Megala	5b96e1b849	Fixing EMM-1333	2016-10-12 09:38:11 +05:30
thusithakalugamage	fa3db47400	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-11 18:36:56 +05:30
thusithakalugamage	48337ee16c	[EMM-1618] - related improvements on remaining occurences	2016-10-11 18:35:47 +05:30
Rasika Perera	2340611a9b	Removing mdm specific dependencies from CDMF	2016-10-11 15:41:25 +05:30
Milan Perera	da4a558d87	Merge pull request #387 from ayyoob/st2 ... added gateway mode to decide to which oauth app to use.	2016-10-11 15:35:26 +05:30
ayyoob	2f58e0ba15	added gateway mode to decide to which oauth app to use.	2016-10-11 15:15:50 +05:30
Kamidu Sachith Punchihewa	ecc70ead08	Merge pull request #385 from hastef88/emm1726 ... EMM-1726	2016-10-11 11:12:57 +05:30
Kamidu Sachith Punchihewa	af4989e56d	Merge pull request #384 from shavidissa/master ... swagger annotations and definition update continued for device type, …	2016-10-11 11:12:16 +05:30
Hasitha Amal De Silva	4555819211	EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button.	2016-10-11 11:01:30 +05:30
Shavindri	0842dcb2bb	swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.	2016-10-11 10:33:05 +05:30
Milan Perera	bb60caa171	Merge pull request #383 from ayyoob/st2 ... fixed api name for device type	2016-10-10 20:51:40 +05:30
ayyoob	93c1725e32	fixed api name for device type	2016-10-10 20:47:31 +05:30
charitha	e53b0c3860	Fix group count listing in dashboard	2016-10-10 20:00:39 +05:30
kamidu	8c94e83431	Fix for Jira : EMM-1682 and EMM-1653	2016-10-10 18:27:53 +05:30
charitha	a2c0526b40	Fix typo	2016-10-10 15:34:18 +05:30
charitha	670ca7c228	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java	2016-10-10 15:29:10 +05:30
kamidu	836ed2bc1c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-10 14:16:00 +05:30
kamidu	3223e29df9	Fix for EMM-1185 , EMM- 1619	2016-10-10 14:15:52 +05:30
Megala	235e9797d4	Fixing EMM-1717	2016-10-10 11:36:25 +05:30
ayyoob	5727886ea1	few changes after apimgt integration	2016-10-09 03:16:02 +05:30
hasuniea	05e95e2675	fix the EMM-1702	2016-10-07 15:48:43 +05:30
Imesh Chandrasiri	125b827f4f	Fix for modal popup overlay bug	2016-10-07 14:27:00 +05:30
Kamidu Sachith Punchihewa	a8e7396589	Merge pull request #377 from DimalChandrasiri/master ... Parameterized datatable sorting function	2016-10-07 13:10:35 +05:30
Kamidu Sachith Punchihewa	6dafd11ca9	Merge pull request #379 from thusithak/master ... EMM 2.2.0-Alpha2 theme migration and issue fixes	2016-10-07 13:10:20 +05:30
harshanl	4ce9c95044	Changed getOperations API to return operation list of removed devices	2016-10-07 12:34:42 +05:30
thusithakalugamage	84a7d5517f	EMM-1685] - fix and few other related improvements	2016-10-07 12:31:46 +05:30
Imesh Chandrasiri	bce1d9e060	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-07 10:11:35 +05:30
Imesh Chandrasiri	3e4c1f9121	Parametarized datatable sorting function	2016-10-07 10:11:21 +05:30
Kamidu Sachith Punchihewa	5e6d8e667d	Merge pull request #376 from thusithak/master ... EMM 2.2.0-Alpha2 theme migration and issue fixes	2016-10-06 22:46:51 +05:30
kamidu	131bcd48f9	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-06 22:33:15 +05:30
kamidu	cc6922bfad	Fix for EMM-1680	2016-10-06 22:33:08 +05:30
charitha	664b3d4d43	Fix issue in duplicate mapping	2016-10-06 20:32:09 +05:30
harshanl	4bcf350236	EMM-1678:Updated the oauth component versions	2016-10-06 19:43:23 +05:30
thusithakalugamage	1a1f79b1b4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-06 17:46:59 +05:30
thusithakalugamage	ac27349dae	Header nav menu responsiveness improvements	2016-10-06 17:45:55 +05:30
kamidu	fc902ba602	fix database extended issue	2016-10-06 17:25:47 +05:30
thusithakalugamage	909e7836ca	Header nav menu responsiveness improvements	2016-10-06 16:41:31 +05:30
kamidu	fc50b851bc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-06 16:26:55 +05:30
kamidu	4bbb378d26	conicting solving	2016-10-06 16:26:50 +05:30
charitha	94a50584f4	Improve group listing with pagination	2016-10-06 16:01:41 +05:30
kamidu	e2ee797462	Fix for EMM-1700	2016-10-06 12:20:07 +05:30
madhawap	16b334b0b3	changes to swagger SecurityDefinitionConfigurator and annotations	2016-10-06 12:13:27 +05:30
madhawap	7b8518a9db	changes to swagger SecurityDefinitionConfigurator and annotations	2016-10-06 11:59:20 +05:30
charitha	ce5d63925a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-06 11:58:12 +05:30
charitha	e89b4015b6	Introduced pagination	2016-10-06 11:51:54 +05:30
Kamidu Sachith Punchihewa	06e70c8326	Merge pull request #373 from shavidissa/master ... swagger annotations and definitions changes for role management, configuration management and application management(admin)	2016-10-06 11:33:31 +05:30
Shavindri	f0164b5a01	swagger annotations and definitions changes for role management, configuration management and application management(admin)	2016-10-06 10:12:25 +05:30
thusithakalugamage	2ae60cc415	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-05 19:18:22 +05:30
thusithakalugamage	88ec5246ec	[EMM-1694] - Header responsive issues fix	2016-10-05 19:17:51 +05:30
kamidu	1fe74905f2	Fix for the redirection and ui related issues	2016-10-05 18:11:46 +05:30
Imesh Chandrasiri	ebad678bab	Datatables serverside paging redirection bug fix	2016-10-05 15:08:34 +05:30
kamidu	8c98accd18	Fixing conflitcs	2016-10-05 12:24:23 +05:30
kamidu	c6fffb0b3a	Fixies for the ui issues in EMM -beta	2016-10-05 12:22:32 +05:30
charitha	06176898d0	Exposed group id to API level	2016-10-05 12:20:35 +05:30
Megala	e77d8b8b29	Adding isEmpty check	2016-10-05 11:34:05 +05:30
Megala	0642cc10d7	Reformatting code	2016-10-05 10:52:40 +05:30
Megala	f9204add08	Merge remote-tracking branch 'upstream/master'	2016-10-05 10:10:12 +05:30
Megala	42a9ba92a6	Fixing EMM-1683	2016-10-05 10:09:35 +05:30
charitha	f22d392978	Upgrade to comply with latest CDMF changes	2016-10-04 19:03:07 +05:30
Megala	b7990b9146	Fixing problems in retriveing data from secondary user store	2016-10-04 17:22:45 +05:30
Kamidu Sachith Punchihewa	c7bd0de033	Merge pull request #369 from thusithak/master ... Platform configuration style defect fixes	2016-10-04 17:09:53 +05:30
Dilan U. Ariyaratne	2d7506d9b8	Merge pull request #368 from amalhub/master ... Fixing issue: EMM-1537	2016-10-04 17:04:55 +05:30
dilanua	dff32af832	Adding initial swagger annotations and permissions to Dashboard APIs	2016-10-04 16:25:17 +05:30
dilanua	1ca5762c44	Uncommenting Dashboard APIs	2016-10-04 15:49:29 +05:30
thusithakalugamage	f664749c1f	platform configuration style defect fixes	2016-10-04 15:22:41 +05:30
kamidu	f32caf1833	UI fixes in 2.2.0-beta	2016-10-04 13:20:09 +05:30
charitha	a0050d8f4d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-04 12:26:29 +05:30
kamidu	7898a7475c	UI fixes in 2.2.0-beta	2016-10-04 12:24:41 +05:30
charitha	d1d6eefd17	Upgrading grouping backend	2016-10-04 12:24:40 +05:30
amalhub	c87c5a8322	Fixing issue: EMM-1537	2016-10-04 11:14:39 +05:30
harshanl	f0f0182d20	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-03 18:28:43 +05:30
harshanl	a4538a6d6c	Removed unnecessary params from paginated queries	2016-10-03 18:27:20 +05:30
Rasika Perera	35c23174be	Fixing android sense download issue	2016-10-03 16:05:49 +05:30
Rasika Perera	0290c710e1	Fixing enrollment url for device types	2016-10-03 16:05:49 +05:30
Harshan Liyanage	13d9bdfb53	Merge pull request #367 from Megala21/master ... [EMM-1129]Fixing SSO problem	2016-10-03 15:42:13 +05:30
Megala	359bd8f317	Fixing tenant loading problem	2016-10-03 15:15:27 +05:30
harshanl	672de3a09e	Device status change fix for iOS	2016-10-03 14:57:46 +05:30
Megala	e8eb0123c7	Fixing the tenant loading problem when sso is enabled	2016-10-03 14:18:43 +05:30
harshanl	befb5b0ad8	EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.	2016-10-03 14:13:06 +05:30
amalhub	8b4649b4e5	Fixing issue: EMM-1537	2016-10-03 11:39:03 +05:30
Megala	a0586ca977	Adding comment	2016-10-03 11:34:00 +05:30
Megala	e5870e1306	Fixing the problem of common log out	2016-10-02 23:15:25 +05:30
Megala	b10c323582	Fixing the problem in login	2016-10-02 21:26:13 +05:30
Megala	bacd7ccfd2	Merge remote-tracking branch 'upstream/master'	2016-10-01 22:02:35 +05:30
Megala	4af2a37d9d	Fixing SSO problem	2016-10-01 22:00:59 +05:30
harshanl	406d49ad61	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-30 18:43:38 +05:30
harshanl	399ef2fc06	Windows getOpending operations fix	2016-09-30 15:33:59 +05:30
kamidu	5595100cc2	UI fixes in role and policy management	2016-09-30 15:10:34 +05:30
harshanl	9d31590e83	Windows getPending operations fix	2016-09-30 14:27:11 +05:30
harshanl	10f8b12b88	OperationManagerImpl Code refactored	2016-09-30 11:39:15 +05:30
harshanl	f9ba45f439	Fixed the device status changing issue when there are multiple enrollments for the same device	2016-09-30 11:04:28 +05:30
Chatura Dilan Perera	c16cc4cae1	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
Chatura Dilan Perera	ed4bca7032	[maven-release-plugin] prepare release v1.2.2	2016-09-29 20:32:59 +05:30
warunalakshitha	25ed0cf370	Fix build issue with swagger version	2016-09-29 18:28:09 +05:30
Rasika Perera	3b68ccb4ba	Merge pull request #365 from rasika/iots-ga ... Merge iot-ga branch	2016-09-29 15:21:17 +05:30
Megala	400199e965	Merge remote-tracking branch 'upstream/master'	2016-09-29 14:18:24 +05:30
Megala	38677f84e8	Fixing SQL syntax problem	2016-09-29 14:09:44 +05:30
Harshan Liyanage	cd06637546	Merge pull request #364 from Megala21/master ... Correcting the problem related with oracle syntax	2016-09-29 14:06:49 +05:30
Megala	12aed521e5	Refactoring code	2016-09-29 13:57:06 +05:30
Megala	2cdaf5aa21	Reverting changes made to generic implementations and moving them to oracle specific ones	2016-09-29 13:44:33 +05:30
Megala	ecc87f370c	Fixing oracle error	2016-09-29 13:19:33 +05:30
Rasika Perera	b2eb715fb7	REsolving conflicts	2016-09-29 13:01:01 +05:30
Rasika Perera	5c8c28d28c	Merge pull request #1 from warunalakshitha/master ... upgrade product iot to carbon 4.4.9	2016-09-29 11:24:05 +05:30
charitha	e6c4053135	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-29 11:12:52 +05:30
charitha	da0977bd85	Fix SQL error when could happen due to large response payloads	2016-09-29 11:12:28 +05:30
Megala	47d6268c9e	Correcting the problem related with oracle syntax	2016-09-29 01:43:33 +05:30
warunalakshitha	397c1daa2a	Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle	2016-09-29 00:40:58 +05:30
Rasika Perera	237b9a7078	Creating api endpoint to retrieve features of a device-type	2016-09-28 23:42:44 +05:30
Rasika Perera	b2f31be1d6	Fixing iot operation bar not listing operations	2016-09-28 23:42:15 +05:30
Megala	cd50fe88bc	Reformatting the code	2016-09-28 16:22:59 +05:30
Megala	45cda92082	Merge remote-tracking branch 'upstream/master'	2016-09-28 15:33:42 +05:30
Megala	82be4ef5a8	Fixing oracle script issues	2016-09-28 15:15:24 +05:30
dilanua	7596f7876d	Improving device view info.retrieval - UI	2016-09-28 14:11:00 +05:30
Rasika Perera	6d4ddf7b54	Removed info log on view device	2016-09-27 23:19:14 +05:30
Rasika Perera	1bae3d2213	Fixing policy retrieve api	2016-09-27 22:06:48 +05:30
Rasika Perera	99fee36f2c	Fixing error when properties is null	2016-09-27 21:13:00 +05:30
amalhub	428ce25b6f	Fixing issue: https://wso2.org/jira/browse/EMM-1646	2016-09-27 20:46:00 +05:30
harshanl	9467efe0f6	Fixed notification issue	2016-09-27 17:54:31 +05:30
kamidu	1a9ca2d59e	Fix for Jira issue: EMM-1635	2016-09-27 15:41:47 +05:30
Rasika Perera	12c8483b4b	Changes to devices policy	2016-09-27 15:28:06 +05:30
kamidu	174555b387	Fix for EMM-1627	2016-09-27 11:29:34 +05:30
Rasika Perera	056f6d2f4e	Adding proper error message when no device type is avaialble	2016-09-27 04:49:07 +05:30
Imesh Chandrasiri	de63beaaa6	Roles listing icon resize fix	2016-09-26 20:04:14 +05:30
Imesh Chandrasiri	5e7d3a00ad	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-26 20:02:44 +05:30
dilanua	8232bf7484	FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633	2016-09-26 19:52:18 +05:30
Imesh Chandrasiri	5954fd9070	EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode	2016-09-26 19:41:20 +05:30
Imesh Chandrasiri	2c0df21491	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-26 19:37:43 +05:30
Rasika Perera	56a81e431c	Removed extra license headers	2016-09-26 19:21:46 +05:30
Rasika Perera	6bfe166b5d	Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username	2016-09-26 19:17:05 +05:30
Rasika Perera	54c518a4fd	Making datatables-extended to get context path from global js variable	2016-09-26 19:13:12 +05:30
Rasika Perera	77720dd61a	Fixing devices listing page styling issue.	2016-09-26 18:25:11 +05:30
Rasika Perera	1bef7a38ef	Minor style fix for wr-hidden-operations	2016-09-26 18:08:06 +05:30
kamidu	225268bd78	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-26 18:05:36 +05:30
kamidu	0ab9db2afd	Fix for EMM-1575	2016-09-26 18:05:29 +05:30
dilanua	378dd4084c	FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585	2016-09-26 17:27:57 +05:30
harshanl	1a12838b7c	Fixed issue in NotificationDAO due to invalid column name	2016-09-26 17:16:27 +05:30
Rasika Perera	4c4eba93d8	Returning correct representation of the device to template.	2016-09-26 17:15:12 +05:30
Rasika Perera	cef865f53a	Parsing deviceType configs with %https.ip% and %http.ip%	2016-09-26 17:13:43 +05:30
Rasika Perera	a61be7a7ec	Enable group management api	2016-09-26 14:56:34 +05:30
Rasika Perera	b5b4f508b0	Fixing NPE when fetching opeartion	2016-09-26 14:53:04 +05:30
Rasika Perera	f2af4bd078	Fixing undefined exception when device properties not available	2016-09-24 01:35:59 +05:30
harshanl	27a9eeb692	Removed unnecessary DM service	2016-09-23 23:22:58 +05:30
harshanl	f24242fb8a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-23 21:17:50 +05:30
harshanl	dd03d0b740	Added device status change upon inactivity mechanism	2016-09-23 21:17:37 +05:30
Ruwan	0c92f80e68	Merge pull request #361 from ruwany/carbon-kernel-4.4.7 ... Migrating kernel/apim/appm/identity to latest versions	2016-09-23 17:04:18 +05:30
Rasika Perera	ccf4b6492c	Fixing devices listing issue	2016-09-23 12:45:45 +05:30
Rasika Perera	3e2731a772	Fixing invoker service return nothing on httpClient requests.	2016-09-23 12:45:15 +05:30
dilanua	ebead1249c	Fix for jira: https://wso2.org/jira/browse/EMM-1617	2016-09-23 11:38:40 +05:30
dilanua	87a03e8312	Fix for jira: https://wso2.org/jira/browse/EMM-1617	2016-09-23 11:15:12 +05:30
dilanua	71424c4bb7	Fix for JIRA: https://wso2.org/jira/browse/EMM-1613	2016-09-22 22:47:18 +05:30
dilanua	e3256417a3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 22:16:24 +05:30
dilanua	a4b39f92e5	Fix for JIRA: https://wso2.org/jira/browse/EMM-1593	2016-09-22 22:15:55 +05:30
harshanl	5a6120d6fa	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 20:31:14 +05:30
dilanua	92aa413773	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 19:53:36 +05:30
dilanua	f7a38b2313	Fix for JIRA: https://wso2.org/jira/browse/EMM-1612	2016-09-22 19:53:18 +05:30
Ace	154a6082ce	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml	2016-09-22 19:08:21 +05:30
harshanl	17127c3846	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 16:54:56 +05:30
Rasika Perera	98ab29fe94	Fixing virtual firealarm device agent download	2016-09-22 15:53:16 +05:30
Rasika Perera	eb5a36ef42	Supporting stream download on service invoker	2016-09-22 15:52:52 +05:30
Rasika Perera	4691bedbc5	Fixes to devices listing	2016-09-22 14:35:17 +05:30
Rasika Perera	1d3f5f39a7	Adding custom headers support to invoker util	2016-09-22 14:33:53 +05:30
Imesh Chandrasiri	f8b08849cd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-22 14:14:20 +05:30
Imesh Chandrasiri	3d5b6cd89f	Removing unwanted url params from datatable serverside search	2016-09-22 14:14:07 +05:30
harshanl	12713f3301	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 10:45:47 +05:30
Rasika Perera	e71d3947cb	Adding intuitive error when specified notification provider is not found	2016-09-22 08:57:34 +05:30
Rasika Perera	513015c1b5	Changing context path /emm into /devicemgt on cdmf base app	2016-09-22 08:56:41 +05:30
Rasika Perera	0fb87f3aa2	Fixing device types not shown issue	2016-09-22 08:56:12 +05:30
Rasika Perera	9148c3baea	Fixing dashboard styling issues	2016-09-22 08:55:29 +05:30
harshanl	108ea98677	Refactor policy mgt components and fixed add operations for invalid devices from task service	2016-09-21 19:44:46 +05:30
harshanl	c967fc34d0	Fixed EMM-1513	2016-09-20 18:43:50 +05:30
Ace	5f90587564	Synching with master	2016-09-20 18:13:53 +05:30
Chatura Dilan Perera	7395c76408	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2016-09-20 17:45:24 +05:30
Ace	33d8829540	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java	2016-09-20 17:02:28 +05:30
dilanua	81c684be50	Refactoring user-menu - UI	2016-09-20 16:27:07 +05:30
dilanua	d8e057abdd	Fix for JIRA: https://wso2.org/jira/browse/EMM-1582	2016-09-20 15:28:45 +05:30
dilanua	6fea974c90	Refactoring notifications side-pane - UI	2016-09-20 14:21:17 +05:30
dilanua	ce1a063688	Refactoring notifications side-pane - UI	2016-09-20 12:49:41 +05:30
dilanua	9a095fa670	Refactoring change password modal - UI	2016-09-20 12:14:45 +05:30
Ace	87ad1e0e71	Fixing intermittent jackson bind issue	2016-09-20 12:07:14 +05:30
dilanua	b16f0fd592	Refactoring change password modal - UI	2016-09-20 11:27:04 +05:30
Ace	099ffd6a74	Updating velocity dependencies to OSGI enabled bundle version	2016-09-20 10:38:39 +05:30
Chatura Dilan Perera	50d8885f8b	[maven-release-plugin] prepare for next development iteration	2016-09-19 18:54:48 +05:30
Chatura Dilan Perera	a00d6aafd4	[maven-release-plugin] prepare release v1.2.1	2016-09-19 18:54:38 +05:30
harshanl	75df243a33	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-19 12:22:08 +05:30
Ace	6a8a5cbd5a	Merging with master	2016-09-19 12:21:41 +05:30
harshanl	4169d3b2bd	Fixed EMM-1554	2016-09-19 12:08:06 +05:30
dilanua	b4e4b114a5	Updating dashboard title	2016-09-18 17:01:36 +05:30
dilanua	e8571b7b65	Updating operation-mod with windows operation apis	2016-09-18 16:06:32 +05:30
dilanua	408e10a890	Changing admin dashboard name to 'Navigating Dashboard' - UI	2016-09-18 08:39:41 +05:30
dilanua	713c8ac4d8	Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations	2016-09-18 07:34:14 +05:30
dilanua	cd66f64945	Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI	2016-09-17 20:05:34 +05:30
dilanua	37131afb4a	Adding radio:checked and input[type=hidden] support to operation mod - UI	2016-09-17 19:57:02 +05:30
dilanua	e4dae67fea	Changing permissions - /devices/any to /devices/any-device	2016-09-17 17:36:06 +05:30
dilanua	58f8656e94	Changing permissions - /devices/owning to /devices/owning-device	2016-09-17 17:22:47 +05:30
Rasika Perera	d9b25eda08	Adding deviceName into notifications	2016-09-16 09:39:21 +05:30
Dilan U. Ariyaratne	1651ade4a7	Merge pull request #357 from thusithak/master ... Theme migration - 2.2.0 alpha defect fixes	2016-09-15 16:49:41 +05:30
Dilan U. Ariyaratne	df7c54b1af	Merge pull request #356 from DimalChandrasiri/theme-migration ... Model Fixes	2016-09-15 16:49:14 +05:30
thusithakalugamage	2f5d90cb6c	[EMM-1571] Add policies page wizard styling and layout defects	2016-09-15 13:46:48 +05:30
harshanl	5b0e99aeff	Fixed EMM-1562	2016-09-15 12:37:35 +05:30
harshanl	78cab76101	Fixed EMM-1531	2016-09-15 12:36:55 +05:30
Imesh Chandrasiri	1599b84e54	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-15 10:19:42 +05:30
Imesh Chandrasiri	e2576b21a8	Adding default button class to modal popups	2016-09-15 10:19:22 +05:30
kamidu	a448959fe0	Fix for EMM-1548	2016-09-15 06:40:05 +05:30
Ace	1dfb8e22e1	Updating to latest appm/apim/identity dependencies	2016-09-14 17:23:09 +05:30
kamidu	e2d0f7d040	Fix for EMM-1559	2016-09-14 16:23:21 +05:30
Imesh Chandrasiri	3e5064feed	Fix for datatable icon size change on pagination	2016-09-14 15:13:54 +05:30
Imesh Chandrasiri	9573bce48f	Fix for datatable icon size change on pagination	2016-09-14 14:35:56 +05:30
Imesh Chandrasiri	317252ebb0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-14 10:22:00 +05:30
Rasika Perera	1d7546916c	Changes to the policiesCount, rolesCount, usersCount methods	2016-09-14 07:09:05 +05:30
Rasika Perera	0fab418187	Fixing invalid device count and group count	2016-09-13 19:43:43 +05:30
Imesh Chandrasiri	b56fb667b7	Modal fixes	2016-09-13 15:16:50 +05:30
kamidu	d7c7315f16	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-13 12:15:03 +05:30
kamidu	70dd5ded77	Fix for the policy edit internal server issue	2016-09-13 12:14:55 +05:30
Dilan U. Ariyaratne	3cbaecfbbf	Merge pull request #355 from DimalChandrasiri/theme-migration ... Data Table CSS Removed from custom.desktop file	2016-09-13 11:19:30 +05:30
thusithakalugamage	144dd92c47	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-12 18:09:57 +05:30
thusithakalugamage	d2a44647dd	[EMM-1549] - Heading defect fix	2016-09-12 18:09:33 +05:30
dilanua	00d79c9ece	Changing certificates breadcrumb name from certificate to certificates - UI	2016-09-12 17:09:40 +05:30
Imesh Chandrasiri	7a452d09ab	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-12 15:18:37 +05:30
Imesh Chandrasiri	e3b230937e	Remove data table styles	2016-09-12 15:18:21 +05:30
thusithakalugamage	4cb5238112	[EMM-1543] styling defect fix	2016-09-12 14:37:52 +05:30
thusithakalugamage	3b3962b772	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-12 14:36:25 +05:30
thusithakalugamage	0273a6e369	responsive tab panel component - markup rewrite for uuf	2016-09-12 14:35:58 +05:30
dilanua	6aa01d2e7a	Fixing NPE issue in token-protected-service-invokers - UI	2016-09-12 14:17:44 +05:30