4144 Commits

Author	SHA1	Message	Date
WSO2 Builder	c29d83afeb	[WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare release v3.0.38	2017-07-17 07:10:46 +00:00
Rasika Perera	c6cce05b11	Merge pull request #845 from rasika/cloud-fixes ... Cloud fixes	2017-07-17 11:14:55 +05:30
WSO2 Builder	47ce6f4271	[WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare for next development iteration	2017-07-16 22:21:47 +05:30
WSO2 Builder	5dc7dc5442	[WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare release v3.0.37	2017-07-16 22:21:33 +05:30
WSO2 Builder	5acea60aef	Merge commit '91456df809816dfecda50082aeafe1192ee09fc0' into 240ffbb1-c967-4109-b74d-1eb6335f277e	2017-07-16 22:02:13 +05:30
WSO2 Builder	91456df809	[WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare for next development iteration	2017-07-16 21:54:30 +05:30
WSO2 Builder	25598c12d4	[WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare release v3.0.36	2017-07-16 21:54:16 +05:30
Madhawa Perera	efde7df025	Merge pull request #851 from rasika/geo-fence-issues ... Fixing geofence issues	2017-07-16 21:36:56 +05:30
Madhawa Perera	731d88d96e	Merge pull request #850 from rasika/temp-fix-api-subscribe ... Temporary fixing download issue with adding /admin/manage/api/subscribe permission	2017-07-16 21:36:30 +05:30
Madhawa Perera	f45b0bf863	Merge pull request #849 from rasika/logo-fix ... Changing IoT Server logo into sharp .svg format	2017-07-16 21:36:04 +05:30
Madhawa Perera	357a78215f	Merge pull request #842 from warunalakshitha/master ... Add new config to sample.xml	2017-07-16 21:35:22 +05:30
Rasika Perera	c31461d278	Fixes https://github.com/wso2/product-iots/issues/1096	2017-07-16 19:01:06 +05:30
Rasika Perera	f3eaac15c7	Fixes https://github.com/wso2/product-iots/issues/1096	2017-07-16 18:53:05 +05:30
Rasika Perera	661925ca54	Fixes https://github.com/wso2/product-iots/issues/1134 : Temporary fixing issue with adding /admin/manage/api/subscribe permission	2017-07-16 18:20:16 +05:30
WSO2 Builder	94c1fd0ad6	[WSO2 Release] [Jenkins #2461] [Release 3.0.35] prepare for next development iteration	2017-07-16 18:05:31 +05:30
WSO2 Builder	ce87e69859	[WSO2 Release] [Jenkins #2461] [Release 3.0.35] prepare release v3.0.35	2017-07-16 18:05:17 +05:30
Geeth	ed3327834b	Merge pull request #848 from rasika/location-column-fix ... Location column fix	2017-07-16 17:42:21 +05:30
Rasika Perera	f15713ae85	Changing IoT Server logo into sharp .svg format	2017-07-16 16:11:39 +05:30
Rasika Perera	78187c4ec1	Increasing location street column size	2017-07-16 16:00:19 +05:30
WSO2 Builder	2894d9ed00	Merge commit '5f8dab6916d6136102f0320464c1092369f7697d' into 43d6a75e-06b6-4777-86d7-21aee6dc4b99	2017-07-14 13:16:08 +05:30
WSO2 Builder	5f8dab6916	[WSO2 Release] [Jenkins #2457] [Release 3.0.34] prepare for next development iteration	2017-07-14 12:53:35 +05:30
WSO2 Builder	7c5fc0bf5d	[WSO2 Release] [Jenkins #2457] [Release 3.0.34] prepare release v3.0.34	2017-07-14 12:53:19 +05:30
Imesh Chandrasiri	46b22e438d	fixes wso2/product-iots#1152	2017-07-14 12:25:17 +05:30
Rasika Perera	9683b066dd	Cloud fixes	2017-07-14 11:08:18 +05:30
Imesh Chandrasiri	4b87209e04	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-14 11:08:01 +05:30
Imesh Chandrasiri	f7c8578758	fixes wso2/product-iots#1141	2017-07-14 11:07:49 +05:30
WSO2 Builder	2673a7ae3c	[WSO2 Release] [Jenkins #2454] [Release 3.0.33] prepare for next development iteration	2017-07-13 15:38:51 +05:30
WSO2 Builder	14f8bacb65	[WSO2 Release] [Jenkins #2454] [Release 3.0.33] prepare release v3.0.33	2017-07-13 15:38:38 +05:30
Imesh Chandrasiri	6d62f3b425	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-13 15:14:51 +05:30
Imesh Chandrasiri	7547599b09	fixes wso2/product-iots#1164	2017-07-13 15:14:40 +05:30
WSO2 Builder	2a6d35bdf5	[WSO2 Release] [Jenkins #2452] [Release 3.0.32] prepare for next development iteration	2017-07-13 12:25:52 +05:30
WSO2 Builder	a1a6649213	[WSO2 Release] [Jenkins #2452] [Release 3.0.32] prepare release v3.0.32	2017-07-13 12:25:38 +05:30
Imesh Chandrasiri	eabeb71a9c	fixes wso2/product-iots#1166	2017-07-13 11:57:24 +05:30
Imesh Chandrasiri	a753ce1648	fixes wso2/product-iots#1170	2017-07-13 11:39:32 +05:30
Imesh Chandrasiri	c46cbb34ad	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-13 11:20:01 +05:30
Imesh Chandrasiri	a014cb0f60	fixes wso2/product-iots#1168	2017-07-13 11:17:41 +05:30
Waruna Lakshitha	222e1f6e7f	add configuration change	2017-07-12 13:48:43 +05:30
warunalakshitha	61f6fdeca9	Revert "Add multiple push notification support and transport config for features" ... This reverts commit ad9ec1f994.	2017-07-12 12:33:16 +05:30
warunalakshitha	a3c5118d5e	Merge branch 'master' of https://github.com/warunalakshitha/carbon-device-mgt	2017-07-12 12:23:04 +05:30
WSO2 Builder	f398de79c4	[WSO2 Release] [Jenkins #2449] [Release 3.0.31] prepare for next development iteration	2017-07-11 15:35:38 +05:30
WSO2 Builder	757e93c301	[WSO2 Release] [Jenkins #2449] [Release 3.0.31] prepare release v3.0.31	2017-07-11 15:35:22 +05:30
WSO2 Builder	8d0e7a2086	[WSO2 Release] [Jenkins #2448] [Release 3.0.30] prepare for next development iteration	2017-07-11 14:16:42 +05:30
WSO2 Builder	6b30b11de9	[WSO2 Release] [Jenkins #2448] [Release 3.0.30] prepare release v3.0.30	2017-07-11 14:16:25 +05:30
WSO2 Builder	3a991b8bf7	[WSO2 Release] [Jenkins #2446] [Release 3.0.29] prepare for next development iteration	2017-07-10 17:50:16 +05:30
WSO2 Builder	9ecc6f7281	[WSO2 Release] [Jenkins #2446] [Release 3.0.29] prepare release v3.0.29	2017-07-10 17:50:02 +05:30
kamidu	19dc0a08c7	merge the css changes	2017-07-10 17:23:49 +05:30
kamidu	ee4e3df66d	enable device owner flag in policy	2017-07-10 17:21:18 +05:30
WSO2 Builder	71e3cdffdd	[WSO2 Release] [Jenkins #2444] [Release 3.0.28] prepare for next development iteration	2017-07-10 14:54:49 +05:30
WSO2 Builder	2519d86874	[WSO2 Release] [Jenkins #2444] [Release 3.0.28] prepare release v3.0.28	2017-07-10 14:54:40 +05:30
Imesh Chandrasiri	ca760581a5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-10 12:40:20 +05:30
Imesh Chandrasiri	66a7fe454c	Fixes datatable miss rendering in device detail view.	2017-07-10 12:25:58 +05:30
WSO2 Builder	c63c04f5a6	[WSO2 Release] [Jenkins #2441] [Release 3.0.27] prepare for next development iteration	2017-07-09 09:50:34 +05:30
WSO2 Builder	9d2fd5273e	[WSO2 Release] [Jenkins #2441] [Release 3.0.27] prepare release v3.0.27	2017-07-09 09:50:19 +05:30
sumedharubasinghe	77eadc7b5a	Merge pull request #836 from rasika/operation-bar ... Changes for the operation bar	2017-07-09 07:58:45 +05:30
Rasika Perera	6e748ae799	Hiding geo-fencing related buttons when geoservices disabled	2017-07-08 21:10:04 +05:30
Rasika Perera	389173f505	Fixes https://github.com/wso2/product-iots/issues/1084	2017-07-08 19:17:52 +05:30
Rasika Perera	394d97e1c8	Fixed operations not loaded correctly	2017-07-08 18:47:00 +05:30
WSO2 Builder	5d27e40e76	[WSO2 Release] [Jenkins #2438] [Release 3.0.26] prepare for next development iteration	2017-07-07 19:11:59 +05:30
WSO2 Builder	3930a7cfb1	[WSO2 Release] [Jenkins #2438] [Release 3.0.26] prepare release v3.0.26	2017-07-07 19:11:44 +05:30
WSO2 Builder	2cc05f5b74	Merge commit 'b429d8b902afeac2ee9bb8437453823f22d7558f' into 58d25041-0381-457c-88f6-091b7d94faa6	2017-07-07 18:51:02 +05:30
Rasika Perera	9db4ddd4df	Merge pull request #832 from rasika/geo-fencing ... Hiding geo dashboard tools when GeoLocationConfiguration is Disabled	2017-07-07 18:39:02 +05:30
Rasika Perera	bd5276117a	Merge pull request #834 from rasika/master ... Fixes device status inconsistency issues	2017-07-07 18:38:00 +05:30
WSO2 Builder	b429d8b902	[WSO2 Release] [Jenkins #2437] [Release 3.0.25] prepare for next development iteration	2017-07-07 18:30:31 +05:30
WSO2 Builder	8ac3291551	[WSO2 Release] [Jenkins #2437] [Release 3.0.25] prepare release v3.0.25	2017-07-07 18:30:16 +05:30
geethkokila	38756ffe4e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-07 17:59:35 +05:30
geethkokila	3e42cf426f	Fixing the null pointer	2017-07-07 17:59:28 +05:30
Rasika Perera	972465b61e	Fixes https://github.com/wso2/product-iots/issues/1089, https://github.com/wso2/product-iots/issues/1120	2017-07-07 17:16:28 +05:30
WSO2 Builder	8287bfa6d5	[WSO2 Release] [Jenkins #2435] [Release 3.0.24] prepare for next development iteration	2017-07-07 16:24:55 +05:30
WSO2 Builder	f3c6548937	[WSO2 Release] [Jenkins #2435] [Release 3.0.24] prepare release v3.0.24	2017-07-07 16:24:39 +05:30
Imesh Chandrasiri	4a638836ca	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-07 12:42:28 +05:30
Imesh Chandrasiri	b43a2f72d9	Fixes wso2/product-iots#1118	2017-07-07 12:42:18 +05:30
Rasika Perera	83d0793a35	Hiding geo dashboard tools when GeoLocationConfiguration is Disabled	2017-07-07 06:58:58 +05:30
WSO2 Builder	ab606238d9	[WSO2 Release] [Jenkins #2432] [Release 3.0.23] prepare for next development iteration	2017-07-07 00:09:32 +05:30
WSO2 Builder	23cdc06244	[WSO2 Release] [Jenkins #2432] [Release 3.0.23] prepare release v3.0.23	2017-07-07 00:09:19 +05:30
lasantha	edc14aa46d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-06 23:40:06 +05:30
lasantha	f32f5e4fdc	Fixed operation label centering issue	2017-07-06 21:49:22 +05:30
WSO2 Builder	407fdf66da	[WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare for next development iteration	2017-07-06 15:02:03 +05:30
WSO2 Builder	ba0a0c4687	[WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare release v3.0.22	2017-07-06 15:01:52 +05:30
Imesh Chandrasiri	1893d035a3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-06 14:17:27 +05:30
Imesh Chandrasiri	e1857099a7	Fixes wso2/product-iots#1083	2017-07-06 14:17:16 +05:30
Madhawa Perera	597b450cfb	Merge pull request #829 from lasanthaDLPDS/master ... Adding checkbox and radio options to device.operation-bar	2017-07-06 13:57:13 +05:30
lasantha	cb8208b8b7	Adding UI validation to check whether radio or checkbox options are selected or not.	2017-07-06 13:15:52 +05:30
geethkokila	fe67d251d5	Fixing the #460 issue	2017-07-06 11:57:04 +05:30
lasantha	e05eda5e18	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-06 09:42:22 +05:30
lasantha	c9e533dd2a	adding ui params option to operations	2017-07-06 09:36:40 +05:30
WSO2 Builder	1950126459	[WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare for next development iteration	2017-07-05 23:45:39 +05:30
WSO2 Builder	2388bd5f05	[WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare release v3.0.21	2017-07-05 23:45:24 +05:30
Rasika Perera	3e118d8800	Fixing https://github.com/wso2/product-iots/issues/1063: Adding filter out features	2017-07-05 23:20:41 +05:30
WSO2 Builder	f106a914bb	[WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare for next development iteration	2017-07-05 14:59:52 +05:30
WSO2 Builder	0cc8f902ae	[WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare release v3.0.20	2017-07-05 14:59:38 +05:30
Imesh Chandrasiri	c17b2fbd98	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-07-05 12:10:26 +05:30
Imesh Chandrasiri	d38714b7e6	fixes wso2/product-iots#1113	2017-07-05 12:08:45 +05:30
Rasika Perera	5e87ce2d66	Merge pull request #824 from rasika/monetize-cloud ... Fixing https://github.com/wso2/product-iots/issues/1119: monetization	2017-07-05 11:10:11 +05:30
Rasika Perera	f8fa314359	Fixing https://github.com/wso2/product-iots/issues/1096: Hiding table when no alerts avaialble	2017-07-05 10:49:55 +05:30
Rasika Perera	7bc3ab7bec	Fixing https://github.com/wso2/product-iots/issues/1096: Stationery -> Stationary	2017-07-05 07:17:52 +05:30
Rasika Perera	fb12c3cb04	Fixing https://github.com/wso2/product-iots/issues/1096: i.e. colombo -> e.g. colombo	2017-07-05 07:17:26 +05:30
Rasika Perera	8223588e82	Fixing https://github.com/wso2/product-iots/issues/1119: monetization	2017-07-05 06:27:42 +05:30
WSO2 Builder	09bf240ff6	[WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare for next development iteration	2017-07-04 19:13:38 +05:30
WSO2 Builder	3c63162f7a	[WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare release v3.0.19	2017-07-04 19:13:23 +05:30
Imesh Chandrasiri	73d4a213c6	fix for issue [#1112]	2017-07-04 17:13:52 +05:30
WSO2 Builder	e65f0b1afa	[WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare for next development iteration	2017-07-03 18:31:48 +05:30
WSO2 Builder	e1bbc9fe47	[WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare release v3.0.18	2017-07-03 18:31:35 +05:30
Nirothipan	ce741c3993	Security policy updated, allowing to autofill password if users have saved it	2017-07-03 14:15:07 +05:30
WSO2 Builder	7a02ecbe68	[WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare for next development iteration	2017-07-01 12:47:09 +05:30
WSO2 Builder	5b32f7813a	[WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare release v3.0.17	2017-07-01 12:46:54 +05:30
Madhawa Perera	031c648a2e	Merge pull request #816 from dunithd/master ... Checking whether the geo location service has been enabled before reading stats from analytics server	2017-07-01 08:04:39 +05:30
WSO2 Builder	c376208943	[WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare for next development iteration	2017-06-30 17:44:28 +05:30
WSO2 Builder	5c013a3abd	[WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare release v3.0.16	2017-06-30 17:44:14 +05:30
Supun94	8d38f6490c	MQTT Dashboard UI code refactor	2017-06-30 16:31:43 +05:30
Supun94	022e1eefe3	Adding MQTT Dashboard UI page	2017-06-30 15:55:56 +05:30
WSO2 Builder	4396704616	Merge commit 'cc13b1446e3465b67a1bf7aea681102cabb96412' into 5c4b0f95-b6c1-4250-9ab6-e420a526a091	2017-06-30 15:54:00 +05:30
Ayyoob Hamza	83fc26b722	Merge pull request #819 from lasanthaDLPDS/master ... Fixing UI issues in device type API	2017-06-30 15:47:35 +05:30
WSO2 Builder	cc13b1446e	[WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare for next development iteration	2017-06-30 15:46:09 +05:30
WSO2 Builder	08831cb9f4	[WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare release v3.0.15	2017-06-30 15:45:56 +05:30
lasantha	8f225bc623	Fixing minor UI issues	2017-06-30 15:38:06 +05:30
Madhawa Perera	b503b531bd	Merge pull request #818 from rasika/master ... When user removed, all associated devices are removed now	2017-06-30 15:15:10 +05:30
Rasika Perera	186b49395e	Fixing https://github.com/wso2/product-iots/issues/685: When user removed, all associated devices removed	2017-06-30 14:59:24 +05:30
lasantha	d5fac0c569	Removing device type clicking option	2017-06-30 14:36:08 +05:30
Imesh Chandrasiri	eda30cbf3c	adding chevron arrow when clicking op.log	2017-06-30 14:24:25 +05:30
lasantha	70138c3c6e	removing select bar in device types page	2017-06-30 10:49:25 +05:30
dunithd	cffecfaf3a	Removing the warning message and changing the HTTP response status code to 400	2017-06-30 10:45:40 +05:30
dunithd	07c525667c	Removing an unused import	2017-06-29 18:27:04 +05:30
dunithd	0d3701be88	Checking whether the geo location service has been enabled before reading stats from analytics server	2017-06-29 18:25:28 +05:30
Imesh Chandrasiri	131bf2d3b4	Fix for long length device name	2017-06-29 15:22:24 +05:30
WSO2 Builder	6330164676	[WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare for next development iteration	2017-06-29 14:54:03 +05:30
WSO2 Builder	153fb3984e	[WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare release v3.0.14	2017-06-29 14:53:50 +05:30
Imesh Chandrasiri	f35fb92668	Fixes #437 issue where propper validation message is needed	2017-06-29 12:03:36 +05:30
Imesh Chandrasiri	b9cc3c73cd	Fix for github issue #1064	2017-06-29 11:32:36 +05:30
WSO2 Builder	fc41a165a8	[WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare for next development iteration	2017-06-28 19:26:16 +05:30
WSO2 Builder	7acd8e70c4	[WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare release v3.0.13	2017-06-28 19:26:02 +05:30
Geeth	63a7a2bb28	Merge pull request #813 from milanperera/iot-master ... Fixed issue wso2/product-iots#427	2017-06-28 18:35:43 +05:30
Milan Perera	4994fddfd8	Fixed issue wso2/product-iots#427	2017-06-28 18:32:21 +05:30
WSO2 Builder	cb078fbb0f	[WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare for next development iteration	2017-06-28 18:26:18 +05:30
WSO2 Builder	8e874b2ef0	[WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare release v3.0.12	2017-06-28 18:26:05 +05:30
Milan Perera	c605ffbd58	Fixed issue wso2/product-iots#475	2017-06-28 17:56:50 +05:30
WSO2 Builder	c03e1ec1d1	[WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare for next development iteration	2017-06-27 12:15:35 +05:30
WSO2 Builder	997affda65	[WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare release v3.0.11	2017-06-27 12:15:21 +05:30
warunalakshitha	ad9ec1f994	Add multiple push notification support and transport config for features	2017-06-26 11:45:15 +05:30
WSO2 Builder	e23ef52e61	[maven-release-plugin]prepare for next development iteration	2017-06-23 20:27:17 +05:30
WSO2 Builder	c333f28461	[maven-release-plugin]prepare release v3.0.10	2017-06-23 20:27:03 +05:30
Madhawa Perera	25aaf92641	Merge pull request #810 from sinthuja/master ... Updating source/target versions to jdk 1.8.	2017-06-23 18:12:45 +05:30
sinthuja	fce84b9942	Updating source/target versions to jdk 1.8.	2017-06-23 18:00:06 +05:30
Harshan Liyanage	188c80f52a	Merge pull request #808 from hasuniea/master ... Fixing issue wso2/product-iot#527	2017-06-23 17:49:23 +05:30
Hasunie	9206f74790	Fixing issue wso2/product-iot##527	2017-06-23 17:39:42 +05:30
Kamidu Sachith Punchihewa	e556193647	Merge pull request #807 from DimalChandrasiri/master ... Fix for application listing app name clipping issue	2017-06-23 17:30:31 +05:30
WSO2 Builder	27e494f153	[WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare for next development iteration	2017-06-23 17:22:32 +05:30
WSO2 Builder	21ab65e6d5	[WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare release v3.0.9	2017-06-23 17:22:20 +05:30
Imesh Chandrasiri	930dccaa4d	fix for application listing app name clipping issue	2017-06-23 17:09:21 +05:30
Ayyoob Hamza	bd65b1d73b	Merge pull request #806 from rasika/master ... Fixing android geo fencing ui	2017-06-23 16:48:52 +05:30
Rasika Perera	fcf41d6511	Reducing the map height	2017-06-23 16:43:13 +05:30
Rasika Perera	bfbaf00e34	Fixing android geo fencing ui	2017-06-23 16:37:22 +05:30
Rasika Perera	139bc99cc7	Adding error logs when unexpected error from gateway	2017-06-23 16:37:08 +05:30
lasantha	88328b6be3	Adding latest Font WSO2	2017-06-23 14:58:39 +05:30
WSO2 Builder	54d25522ba	[WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare for next development iteration	2017-06-22 20:09:55 +05:30
WSO2 Builder	69b168f3b2	[WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare release v3.0.8	2017-06-22 20:09:41 +05:30
Geeth	63c8e87d98	Merge pull request #803 from ayyoob/devicetype-3.1.0 ... Adding Device type API Implementation	2017-06-22 19:46:33 +05:30
ayyoob	d70cea2e46	fixed commit issues	2017-06-22 19:29:04 +05:30
ayyoob	536d100fd6	fixed comment issues	2017-06-22 17:44:54 +05:30
ayyoob	abacc0ce2a	fixed comment issues	2017-06-22 17:28:37 +05:30
Kamidu Sachith Punchihewa	f868fa2d35	Merge pull request #804 from DimalChandrasiri/master ... Fix for removed device selection in Data Table	2017-06-22 17:13:59 +05:30
Imesh Chandrasiri	cba8f5243e	Fix for removed device selection in datatable	2017-06-22 17:07:59 +05:30
Kamidu Sachith Punchihewa	3c5e65c047	Merge pull request #802 from dunithd/master ... Adding refresh button for the operations log tab	2017-06-22 17:00:22 +05:30
ayyoob	2dab109ad3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-22 16:56:34 +05:30
dunithd	b3642730ad	Adding refresh button for the operations log tab	2017-06-22 16:49:01 +05:30
inoshperera	ae8452adcb	Merge pull request #801 from geethkokila/master ... Fixing the task for all the tenants	2017-06-22 15:56:08 +05:30
geethkokila	1655b512b0	Fixing formating issues	2017-06-22 15:55:22 +05:30
geethkokila	5f71313af1	Fixing formating issues	2017-06-22 15:53:11 +05:30
geethkokila	07357124b0	Fixing the task for all the tenants	2017-06-22 15:45:11 +05:30
Ace	ac01fef7be	Adding import enhancements	2017-06-22 15:34:03 +05:30
Ace	dcbffac198	Adding fixes for https://github.com/wso2/product-iots/issues/997	2017-06-22 15:12:40 +05:30
Hasunie	b2c6bc5453	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-06-22 10:50:51 +05:30
ayyoob	9f4037b7e1	few changes to ui	2017-06-22 06:50:20 +05:30
ayyoob	6c041c7b6a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-22 04:34:45 +05:30
Geeth	a47d2a6672	Merge pull request #797 from sinthuja/master ... Fixing issues in IoT core with MSSQL.	2017-06-21 23:02:46 +05:30
Kamidu Sachith Punchihewa	a895c1f4dd	Merge pull request #795 from janakamarasena/high-priority-fixes-2 ... Added bottom margin to 'Show All Notifications' button	2017-06-21 19:34:50 +05:30
kamidu	525c0958d9	fixing the password reset issue	2017-06-21 18:53:56 +05:30
Janak Amarasena	db98663c78	Added bottom margin to Show All Notifications button	2017-06-21 18:04:11 +05:30
sinthuja	ee8f29503d	Merge branch 'wso2-master'	2017-06-21 16:31:06 +05:30
sinthuja	8197547383	Fixing MSSQL related issues, and dbscript issues.	2017-06-21 16:30:19 +05:30
Geeth	d6fcdf500b	Merge pull request #794 from milanperera/iot-master ... Changing error logs to debug	2017-06-21 14:31:31 +05:30
Milan Perera	cda5a0b216	Changing error logs to debug	2017-06-21 13:10:24 +05:30
Imesh Chandrasiri	66d9ea4bde	Merge branch 'master' of https://github.com/DimalChandrasiri/carbon-device-mgt	2017-06-21 12:36:46 +05:30
Rasika Perera	fc4576082c	Changing artifact uploader admin service resource path	2017-06-21 10:57:50 +05:30
ayyoob	80cc690a42	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-21 04:11:40 +05:30
WSO2 Builder	68cb8d3f81	[WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare for next development iteration	2017-06-20 22:37:58 +05:30
WSO2 Builder	d0f52c48ef	[WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare release v3.0.7	2017-06-20 22:37:45 +05:30
Geeth	3deffa99dd	Merge pull request #790 from dunithd/master ... Adding an API method to retrieve an activity by it's ID and a device ID	2017-06-20 22:27:42 +05:30
Imesh Chandrasiri	1546411814	Fixed Multiple ajax calls when filtering	2017-06-20 20:25:57 +05:30
dunithd	d0058b982c	Adding new UX styles CSS	2017-06-20 19:40:58 +05:30
dunithd	c832f1b5a9	Applying new UX design for device details default unit	2017-06-20 19:39:52 +05:30
ayyoob	3224f3a50c	few changes in dbscript	2017-06-20 19:33:24 +05:30
Megala Uthayakumar	7431ed4997	Merge pull request #791 from sinthuja/master ... Fixing mssql related issue.	2017-06-20 19:03:44 +05:30
sinthuja	4bfd35cc74	Fixing issue in mssql database issue in processor.	2017-06-20 18:54:36 +05:30
sinthuja	5570349cd1	Reverting back the other databases to use the arrays.	2017-06-20 18:05:39 +05:30
WSO2 Builder	2896b55f5e	[WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare for next development iteration	2017-06-20 18:03:42 +05:30
WSO2 Builder	bdb57383b1	[WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare release v3.0.6	2017-06-20 18:03:28 +05:30
dunithd	4cf3e2d421	Adding an API method to retrieve an activity by it's ID and a device ID	2017-06-20 17:44:22 +05:30
Geeth	c7a8f83f54	Merge pull request #789 from harshanL/master ... Updated title bar app name to IoT Server.	2017-06-20 17:37:56 +05:30
Harshan Liyanage	eebbcbb6fa	Merge pull request #782 from janakamarasena/high-priority-fixes ... UI fixes	2017-06-20 17:04:03 +05:30
sinthuja	f59202c0c3	Reverting back to the debug logs.	2017-06-20 13:46:39 +05:30
sinthuja	ade596d3c4	Merging the AS clause removal queries with generic DAO from oracle.	2017-06-20 13:17:03 +05:30
sinthuja	9398e7ee0b	Merge branch 'wso2-master' ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationMappingDAOImpl.java	2017-06-19 23:10:15 +05:30
sinthuja	124c0b4cf8	Fixing issues related to oracle database.	2017-06-19 23:05:05 +05:30
Hasunie	19495321d2	removing unnecessary lines	2017-06-19 19:23:01 +05:30
Hasunie	3333ed0381	Fixing permission issue which resolves wso2/product-iots#430	2017-06-19 19:18:34 +05:30
Harshan Liyanage	50e82eb80d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-06-19 17:34:45 +05:30
Harshan Liyanage	fecc5e1b72	Changed devicemgt app name to IoT Server.	2017-06-19 17:33:43 +05:30
WSO2 Builder	8badc2bc37	[WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare for next development iteration	2017-06-19 17:23:13 +05:30
WSO2 Builder	43182aede9	[WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare release v3.0.5	2017-06-19 17:22:58 +05:30
Harshan Liyanage	b8f085da20	Added null checks for device cache in-case cache is disabled.	2017-06-19 16:58:42 +05:30
WSO2 Builder	f70535ed20	[WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare for next development iteration	2017-06-19 16:22:55 +05:30
WSO2 Builder	c3d154ee65	[WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare release v3.0.4	2017-06-19 16:22:42 +05:30
Harshan Liyanage	a21c374b00	Code refactoring.	2017-06-19 12:52:31 +05:30
Harshan Liyanage	074ceeb0c7	Merged with master	2017-06-19 12:46:22 +05:30
Harshan Liyanage	967efa1fee	Fixed user enrolled device showing problem which resolves wso2/product-iots#406	2017-06-19 12:41:22 +05:30
inoshperera	88054f9075	removing non-compliance action.	2017-06-19 12:04:59 +05:30
geethkokila	0eca5a0152	Fixing the build failure	2017-06-19 11:44:47 +05:30
ayyoob	6dffac4191	fixes in ui	2017-06-18 16:41:38 +05:30
ayyoob	3b7d4d8966	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-17 19:17:42 +05:30
ayyoob	ca33f035df	merge ui fixes	2017-06-17 18:52:25 +05:30
Ayyoob Hamza	2875fb2ca0	Merge pull request #755 from rasika/geo-fencing ... Added Geo Service into Device Mgt Core	2017-06-17 12:20:10 +05:30
WSO2 Builder	e924a86d73	[WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare for next development iteration	2017-06-16 17:40:41 +05:30
WSO2 Builder	b35aaab992	[WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare release v3.0.3	2017-06-16 17:40:27 +05:30
Janak Amarasena	3f17e66e8c	UI fixes	2017-06-16 16:51:49 +05:30
Harshan Liyanage	d8b756df3d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-06-16 16:48:30 +05:30
Harshan Liyanage	8b9420766f	Fixed SQL syntax issue in DeviceStatusMonitoring Task when running on PostgreSQL.	2017-06-16 16:47:34 +05:30
Harshan Liyanage	51c18d2108	Added pagination support for group-management for major db engines.	2017-06-16 16:46:30 +05:30
Rasika Perera	8da1f62cd9	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-06-16 15:50:45 +05:30
Madawa Soysa	98e8dfea68	Merge pull request #781 from inoshperera/master ... fixing the agent unable to enroll issue	2017-06-16 15:29:22 +05:30
inoshperera	58b2bf8b3c	fixing the agent unable to enroll issue	2017-06-16 15:23:41 +05:30
Rasika Perera	a5c18b3c26	Geo Fencing UI fixes	2017-06-16 14:42:05 +05:30
madhawap	a115cff4db	reformatting code	2017-06-16 13:16:29 +05:30
Rasika Perera	d3f24bb8ba	Making alert danger into alert info in stationary alerts	2017-06-16 12:48:03 +05:30
Rasika Perera	c8d41c7b3e	Few more improvements into geo-dashboard	2017-06-16 12:45:29 +05:30
Rasika Perera	3fd2c6b705	Adding deploy geo analytics button into platform configuration	2017-06-16 12:30:24 +05:30
sinthuja	1c13269fc8	Fixing https://github.com/wso2/product-iots/issues/495.	2017-06-16 11:50:54 +05:30
WSO2 Builder	2b76317f40	[WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare for next development iteration	2017-06-16 11:00:40 +05:30
WSO2 Builder	02bc10e6d2	[WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare release v3.0.2	2017-06-16 11:00:26 +05:30
Supun94	df06953069	Adding MQTT pagination details	2017-06-16 10:50:47 +05:30
Supun94	8ca85f1177	Adding UI permissions for topics view	2017-06-16 10:50:47 +05:30
Rasika Perera	d0a1132060	Improving geo fence ui	2017-06-16 10:10:57 +05:30
ayyoob	f47d0deb1a	few changes after testing.	2017-06-16 03:48:08 +05:30
WSO2 Builder	1e58f762da	[WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare for next development iteration	2017-06-15 16:23:05 +05:30
WSO2 Builder	bae931f3c5	[WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare release v3.0.1	2017-06-15 16:22:51 +05:30
Ruwan	5d4c85b61e	Merge pull request #778 from harshanL/master ... Code refactored.	2017-06-15 15:20:37 +05:30
Harshan Liyanage	de9beb1f5b	Code refatcored.	2017-06-15 14:49:40 +05:30
Ruwan	477608613e	Merge pull request #776 from rasika/master ... Fixing https://github.com/wso2/product-iots/issues/431	2017-06-15 11:31:19 +05:30
Rasika Perera	61c4db07a3	Fixing https://github.com/wso2/product-iots/issues/431	2017-06-15 11:27:37 +05:30
ayyoob	0d08c42f5e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-15 09:48:00 +05:30
WSO2 Builder	69d2cff7bd	[WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare for next development iteration	2017-06-14 18:08:46 +05:30
WSO2 Builder	3795011895	[WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare release v3.0.0	2017-06-14 18:08:31 +05:30
Harshan Liyanage	9e24338660	Added javadoc comments.	2017-06-14 14:55:25 +05:30
ayyoob	07bdd5cb6c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-14 13:19:07 +05:30
ayyoob	da68f8fac1	fixed on config operation flow	2017-06-14 12:38:56 +05:30
Chatura Dilan	38b7689e28	Merge pull request #773 from harshanL/master ... Fixed java-doc comments issues and added comments to the configs.	2017-06-14 12:35:39 +05:30
Harshan Liyanage	b510a422b4	Fixed java-doc comments issues and added comments to the configs.	2017-06-14 12:28:16 +05:30
Geeth	115ccb739a	Merge pull request #765 from harshanL/master ... Added comments to the device status configs.	2017-06-14 11:42:21 +05:30
Rasika Perera	798e551673	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-06-14 10:43:19 +05:30
Rasika Perera	68d9b2d310	Adding focus on geo map	2017-06-14 07:48:57 +05:30
Rasika Perera	10c8bf7f42	Capilizing notification title	2017-06-14 07:47:01 +05:30
WSO2 Builder	16420433b5	[WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare for next development iteration	2017-06-13 17:26:56 +05:30
WSO2 Builder	5c06b9dcb2	[WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare release v2.0.75	2017-06-13 17:26:42 +05:30
Harshan Liyanage	43ba1e1b43	Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005	2017-06-13 17:08:26 +05:30
Vishanth	7da1067d68	fixing sql queries to compare owner in lowercase	2017-06-13 17:08:01 +05:30
Rasika Perera	4796f5934f	Fixed geo alerts notifications	2017-06-13 00:44:20 +05:30
Rasika Perera	73ab6f28c1	Fixed sidebar notifications	2017-06-13 00:40:10 +05:30
Rasika Perera	6470e8e3d2	Fixed sidebar notifications	2017-06-13 00:39:58 +05:30
Rasika Perera	c970167299	UI fixes for geo fencing	2017-06-12 22:43:36 +05:30
Rasika Perera	ce6ab9b354	Refactoring "executionPlanType" -> "alertType"	2017-06-12 22:43:14 +05:30
Rasika Perera	e1c5c72b1b	Adding geo fence exit alerts ui	2017-06-12 15:40:38 +05:30
Rasika Perera	6d02075a99	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-06-12 15:11:14 +05:30
ayyoob	22a4716443	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-12 11:35:43 +05:30
ayyoob	c93410eb92	added few changes after review	2017-06-12 11:35:33 +05:30
WSO2 Builder	8927158086	[WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare for next development iteration	2017-06-09 12:57:29 +05:30
WSO2 Builder	28423c45bc	[WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare release v2.0.74	2017-06-09 12:57:15 +05:30
ayyoob	6c7f911cbc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js	2017-06-08 14:39:51 +05:30
ayyoob	7ab52af66e	add http pushnotification	2017-06-08 14:24:33 +05:30
Harshan Liyanage	a30982207b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-06-07 16:29:15 +05:30
Harshan Liyanage	3766ba0349	Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991	2017-06-07 16:29:05 +05:30
WSO2 Builder	e3dfbdfdbd	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30
WSO2 Builder	598332b640	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare release v2.0.73	2017-06-07 13:44:15 +05:30
inoshperera	9f9208cebc	adding default values for timestamp	2017-06-07 09:25:16 +05:30
Rasika Perera	05b11a5099	Adding Exit Alerts feature	2017-06-06 14:55:04 +05:30
Rasika Perera	4f447305c9	Fixing minor issue in viewing geo fence	2017-06-06 14:50:52 +05:30
WSO2 Builder	73fa026eeb	[WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare for next development iteration	2017-06-06 12:33:06 +05:30
WSO2 Builder	2415762ccb	[WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare release v2.0.72	2017-06-06 12:32:53 +05:30
ayyoob	f3393080ba	fixed few issues after testing	2017-06-06 11:00:59 +05:30
GDLMadushanka	36bd1c5daf	Refactoring	2017-06-06 09:44:30 +05:30
Rasika Perera	8548e911aa	Added an error message when gpl siddhi extension is not configured	2017-06-06 06:18:27 +05:30
Rasika Perera	c7a751b1ef	Fixing location map height	2017-06-06 05:37:30 +05:30
Thomson Ignesious	0621579d25	case sensitiv ... stmt = conn.prepareStatement(sql, new String[]{"ID"}) this line makes case sensitive issues, an exception saying 'ID' does not exist while using the postgreSQL.	2017-06-05 18:25:15 +05:30
Rasika Perera	ec343cef1a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-06-05 10:26:10 +05:30
Rasika Perera	dfb0e154c6	Added cdmf core dependency	2017-06-05 10:21:19 +05:30
Rasika Perera	6a2785cc8d	Multitenancy added to event publisher	2017-06-05 10:18:31 +05:30
Rasika Perera	fb368caae4	Removed unused gson initization	2017-06-05 10:16:03 +05:30
Rasika Perera	9865a260d4	Publishing location operation response into iot location event stream	2017-06-05 10:12:22 +05:30
Rasika Perera	886eaec271	Geo service alerts history method added	2017-06-05 10:11:14 +05:30
Rasika Perera	2733197edc	PublishLocationOperationResponse config element added to cdm-config.xml	2017-06-05 10:10:29 +05:30
Rasika Perera	76f4457462	Changes to geo dashboard ui in /devicemgt	2017-06-05 10:08:34 +05:30
GDLMadushanka	85d07dc9cb	Redirecting to respective analytics pages depending on the device type	2017-06-05 09:35:46 +05:30
ayyoob	194e4d99b5	added policy compliance support	2017-06-05 00:12:59 +05:30
ayyoob	5b46dc03a5	few fixes on event reciever definition	2017-06-04 18:18:06 +05:30
ayyoob	7cba43ccbb	few changes after testing HTTP and MQTT flow	2017-06-04 06:52:29 +05:30
ayyoob	a7ebc96cb7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-03 18:06:32 +05:30
ayyoob	a1b20f1663	changed response payload definition for pull notification	2017-06-03 13:27:08 +05:30
WSO2 Builder	39a7037821	[WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare for next development iteration	2017-06-02 16:44:55 +05:30
WSO2 Builder	22782ec125	[WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare release v2.0.71	2017-06-02 16:44:41 +05:30
Harshan Liyanage	9871122c0a	Code refactoring of device-status-task which Resolves harshanl/product-iots#518	2017-06-02 15:36:56 +05:30
Harshan Liyanage	52bbdfcd78	Code refactoring of device-status-task which Resolves harshanl/product-iots#518	2017-06-02 15:23:51 +05:30
Harshan Liyanage	fda9410a2a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-06-02 15:07:48 +05:30
Harshan Liyanage	d3cb7ba70b	Changed the device-status-task to use optimized queries which Resolves harshanl/product-iots#518	2017-06-02 15:07:39 +05:30
ayyoob	c46cbfafe5	Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt into devicetype-3.1.0	2017-06-01 17:23:42 +05:30
ayyoob	04b8b74e4f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-01 17:22:33 +05:30
ayyoob	a0d7518cbe	Implemented Pull Notification Support	2017-06-01 17:19:25 +05:30
WSO2 Builder	c7fd70145d	[WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare for next development iteration	2017-06-01 08:58:27 +05:30
WSO2 Builder	0c9d104401	[WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare release v2.0.70	2017-06-01 08:58:13 +05:30
Rasika Perera	aa0f9e0510	Merge pull request #744 from ayyoob/new-master ... auto healing in case of app deletion and added device scope to handle to handle multiple session	2017-06-01 05:29:27 +05:30
Rasika Perera	5cb0f9bb94	Fixes to geo-fencing ui	2017-06-01 05:00:00 +05:30
Rasika Perera	ddfecba1a6	Added geo fencing unit	2017-05-31 10:58:51 +05:30
Malintha Fernando	07f2cb608b	Fix : Store device type names as it is	2017-05-31 10:16:24 +05:30
Harshan Liyanage	4ec139608e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-05-30 17:00:52 +05:30
Harshan Liyanage	35d1c9897e	Resolves harshanl/product-iots#518	2017-05-30 17:00:23 +05:30
Rasika Perera	0a8929c7ee	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-05-30 16:35:36 +05:30
WSO2 Builder	69a63baa43	[WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare for next development iteration	2017-05-30 11:24:51 +05:30
WSO2 Builder	713b948ea9	[WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare release v2.0.69	2017-05-30 11:24:37 +05:30
madhawap	c4d433a1a0	Fix for disabling reboot and upgrade-firmware operations on UI and Code formatting ... In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled. In addition change a c-style for loop to a foreach loop in PolicyManagementServiceImpl.java	2017-05-29 20:13:51 +05:30
Rasika Perera	f864506f62	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-05-29 13:09:21 +05:30
Rasika Perera	7b0295ff01	Added geo-fencing to the devicemgt app	2017-05-29 12:58:06 +05:30
Rasika Perera	ea3ed9c444	Added Geo Service into Device Mgt Core	2017-05-29 11:51:41 +05:30
ayyoob	f03155a702	fixed missing import package issue	2017-05-29 11:36:09 +05:30
ayyoob	dbdaa5a0e0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-05-29 05:44:36 +05:30
ayyoob	c3f23fa564	fixed multi tenant issues after testing custom device type impl	2017-05-29 01:00:16 +05:30
Amal Gunatilake	2ac5a56ad0	Merge pull request #749 from madawas/master ... Fixing wso2/product-iots##467	2017-05-26 15:25:25 +05:30
warunalakshitha	1a26595472	Fix issue with using enrollment id for device id	2017-05-26 14:54:04 +05:30
ayyoob	56faa75861	fixed analytics issues	2017-05-25 03:07:19 +05:30
ayyoob	75d6813d8a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-05-24 00:43:02 +05:30
ayyoob	5acf5912e4	added comment	2017-05-24 00:41:21 +05:30
ayyoob	a037f91f56	removed task Config from template	2017-05-24 00:27:13 +05:30
ayyoob	4d22bc7064	fixed UI Issues	2017-05-24 00:26:02 +05:30
WSO2 Builder	7e83b53bb4	[WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare for next development iteration	2017-05-22 15:33:56 +05:30
WSO2 Builder	768073ea51	[WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare release v2.0.68	2017-05-22 15:33:42 +05:30
Amal Gunatilake	3f7543bee8	Merge pull request #742 from milanperera/iot-master ... Removed unnecessary interace methods from Device Manager	2017-05-22 15:27:41 +05:30
ayyoob	dd1c2e4338	Added few fixes after testing and added default UI for device type management	2017-05-22 02:51:35 +05:30
ayyoob	6004ee7264	Adding back the sample definition file	2017-05-19 02:06:08 +05:30
ayyoob	f945da194d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-05-19 01:56:40 +05:30
ayyoob	abc9315f95	Added Pluggable Device Type	2017-05-19 01:49:10 +05:30
ayyoob	ed366867d1	Added Pluggable Device Type	2017-05-19 01:48:54 +05:30
WSO2 Builder	88bab85750	[WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare for next development iteration	2017-05-18 17:33:39 +05:30
WSO2 Builder	4e506a547e	[WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare release v2.0.67	2017-05-18 17:33:25 +05:30
Megala Uthayakumar	47bdbc7c14	Merge pull request #751 from sinthuja/master ... adding the if condition for only newRoles list iteration.	2017-05-18 16:03:06 +05:30
sinthuja	3340d94acf	adding the if condition for only newRoles list iteration.	2017-05-18 16:00:25 +05:30
megala21	f41a692bf3	Reformatting code	2017-05-18 14:21:24 +05:30
megala21	25e0b989d2	Fixing issues in group sharing	2017-05-18 14:17:03 +05:30
Madawa Soysa	20999f4cd5	Fixing wso2/product-iots##467	2017-05-18 10:54:54 +05:30
WSO2 Builder	3092423d4d	[WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare for next development iteration	2017-05-17 19:11:50 +05:30
WSO2 Builder	e21520392c	[WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare release v2.0.66	2017-05-17 19:11:36 +05:30
Megala Uthayakumar	39439c5c50	Merge pull request #748 from sinthuja/master ... Fixing issues in editing policy	2017-05-17 18:38:31 +05:30
sinthuja	e7490dd278	Fixing https://github.com/wso2/product-iots/issues/443.	2017-05-17 17:24:37 +05:30
Megala Uthayakumar	8830d627e9	Merge pull request #747 from sinthuja/master ... Fixing some issues reported for product-iots.	2017-05-17 16:18:32 +05:30
sinthuja	9c110bb59c	Fixing https://github.com/wso2/product-iots/issues/444.	2017-05-16 18:41:07 +05:30
WSO2 Builder	d4baa72328	[WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare for next development iteration	2017-05-16 18:34:27 +05:30
WSO2 Builder	7b549f623d	[WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare release v2.0.65	2017-05-16 18:34:13 +05:30
sinthuja	4df590caa1	Fixing https://github.com/wso2/product-iots/issues/447.	2017-05-16 18:17:45 +05:30
ayyoob	fbb5f5ae88	merged with origin	2017-05-15 18:15:24 +05:30
ayyoob	42cb383804	auto healing in case of app deletion and added device scope to handle multiple session with same user	2017-05-11 21:21:53 +05:30
WSO2 Builder	84d305dcd4	[WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare for next development iteration	2017-05-11 09:15:49 +05:30
WSO2 Builder	3bf945fe95	[WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare release v2.0.64	2017-05-11 09:15:33 +05:30
ayyoob	d2d7be6fd6	fixed tenant related issue for mqtt push notification and stream artifact publishing	2017-05-10 13:50:06 +05:30
ayyoob	1c3a89f57c	fixed issues raised through comments - commits	2017-05-10 13:49:20 +05:30
ayyoob	035403495c	made default stat permission as constant	2017-05-09 16:45:47 +05:30
ayyoob	cb9db4dd1d	fixed null pointer in the initial operations	2017-05-09 16:16:14 +05:30
ayyoob	483d09ebf1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into new-master	2017-05-09 16:13:35 +05:30
Milan Perera	64d656b5e7	Removed unnecessary interace methods from Device Manager	2017-05-09 15:09:21 +05:30
WSO2 Builder	f7300645a5	[WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare for next development iteration	2017-05-09 15:05:26 +05:30
WSO2 Builder	ca83609703	[WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare release v2.0.63	2017-05-09 15:05:11 +05:30
Milan Perera	53f2c555c4	Added method to test device manager	2017-05-09 14:44:01 +05:30
Milan Perera	17ecadb913	Added a feature to pick default platform configurations	2017-05-09 11:52:21 +05:30
ayyoob	b36ff4b874	added a authorisation resource for stat	2017-05-09 00:54:49 +05:30
ayyoob	77ceed5368	renamed device type publisher service to DeviceAnalyticsArtifactUploaderAdminService	2017-05-09 00:54:01 +05:30
WSO2 Builder	964eae6f92	[WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare for next development iteration	2017-05-08 17:42:41 +05:30
WSO2 Builder	31f91f80b9	[WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare release v2.0.62	2017-05-08 17:42:28 +05:30
megala21	f14e2c2d6a	Removing cloud_type from config.json	2017-05-08 15:19:51 +05:30
megala21	8d0efd3289	Adding request new device type button for cloud	2017-05-08 13:58:59 +05:30
WSO2 Builder	639eeb225a	[WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare for next development iteration	2017-05-05 11:41:19 +05:30
WSO2 Builder	7d3025a25b	[WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare release v2.0.61	2017-05-05 11:41:03 +05:30
Amal Gunatilake	a4072615af	Merge pull request #733 from rasika/improvement_getuser ... Fixing typo and getCarbonUser() replaced with context.user	2017-05-05 11:26:01 +05:30
Amal Gunatilake	d898a7dc8e	Merge pull request #732 from rasika/git_issue_731 ... Hide IoT Server version when isCloud is TRUE	2017-05-05 11:25:55 +05:30
ayyoob	cedb6cb798	fixed device stats loading page issue	2017-05-05 03:02:35 +05:30
WSO2 Builder	a546355cf3	[WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare for next development iteration	2017-05-04 15:42:27 +05:30
WSO2 Builder	eb6b1db3fe	[WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare release v2.0.60	2017-05-04 15:42:14 +05:30
Madawa Soysa	c4d0ca7134	Merge pull request #734 from madhawap/master ... Removed commented lines	2017-05-04 15:36:00 +05:30
madhawap	c4ba14376e	Removed commented lines	2017-05-04 15:32:25 +05:30
Rasika Perera	776bafcd73	Fixing typo and getCarbonUser() replaced with context.user	2017-05-03 23:22:25 +05:30
Rasika Perera	d247b07b4a	#731 : Hide IoT Server version when isCloud is TRUE	2017-05-03 23:04:55 +05:30
WSO2 Builder	4797fc9600	[WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare for next development iteration	2017-05-03 20:29:05 +05:30
WSO2 Builder	896bc24f21	[WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare release v2.0.59	2017-05-03 20:28:51 +05:30
Rasika Perera	5dc9259fc0	Merge pull request #728 from rasika/git_issue_726 ... Resolving cannot log into devicemgt app when tenant is not loaded in API Manager	2017-05-03 20:23:07 +05:30
Rasika Perera	2831bfaf2c	#726 : Resolving cannot log into devicemgt app when tenant is not loaded in API Manager	2017-05-03 19:59:17 +05:30
WSO2 Builder	98991fe89b	[WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare for next development iteration	2017-05-03 15:28:16 +05:30
WSO2 Builder	8b31b93181	[WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare release v2.0.58	2017-05-03 15:28:02 +05:30
WSO2 Builder	6fddf9c8d0	[WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare for next development iteration	2017-05-03 08:28:19 +05:30
WSO2 Builder	2f4051019c	[WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare release v2.0.57	2017-05-03 08:28:05 +05:30
Ace	b54bf3000f	Adding fix for status 500 in device listing page	2017-05-03 07:13:06 +05:30
WSO2 Builder	80bf3c8fbd	[WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare for next development iteration	2017-05-02 18:01:00 +05:30
WSO2 Builder	2a7173c66d	[WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare release v2.0.56	2017-05-02 18:00:46 +05:30
WSO2 Builder	95a80301e9	[WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare for next development iteration	2017-05-02 17:15:09 +05:30
WSO2 Builder	236db75700	[WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare release v2.0.55	2017-05-02 17:14:54 +05:30
Geeth	6798dea68a	Merge pull request #725 from warunalakshitha/master ... Add Scheduler Task for Sending Push Notification	2017-05-02 17:04:03 +05:30
WSO2 Builder	43e76e4678	[WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare for next development iteration	2017-05-02 09:37:33 +05:30
WSO2 Builder	34865f0d25	[WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare release v2.0.54	2017-05-02 09:37:16 +05:30
warunalakshitha	e1e2b14b5f	Rename push status to push notification status and add configurable initial delay for scheduler task	2017-05-01 20:44:30 +05:30
lasantha	43f2f15c5f	#395: Resolved current device owner incorrectly selecting and processing issue when the same device is enrolled to multiple users	2017-05-01 15:48:25 +05:30
warunalakshitha	3938064210	Add opeerations mapping map for tenants and fixes for code review	2017-04-30 14:29:30 +05:30
warunalakshitha	8df87b23bc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-04-30 13:56:12 +05:30
warunalakshitha	a5759f9818	Add tenant based operation mappings	2017-04-30 13:56:06 +05:30
WSO2 Builder	3a9986d054	[WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare for next development iteration	2017-04-28 10:29:44 +05:30
WSO2 Builder	b53610ff8b	[WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare release v2.0.53	2017-04-28 10:29:35 +05:30
Harshan Liyanage	7744ee2aea	Merge pull request #716 from rasika/analytics-url ... Enabling Statics URL	2017-04-27 12:44:55 +05:30
Harshan Liyanage	b9691988a9	Merge pull request #710 from rasika/master ... Fixing Policy view and policy edit doesn't honor isCloud param	2017-04-27 12:44:16 +05:30
warunalakshitha	003c9c5907	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-04-27 12:23:17 +05:30
warunalakshitha	76f8d963f7	Improve push notifications for request with device list less than batch size	2017-04-27 12:23:01 +05:30
WSO2 Builder	726422dc81	[WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare for next development iteration	2017-04-26 21:31:21 +05:30
WSO2 Builder	4bf6bf73cc	[WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare release v2.0.52	2017-04-26 21:31:08 +05:30
WSO2 Builder	4429482a29	[WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare for next development iteration	2017-04-26 15:26:48 +05:30
WSO2 Builder	1bbd982e1f	[WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare release v2.0.51	2017-04-26 15:26:35 +05:30
ayyoob	a3910908f8	fixed an issue in the logging	2017-04-26 14:48:20 +05:30
ayyoob	018d875a84	removed temporary logs ... (cherry picked from commit 615e44e)	2017-04-26 14:26:23 +05:30
kamidu	845a8cb8f7	enable statics url	2017-04-26 12:34:21 +05:30
WSO2 Builder	52b0165275	[WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare for next development iteration	2017-04-26 11:16:14 +05:30
WSO2 Builder	ada2669ecf	[WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare release v2.0.50	2017-04-26 11:15:58 +05:30
ayyoob	1e2ca17275	fixed few issues after testing ... (cherry picked from commit 5b6d8d3)	2017-04-26 10:19:55 +05:30
warunalakshitha	97a53a7387	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-04-25 19:08:36 +05:30
warunalakshitha	9fa4eedca5	Add Scheduled for push notification sending	2017-04-25 19:07:37 +05:30
warunalakshitha	3c1e4ba205	Add new classes for improve Performance of push notifications	2017-04-25 18:55:31 +05:30
Rasika Perera	636f0cbe98	#706 : Policy view and policy edit doesn't honor isCloud enabled parameter	2017-04-25 14:46:22 +05:30
WSO2 Builder	543e603298	[WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare for next development iteration	2017-04-25 10:14:34 +05:30
WSO2 Builder	5010a3eebf	[WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare release v2.0.49	2017-04-25 10:14:21 +05:30
WSO2 Builder	eb8ba53092	[WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare for next development iteration	2017-04-25 08:58:47 +05:30
WSO2 Builder	4764bff47e	[WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare release v2.0.48	2017-04-25 08:58:32 +05:30
Rasika Perera	a107a0392e	Fixing #703 : missing ContentType header on datatable invoker api	2017-04-25 08:27:41 +05:30
Rasika Perera	7660bf8569	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-04-25 08:26:51 +05:30
ayyoob	3df2912a6a	added default UI for realtime,batch, device view and type view	2017-04-24 02:51:03 +05:30
ayyoob	2a89a2fb23	resolved issues in event management service	2017-04-22 18:31:13 +05:30
ayyoob	f834001d22	merged with origin	2017-04-22 01:24:24 +05:30
ayyoob	4ce8352690	added device event api	2017-04-22 00:15:58 +05:30
WSO2 Builder	c1b5a649f6	[WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare for next development iteration	2017-04-21 16:06:53 +05:30
WSO2 Builder	6ccccb67b4	[WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare release v2.0.47	2017-04-21 16:06:39 +05:30
Harshan Liyanage	0dc15324ad	Merge pull request #701 from amalhub/master ... Merging Cloud updates to master	2017-04-21 15:59:00 +05:30
Jasintha	e6b38fbdb4	Implemeting dynamic recivers and streams deployment into DAS	2017-04-21 15:51:24 +05:30
kamidu	a9888b5cf7	adding device cloud header	2017-04-21 15:43:39 +05:30
WSO2 Builder	1ecb4edbd7	[WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare for next development iteration	2017-04-21 15:31:09 +05:30
WSO2 Builder	48a8f43cb3	[WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare release v2.0.46	2017-04-21 15:30:57 +05:30
megala21	32ea2e52c4	Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370	2017-04-21 15:18:20 +05:30
ayyoob	586bcae2b8	added default UI - initial commit	2017-04-20 17:55:23 +05:30
WSO2 Builder	16d97d62be	[WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare for next development iteration	2017-04-20 14:41:55 +05:30
WSO2 Builder	8891784b99	[WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare release v2.0.45	2017-04-20 14:41:41 +05:30
sinthuja	97ff0750ee	Merge pull request #694 from amalhub/master ... Fixing security issue: Password Autocomplete in Firefox Browser	2017-04-20 14:35:48 +05:30
Amal Gunatilake	56cb6a3a1e	Fixing security issue: Password Autocomplete in Firefox Browser ... https://github.com/wso2/product-iots/issues/372	2017-04-20 14:31:20 +05:30
ayyoob	0e9bb7caf6	corrected operation definition	2017-04-19 16:34:18 +05:30
ayyoob	c28f820455	added missing apis - operation and device management	2017-04-19 16:32:06 +05:30
WSO2 Builder	f7d1a7cf99	[WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare for next development iteration	2017-04-18 10:40:31 +05:30
WSO2 Builder	4b85af950c	[WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare release v2.0.44	2017-04-18 10:40:22 +05:30
WSO2 Builder	b9e614e383	[WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration	2017-04-17 16:39:50 +05:30
WSO2 Builder	d37951ef3f	[WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare release v2.0.43	2017-04-17 16:39:37 +05:30
megala21	2360b338d8	Fixing the role creation problem	2017-04-17 13:14:14 +05:30
Rasika Perera	1a4f195a74	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-04-10 09:16:57 +05:30
WSO2 Builder	fc15f43b31	[WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare for next development iteration	2017-04-07 14:07:15 +05:30
WSO2 Builder	27b84bfc22	[WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare release v2.0.42	2017-04-07 14:07:01 +05:30
kamidu	8bc7362bc0	disableing advanced search	2017-04-07 13:47:22 +05:30
kamidu	a5a222ead6	fixing device status	2017-04-07 13:47:12 +05:30
kamidu	06366bff24	css changes for loading icon	2017-04-07 13:46:09 +05:30
kamidu	2c20070720	fixing icon issue in operation bar	2017-04-07 13:45:12 +05:30
kamidu	16b67bebda	hiding the advanced search	2017-04-07 13:44:57 +05:30
kamidu	9826a97d60	removing cope policies from cloud	2017-04-07 13:44:41 +05:30
kamidu	4cb816cb7f	policy filtering or cloud	2017-04-07 13:44:05 +05:30
kamidu	57787a29c4	adding the new toplink json	2017-04-07 13:43:19 +05:30
WSO2 Builder	5496159f9d	[WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare for next development iteration	2017-04-05 11:58:36 +05:30
WSO2 Builder	ef94e90366	[WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare release v2.0.41	2017-04-05 11:58:23 +05:30
megala21	2b92676191	Fixes https://github.com/wso2/product-iots/issues/346	2017-04-05 11:02:58 +05:30
WSO2 Builder	a826370019	[WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare for next development iteration	2017-04-05 09:37:06 +05:30
WSO2 Builder	4654a4db45	[WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare release v2.0.40	2017-04-05 09:36:53 +05:30
Amal Gunatilake	980a90900d	Merge pull request #679 from Megala21/fix_group_share_ui ... Fixes https://github.com/wso2/product-iots/issues/335	2017-04-05 09:21:45 +05:30
WSO2 Builder	8b7e458592	[WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration	2017-04-04 18:08:44 +05:30
WSO2 Builder	6297993560	[WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39	2017-04-04 18:08:31 +05:30
lakshani	0f1b17a25e	Fixed the issue in application restriction for iOS	2017-04-04 18:00:24 +05:30
megala21	5cd58d7454	Fixes https://github.com/wso2/product-iots/issues/335	2017-04-04 14:18:24 +05:30
WSO2 Builder	802c83de39	[WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration	2017-03-29 23:16:15 +05:30
WSO2 Builder	98dda03784	[WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38	2017-03-29 23:16:04 +05:30
WSO2 Builder	f3e119cd78	[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration	2017-03-28 12:48:31 +05:30
WSO2 Builder	a8f8a49a80	[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37	2017-03-28 12:48:20 +05:30
Harshan Liyanage	9e4d84dfb2	Fix for Advanced Search Issue #670	2017-03-28 12:37:28 +05:30
Rasika Perera	6a623f5657	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-03-27 10:03:15 +05:30
lakshani	5c7cfda487	Fixed jira IOTS-438	2017-03-24 15:42:54 +05:30
WSO2 Builder	0e5895ec78	[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration	2017-03-24 12:06:23 +05:30
WSO2 Builder	d6080159cb	[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36	2017-03-24 12:06:12 +05:30
Amal Gunatilake	e9c2f3e72d	Merge branch 'master' into cloud-3.1.0	2017-03-24 11:55:35 +05:30
WSO2 Builder	3f8f8b3ab9	[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration	2017-03-23 18:59:18 +05:30
WSO2 Builder	6a9a5ba9c8	[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35	2017-03-23 18:59:07 +05:30
amalhub	c65f9c6dcb	Fixing issue: https://github.com/wso2/product-iots/issues/314	2017-03-23 15:51:46 +05:30
kamidu	3b9ae200e7	fixing posible null pointer excep	2017-03-23 14:12:12 +05:30
kamidu	a85b5688a9	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-03-23 12:23:39 +05:30
kamidu	0b94a284ad	new role filtering related fixes	2017-03-23 12:23:21 +05:30
kamidu	8c17418198	fixing the null pointer exception	2017-03-23 12:23:02 +05:30
kamidu	530e603fb5	enable role filtering and role count in device cloud	2017-03-23 12:22:27 +05:30
kamidu	cda0dd417f	fixing the role filtering api issues	2017-03-23 12:21:41 +05:30
Harshan Liyanage	d468ac07d0	Revert "Allowing configuration management in cloud environment"	2017-03-23 11:12:15 +05:30
Madawa Soysa	da69bc9fe5	Allowing configuration management in cloud environment	2017-03-23 11:06:52 +05:30
charitha	6656f9e6f0	Add support for hybrid device types which has emulation/virtual capabilities ... (cherry picked from commit 78b7037)	2017-03-23 01:07:28 +05:30
kamidu	e205fd97cd	fix the user view related issues and device location out dated issue	2017-03-22 20:14:50 +05:30
kamidu	1f572998f8	enable role filtering in device cloud	2017-03-22 20:13:59 +05:30
kamidu	73ab0a38bf	adding get location api witch was missing from previous emm versions	2017-03-22 20:13:08 +05:30
kamidu	a6f5c002a9	adding get location api witch was missing from previous emm versions	2017-03-22 20:12:50 +05:30
kamidu	a77794f81a	adding role filtering for device cloud via api	2017-03-22 20:12:30 +05:30
kamidu	fc6c8e0290	adding get location api witch was missing from previous emm versions	2017-03-22 20:11:41 +05:30
Susinda Perera	643be65cf9	Merge pull request #662 from amalhub/master ... Once the password is changed - Curent user should be immediately logout	2017-03-22 15:54:33 +05:30
amalhub	4c6781d6b6	Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout	2017-03-22 15:37:16 +05:30
WSO2 Builder	e8ee33e7a4	[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration	2017-03-22 15:24:27 +05:30
WSO2 Builder	6cc898d2ab	[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34	2017-03-22 15:24:16 +05:30
Geeth	c0a474f6fc	Merge pull request #661 from charithag/master ... Fixes and improvments	2017-03-22 15:18:50 +05:30
charitha	78b7037aa9	Add support for hybrid device types which has emulation/virtual capabilities	2017-03-22 15:04:21 +05:30
WSO2 Builder	a26a4bb539	[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration	2017-03-22 14:25:54 +05:30
WSO2 Builder	000601911f	[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33	2017-03-22 14:25:43 +05:30
amalhub	af4ab19132	Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/647	2017-03-22 12:16:12 +05:30
WSO2 Builder	50c9eb9ba4	[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration	2017-03-21 20:02:26 +05:30
WSO2 Builder	ca79804c5c	[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32	2017-03-21 20:02:14 +05:30
sinthuja	54888b6727	Adding back the webscoket credential method invocation, as it's needed by the pugins.	2017-03-21 19:44:02 +05:30
charitha	5ff3ba3fcc	Fix issue in showing dynamic icons	2017-03-21 11:14:27 +05:30
kamidu	bf1548c062	title app name changed	2017-03-21 10:52:12 +05:30
WSO2 Builder	a35205c480	[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration	2017-03-20 16:49:31 +05:30
WSO2 Builder	ac379c9bf9	[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31	2017-03-20 16:49:20 +05:30
Harshan Liyanage	df6d8d4496	Merge pull request #656 from Kamidu/cloud-3.1.0 ... Fixing Git Issue : https://github.com/wso2/carbon-device-mgt/issues/643	2017-03-20 16:43:33 +05:30
kamidu	fef7a58ad4	title app name changed	2017-03-20 14:29:27 +05:30
Susinda	5d10575de8	Merge remote-tracking branch 'upstream/master'	2017-03-16 18:04:52 +05:30
Susinda	dc0606f207	Fixing typo in above commit	2017-03-16 17:24:19 +05:30
Susinda	96d45d006d	Fixing #645 , when password is changed redirect to logout	2017-03-16 17:21:48 +05:30
WSO2 Builder	de25f3afe3	[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration	2017-03-16 16:59:42 +05:30
WSO2 Builder	55ecafe7f4	[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30	2017-03-16 16:59:28 +05:30
Amal Gunatilake	f93bac489f	Merge pull request #654 from susinda/master ... Fixing #644	2017-03-16 15:37:56 +05:30
Susinda	226db9a230	Fixing #644	2017-03-16 15:28:45 +05:30
Amal Gunatilake	5ef2d9d121	Merge pull request #653 from susinda/master ... Typo Fxed	2017-03-16 15:06:52 +05:30
Susinda	b3295ca2ef	Typo Fxed	2017-03-16 15:03:48 +05:30
WSO2 Builder	15d57f71ad	[WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare for next development iteration	2017-03-16 11:10:29 +05:30
WSO2 Builder	3af9e1729a	[WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare release v2.0.29	2017-03-16 11:10:11 +05:30
Amal Gunatilake	dbf657fae8	Merge pull request #640 from susinda/master ... Fixing: https://github.com/wso2/carbon-device-mgt/issues/639	2017-03-16 10:48:26 +05:30
WSO2 Builder	322f39596e	[WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare for next development iteration	2017-03-15 18:46:16 +05:30
WSO2 Builder	18244d6c96	[WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare release v2.0.28	2017-03-15 18:46:03 +05:30
WSO2 Builder	12f21868dc	[WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare for next development iteration	2017-03-15 18:04:26 +05:30
WSO2 Builder	4328c3c39d	[WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27	2017-03-15 18:04:12 +05:30
Kamidu Sachith Punchihewa	14d517e89d	Merge pull request #641 from wso2/cloud-3.1.0 ... Cloud related fixes	2017-03-15 17:47:26 +05:30
kamidu	42f2691962	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-03-15 17:46:08 +05:30
kamidu	e30a5910f1	change the device cloud documentation link	2017-03-15 17:45:09 +05:30
kamidu	f3a61cb8f3	enhasing toplink	2017-03-15 17:43:20 +05:30
Susinda	cd4902f8ab	phoneNumber -> PhoneNumber	2017-03-15 16:04:06 +05:30
WSO2 Builder	c6bb8e0128	[WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration	2017-03-14 17:47:54 +05:30
WSO2 Builder	da9002ba9f	[WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26	2017-03-14 17:47:43 +05:30
Susinda	a539775583	Fixing carbon-device-mgt/issues/639	2017-03-14 17:41:35 +05:30
amalhub	541f5440ab	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-03-14 17:09:57 +05:30
amalhub	2c0ac79dce	Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/637	2017-03-14 17:07:16 +05:30
Hasunie	1ee313ea77	Merge pull request #636 from harshanL/cloud-3.1.0 ... Fixed Device renaming issue.	2017-03-14 16:49:21 +05:30
WSO2 Builder	6114f4b2d5	[WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration	2017-03-14 15:27:06 +05:30
WSO2 Builder	ea8f19f26d	[WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25	2017-03-14 15:26:55 +05:30
kamidu	6fe7470af5	re enabling device renaming	2017-03-14 14:29:36 +05:30
Harshan Liyanage	06ccbe28cc	Fixed Device renaming issue.	2017-03-14 14:13:21 +05:30
WSO2 Builder	d433525145	[WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration	2017-03-14 14:09:19 +05:30
WSO2 Builder	35ee3eca3a	[WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24	2017-03-14 14:09:08 +05:30
kamidu	3ff2c9894f	role filtering for device cloud is enabled	2017-03-14 14:06:22 +05:30
Harshan Liyanage	75486b3bb8	Fixed Device renaming issue.	2017-03-14 13:42:32 +05:30
WSO2 Builder	4e0afb7d39	[WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration	2017-03-13 18:09:06 +05:30
WSO2 Builder	33f1448c82	[WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23	2017-03-13 18:08:55 +05:30
Kamidu Punchihewa	e063fd0da9	code cleanup results	2017-03-13 17:11:07 +05:30
Kamidu Punchihewa	e6333438b9	ading role filtering and ui fixes	2017-03-13 17:01:54 +05:30
WSO2 Builder	e95e96f06c	[WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration	2017-03-10 13:09:08 +05:30
WSO2 Builder	5d55413e02	[WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22	2017-03-10 13:08:55 +05:30
Susinda	e23aaa6647	Adding Hasunie's fix on initialOperations implementation	2017-03-10 11:54:43 +05:30
Susinda Perera	bd7d6939e5	Merge pull request #628 from susinda/master ... Merging from cloud-3.1.0	2017-03-09 13:58:59 +05:30
WSO2 Builder	ae3300afde	[WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration	2017-03-09 13:14:50 +05:30
WSO2 Builder	6646c0c56f	[WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21	2017-03-09 13:14:38 +05:30
Susinda Perera	7c9659ed29	Merge pull request #1 from susinda/cloud-3.1.0 ... Cloud 3.1.0	2017-03-09 12:44:36 +05:30
WSO2 Builder	21cdcdd21a	[WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration	2017-03-09 12:38:02 +05:30
WSO2 Builder	23be60ebd0	[WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20	2017-03-09 12:37:49 +05:30
kamidu	0fade6aa9f	remove the cloud related config from config.jason	2017-03-08 15:54:08 +05:30
kamidu	dd26f366df	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-03-08 12:50:07 +05:30
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