3178 Commits

Author	SHA1	Message	Date
Nirothipan	d786b7d839	Edits	2017-06-20 10:52:16 +05:30
Nirothipan	b1e8687751	Code clean up	2017-06-19 22:30:39 +05:30
Nirothipan	7c5c0de4ee	README changes	2017-06-19 18:19:24 +05:30
Hasunie	2dc23d0574	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-06-19 18:17:48 +05:30
Nirothipan	1e10d31801	README changes	2017-06-19 18:14:41 +05:30
Nirothipan	5e7a0c73ec	Edits in README	2017-06-19 18:04:57 +05:30
Nirothipan	603ec856a6	type corrections	2017-06-19 17:59:47 +05:30
Nirothipan	f70cc79590	correction	2017-06-19 17:57:57 +05:30
Nirothipan	9569b0bba7	correction	2017-06-19 17:42:51 +05:30
Nirothipan	424a02fa20	edits	2017-06-19 17:07:04 +05:30
Nirothipan	eee153eee9	Adding org.wso2.carbon.device.mgt.mobile.android.emulator module	2017-06-19 17:00:35 +05:30
Nirothipan	0a0448ab97	Android Emulator client	2017-06-19 16:58:37 +05:30
WSO2 Builder	25de54d79d	[WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare for next development iteration	2017-06-19 16:39:43 +05:30
WSO2 Builder	d5ca9bec5c	[WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare release v4.0.2	2017-06-19 16:39:28 +05:30
Pasindu	bfe680ca95	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-06-19 08:23:02 +05:30
ayyoob	d1500dcd6d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0	2017-06-17 19:31:22 +05:30
ayyoob	b14ddd609a	fixing few issues after testing	2017-06-17 18:54:39 +05:30
Janak Amarasena	22e9cca3f3	UI fixes	2017-06-16 16:53:28 +05:30
Rasika Perera	7b34fddf6e	Updating version	2017-06-16 16:00:04 +05:30
Rasika Perera	13d777ff71	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing	2017-06-16 15:50:57 +05:30
Supun94	4db4c68431	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into mqtt-dashboard	2017-06-16 10:43:22 +05:30
ayyoob	7117fdeafc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 ... Conflicts: pom.xml	2017-06-16 03:47:46 +05:30
WSO2 Builder	428fabd043	[WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare for next development iteration	2017-06-15 16:37:19 +05:30
WSO2 Builder	2e8fb5739b	[WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare release v4.0.1	2017-06-15 16:37:06 +05:30
Ayyoob Hamza	bf86b72a41	Merge pull request #697 from GDLMadushanka/master ... Virtual fire alarm streams changed	2017-06-15 15:59:01 +05:30
WSO2 Builder	a72dbe91ef	[WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare for next development iteration	2017-06-15 15:32:45 +05:30
WSO2 Builder	5be8ef0a50	[WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare release v4.0.0	2017-06-15 15:32:32 +05:30
GDLMadushanka	4397451cdd	adding the temp stream back	2017-06-15 15:06:53 +05:30
GDLMadushanka	a089caf14e	temperature stream added back	2017-06-15 15:02:42 +05:30
Supun94	6098f2eaa8	Changing Topics search	2017-06-15 13:16:05 +05:30
GDLMadushanka	b2d283eb8f	Virtual fire alarm streams changed	2017-06-15 11:49:53 +05:30
Hasunie	592d6e7085	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-06-14 17:56:36 +05:30
ayyoob	e36fcfad37	updated version	2017-06-14 13:23:24 +05:30
ayyoob	fd369d55de	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0	2017-06-14 13:19:26 +05:30
Rasika Perera	eb5552cf3d	updating version	2017-06-14 11:34:28 +05:30
Rasika Perera	cac3600070	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing	2017-06-14 10:45:38 +05:30
Hasunie	40ee0203aa	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-06-13 17:25:05 +05:30
Harshan Liyanage	ed28a72483	Prevented getDevice calls from loading uncessary device-info.	2017-06-13 17:12:40 +05:30
Supun94	3907441cf4	Updated the broker version	2017-06-13 10:37:33 +05:30
Supun94	a785319643	Removed Scope Management Service	2017-06-13 10:31:53 +05:30
Supun94	ddb5dc2160	Created mqtt admin service stub	2017-06-13 10:31:53 +05:30
Supun94	80470ab668	Adding mqtt admin service	2017-06-13 10:31:53 +05:30
Supun94	9ae95e38f9	Changing mqtt api utils	2017-06-13 10:31:53 +05:30
Supun94	5b94b97ff4	Adding mqtt andes extensions api	2017-06-13 10:31:53 +05:30
Supun94	e1e483ad17	Adding new andes extensions api	2017-06-13 10:31:53 +05:30
Rasika Perera	b8716e11b8	Fixing geo dashboard car file missing dependencies	2017-06-12 20:20:05 +05:30
Rasika Perera	72f53ba55c	Fixing geo extension installer issue	2017-06-12 17:56:27 +05:30
WSO2 Builder	657178a829	[WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare for next development iteration	2017-06-12 16:20:24 +05:30
WSO2 Builder	b6d9066cb6	[WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare release v3.0.42	2017-06-12 16:20:03 +05:30
Rasika Perera	4894273230	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing	2017-06-12 15:59:59 +05:30
Rasika Perera	07ab82a0a8	Fixing typo	2017-06-12 15:53:02 +05:30
Rasika Perera	971001c43c	Updating version	2017-06-12 15:38:10 +05:30
Rasika Perera	ecc070e0ea	Removed siddhi gpl geo plugin dependencies	2017-06-12 15:37:55 +05:30
Rasika Perera	55a50aa679	Removed geo dashboard portal features	2017-06-12 15:34:47 +05:30
Rasika Perera	965f85a71e	Removed gpl siddhi geo extension plugin	2017-06-12 15:33:34 +05:30
Rasika Perera	4713448c4f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing	2017-06-12 15:14:08 +05:30
GDLMadushanka	16b85e8ff9	Removing hardcoded values	2017-06-12 12:23:27 +05:30
ayyoob	2afa84bfb4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 ... Conflicts: pom.xml	2017-06-12 11:50:03 +05:30
GDLMadushanka	7138ba3953	button removed	2017-06-12 11:42:48 +05:30
GDLMadushanka	e63a58df0e	Virtual Firealarm - broken pipe issue fixed and removed unwanted buttons	2017-06-12 08:05:54 +05:30
WSO2 Builder	266d49f812	[WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare for next development iteration	2017-06-09 13:55:42 +05:30
WSO2 Builder	8def362081	[WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare release v3.0.41	2017-06-09 13:55:28 +05:30
ayyoob	b96ba00d6c	updated pom version	2017-06-08 14:45:46 +05:30
ayyoob	64107c3386	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0	2017-06-08 14:28:17 +05:30
WSO2 Builder	8e29ae8cae	[WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare for next development iteration	2017-06-07 22:49:40 +05:30
WSO2 Builder	3a27834115	[WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare release v3.0.40	2017-06-07 22:49:26 +05:30
Pasindu	f0a9c0b78f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-06-07 07:20:38 +05:30
WSO2 Builder	b9ad0c9eed	[WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare for next development iteration	2017-06-06 12:16:40 +05:30
WSO2 Builder	6179ccc4fc	[WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare release v3.0.39	2017-06-06 12:16:26 +05:30
ayyoob	bef24e75d1	fixed few issues after testing	2017-06-06 11:01:04 +05:30
Rasika Perera	3427d7b637	Fixing issues in gpl siddhi geo extension feature	2017-06-06 10:46:59 +05:30
Rasika Perera	575e4932e6	Fixing geo script issue	2017-06-06 05:36:36 +05:30
Hasunie	c627699bdf	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-06-05 14:08:16 +05:30
Rasika Perera	9c23a39709	Version bump on gpl siddhi geo extension	2017-06-05 11:01:16 +05:30
Rasika Perera	1eb4118712	Version bump thrift adapter	2017-06-05 10:43:14 +05:30
Rasika Perera	7aa2cfde67	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-06-05 10:30:32 +05:30
Rasika Perera	646221d308	Thrift transport pom version bump	2017-06-05 10:20:00 +05:30
Rasika Perera	dcbf9f30b0	Removed publishing into org.wso2.android.agent.Stream	2017-06-05 10:18:14 +05:30
Rasika Perera	9d3f1a40d6	Changes to IoT Analytic artifacts	2017-06-05 10:07:25 +05:30
GDLMadushanka	c93083e11a	New config added to AndroidSense device type to redirect to DAS analytics page	2017-06-05 09:41:39 +05:30
Pasindu	eb9be0e124	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-06-05 09:07:33 +05:30
Pasindu	096ea49ab9	Daily commit	2017-06-05 09:02:52 +05:30
ayyoob	6b8682f2d8	few fixes after testing	2017-06-04 18:18:20 +05:30
ayyoob	796de7456f	Few changes after testing mqtt and http flow	2017-06-04 06:52:51 +05:30
ayyoob	6242fde431	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0	2017-06-03 19:45:44 +05:30
ayyoob	9dc836928c	few changes on content transformation logic	2017-06-03 13:27:40 +05:30
WSO2 Builder	d708765bda	[WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare for next development iteration	2017-06-02 21:21:42 +05:30
WSO2 Builder	4f9d50ca91	[WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare release v3.0.38	2017-06-02 21:21:27 +05:30
Harshan Liyanage	a3abf93715	Code refactoring which Resolves harshanl/product-iots#518	2017-06-02 15:49:24 +05:30
Hasunie	30eb8ca91d	adding debug logs to GlobalThrowableMapper	2017-06-02 12:44:48 +05:30
ayyoob	3a7536f1f6	update version	2017-06-01 23:26:02 +05:30
Rasika Perera	54e5994b0b	Removed redundant analytics artifacts	2017-06-01 22:05:58 +05:30
Rasika Perera	e6de7a4d90	Removed android analytics feature, a common set of streams,execution plan and receivers will be used	2017-06-01 22:04:09 +05:30
ayyoob	a1fb2ed9c0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 ... Conflicts: pom.xml	2017-06-01 17:32:29 +05:30
ayyoob	8381070bf6	Implemented Pull Notification Support	2017-06-01 17:21:23 +05:30
Rasika Perera	9d336caee8	Fixes to geo-fencing ui	2017-06-01 05:00:00 +05:30
Rasika Perera	d94f624518	Added geo fencing unit	2017-05-31 10:58:49 +05:30
Rasika Perera	7b88ae13ba	Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt-plugins	2017-05-31 08:06:58 +05:30
Rasika Perera	62f0b3f2a5	Version bump on gpl siddhi geo extension	2017-05-30 22:32:32 +05:30
Harshan Liyanage	ca0a9be6a0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-30 17:10:03 +05:30
Harshan Liyanage	ea5c865826	Resolves harshanl/product-iots#518	2017-05-30 17:09:44 +05:30
Rasika Perera	6261995bea	Adding GPL Siddhi Geo Exension	2017-05-30 16:32:18 +05:30
Rasika Perera	84711e58c6	Added geo-fencing to the devicemgt app	2017-05-30 16:32:18 +05:30
Pasindu	ee9c3ad5ef	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-30 12:16:03 +05:30
WSO2 Builder	e7af2ee4a4	[WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare for next development iteration	2017-05-30 11:07:50 +05:30
WSO2 Builder	dff15c5978	[WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare release v3.0.37	2017-05-30 11:07:36 +05:30
Pasindu	f49ecb2539	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins ... Some changes in android plugin for runtime permission is included.	2017-05-30 10:15:21 +05:30
ayyoob	ef274b0b3e	fixed formatting issue	2017-05-30 00:38:48 +05:30
ayyoob	94d626ca3c	changed event definition	2017-05-30 00:31:04 +05:30
ayyoob	aaeac03cfb	fixed issues in mqtt input adapter and thrift adapter after testing with multitenancy	2017-05-30 00:04:49 +05:30
madhawap	af0ce14af1	Adding android agent apk after pasindujw's fixes	2017-05-29 18:58:25 +05:30
madhawap	a1a8ac3c71	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-29 18:55:19 +05:30
ayyoob	1b4de09d7b	added missing imports	2017-05-29 12:11:31 +05:30
ayyoob	b32bf11c91	fixed multi tenant issues after testing thrift endpoint with multitenant	2017-05-29 01:01:26 +05:30
Pasindu	4f4d783c37	Runtime permission policy per app changes	2017-05-24 12:03:48 +05:30
Pasindu	5bb1662dfb	Resolve merging errors happened previously	2017-05-22 14:53:47 +05:30
ayyoob	e4247a98ff	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0	2017-05-19 14:50:26 +05:30
Pasindu	444dbdf865	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-19 07:01:20 +05:30
WSO2 Builder	84e12c7cca	[WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare for next development iteration	2017-05-17 16:51:16 +05:30
WSO2 Builder	400da8f05e	[WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare release v3.0.36	2017-05-17 16:51:01 +05:30
megala21	20f8708edb	Fixing issues in virtual fire alarm	2017-05-17 15:50:57 +05:30
Pasindu	1d832234df	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-17 10:10:16 +05:30
WSO2 Builder	9fcee2917f	[WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare for next development iteration	2017-05-16 14:24:47 +05:30
WSO2 Builder	c0c002a34b	[WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare release v3.0.35	2017-05-16 14:24:33 +05:30
Pasindu	1c358dac44	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-16 08:26:46 +05:30
ayyoob	92ee01d597	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0	2017-05-15 18:16:08 +05:30
Hasunie	3727bcb1e1	Merge pull request #660 from sameeragunarathne/master ... fix multi tenant issues in windows device enrollment	2017-05-15 17:06:37 +05:30
Pasindu	913cc567fe	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-15 10:09:47 +05:30
Pasindu	b8a0fd04e7	merge fix	2017-05-15 09:51:45 +05:30
megala21	0ed2b1c71b	Fixing minor issue in android sense car file deployment	2017-05-15 09:27:00 +05:30
kamidu	103b795a86	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-11 21:36:52 +05:30
kamidu	0c1ff01697	chaning the notification msg	2017-05-11 21:36:40 +05:30
WSO2 Builder	2242a1169b	[WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare for next development iteration	2017-05-11 13:04:58 +05:30
WSO2 Builder	87bccbdf1c	[WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare release v3.0.34	2017-05-11 13:04:42 +05:30
ayyoob	0117db8d9f	fixed issues related to analytics feature installation to DAS-3.1.0	2017-05-10 23:10:44 +05:30
ayyoob	6a1beb8ead	fixed issues related to multi tenant analytics flow and operation flow for reference device types	2017-05-10 13:51:04 +05:30
ayyoob	654bb84c6d	handle disconnection scenario for multi tenant mqtt receiver	2017-05-09 19:21:40 +05:30
ayyoob	f3a729204e	fixed issue when default value is set for qos	2017-05-09 18:11:21 +05:30
ayyoob	01edaeeab4	changed log from printing stack trace to meaning logs stating waiting for either broker or key manager	2017-05-09 16:11:50 +05:30
ayyoob	39097abcec	set default value for mqtt input adapter	2017-05-09 16:11:09 +05:30
ayyoob	2f56874e83	few fixes on analytics flow after testing the end to end flow	2017-05-09 16:10:25 +05:30
sinthuja	5f773a51c7	Merge branch 'wso2-master' ... # Conflicts: # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml	2017-05-09 12:09:22 +05:30
madhawap	a2897012f9	Fix for disabling reboot and upgrade-firmware operations on UI ... 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.	2017-05-09 12:03:08 +05:30
Pasindu	5f700c5b4a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-09 08:49:00 +05:30
Pasindu	60470d039a	Creating runtime permission policy for android devices	2017-05-09 08:33:17 +05:30
ayyoob	33f73eb2b3	merged with origin	2017-05-09 01:00:31 +05:30
ayyoob	728a8f4953	removed unused files and refactored few device type profile specific from the new device type feature structure,	2017-05-09 00:58:11 +05:30
ayyoob	0abbf55714	moved default input and output configurations to global properties	2017-05-09 00:57:14 +05:30
ayyoob	06d646c87a	moved artifact deployment to the platform configuration	2017-05-09 00:56:21 +05:30
sinthuja	48bbf1153b	Fixing the warning and mismatch version in the pom.xml.	2017-05-08 18:08:47 +05:30
WSO2 Builder	f0a70d7f27	[WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration	2017-05-08 18:04:55 +05:30
WSO2 Builder	24460ebde1	[WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33	2017-05-08 18:04:39 +05:30
sinthuja	37a15e927d	Merge branch 'wso2-master' ... # Conflicts: # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml	2017-05-08 14:28:07 +05:30
WSO2 Builder	df7df6ffa6	[maven-release-plugin] prepare for next development iteration	2017-05-08 12:44:37 +05:30
WSO2 Builder	3cdec9843a	[maven-release-plugin] prepare release v3.0.32	2017-05-08 12:44:22 +05:30
sinthuja	79bdfa642c	Merge branch 'wso2-master' ... # Conflicts: # components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java # features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/src/main/resources/p2.inf # features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/p2.inf # features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/p2.inf	2017-05-07 23:02:06 +05:30
ayyoob	5a25f15d08	removing the fix did in cloud setup - jasinthas	2017-05-05 03:21:13 +05:30
ayyoob	359184429e	Added missing fixes that was done for multi tenancy in cloud branch	2017-05-05 01:57:48 +05:30
sinthuja	bbc8c8efce	Fixing the issue in consuming the events for carbon.super from mqtt.	2017-05-04 22:15:36 +05:30
WSO2 Builder	2db4069053	[WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration	2017-05-02 20:47:53 +05:30
WSO2 Builder	902d7e3cf2	[WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31	2017-05-02 20:47:39 +05:30
warunalakshitha	543e68771e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-01 20:53:24 +05:30
WSO2 Builder	e2becd3169	[WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration	2017-05-01 19:57:06 +05:30
WSO2 Builder	85c36c0ca8	[WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30	2017-05-01 19:56:48 +05:30
Rasika Perera	9d00038199	#665 : Added some improvements to the fix	2017-05-01 19:38:16 +05:30
Rasika Perera	f7dbc156b3	#665 : Added some changes to reuse PropertyUtils.replaceTenantDomainProperty()	2017-05-01 19:15:11 +05:30
Rasika Perera	be99ca571b	#665 : Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue	2017-05-01 18:54:01 +05:30
warunalakshitha	568538cc13	add comments for performance configs	2017-04-30 13:58:49 +05:30
WSO2 Builder	c3fb32f3bc	[WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration	2017-04-28 10:33:09 +05:30
WSO2 Builder	1b0047c39f	[WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29	2017-04-28 10:32:49 +05:30
Ayyoob Hamza	5397fc3563	Merge pull request #662 from Megala21/master ... Adding security filters for secured-websocket war	2017-04-28 10:05:29 +05:30
WSO2 Builder	99e587eb78	[WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration	2017-04-28 08:38:44 +05:30
WSO2 Builder	9b8929a8cd	[WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28	2017-04-28 08:38:35 +05:30
Kamidu Sachith Punchihewa	6759a99ae9	Merge pull request #657 from rasika/master ... Fixing Android policy view and policy edit doesn't honor isCloud enabled param	2017-04-28 07:58:30 +05:30
megala21	d1ee78eaed	Adding security filters for websocket web.xml	2017-04-27 17:37:17 +05:30
sameera910409	08adfda735	fix multi tenant issues in windows device enrollment	2017-04-27 10:32:05 +05:30
ayyoob	155135a70d	fixed few issues after testing analytics	2017-04-26 01:34:57 +05:30
Rasika Perera	511c61175c	#654 : Fixing Android policy view and policy edit doesn't honor isCloud enabled parameter	2017-04-25 14:46:55 +05:30
WSO2 Builder	1a91d1ddc0	[WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare for next development iteration	2017-04-25 13:14:01 +05:30
WSO2 Builder	426a016c37	[WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27	2017-04-25 13:13:43 +05:30
WSO2 Builder	de5ff24046	Merge commit 'dc4c32129ac05dfe6247cb060cc0949fcdf5c2ed' into db9e6dc2-9fc6-4b4a-8465-9e6ea06cdee0	2017-04-25 12:50:57 +05:30
WSO2 Builder	dc4c32129a	[WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare for next development iteration	2017-04-25 11:47:30 +05:30
WSO2 Builder	b1c6ae0e2c	[WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26	2017-04-25 11:47:01 +05:30
charitha	9febce0601	Add latest agent (3.1.16)	2017-04-25 11:32:20 +05:30
Charitha Goonetilleke	186b3e16e4	Merge pull request #653 from ruwany/master ... Merging cloud-310 branch with master	2017-04-25 11:29:04 +05:30
WSO2 Builder	72fab84bf9	[WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare for next development iteration	2017-04-24 17:57:19 +05:30
WSO2 Builder	5ff67af60a	[WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25	2017-04-24 17:57:03 +05:30
inoshperera	3fb3ebd893	moving app subscription to a new thread	2017-04-24 17:33:56 +05:30
charitha	de0cb9a5a2	Add agent 3.1.15 for cloud ... (cherry picked from commit 0d6800b)	2017-04-24 11:35:25 +05:30
charitha	ab91e3a6b0	Fixed https://github.com/wso2/cdmf-agent-android/issues/33 ... (cherry picked from commit fadd2e6)	2017-04-24 11:35:18 +05:30
charitha	d80c25ed2b	Updating UIs of agents to latest ... (cherry picked from commit 90c0618)	2017-04-24 11:35:07 +05:30
Rasika Perera	a1b0298374	Updating android agent into latest ... (cherry picked from commit a41436d)	2017-04-24 11:34:37 +05:30
Jasintha	ce4365f601	Removing testing values ... (cherry picked from commit 31d5977)	2017-04-24 11:33:46 +05:30
Jasintha	3980899686	Fixing MQTT adpater and analytics resources for androidsense userstory ... (cherry picked from commit b04b583)	2017-04-24 11:33:25 +05:30
Rasika Perera	51a613f167	Resolving #642 : Improve UX on location updates for Android ... (cherry picked from commit 64b1b33)	2017-04-24 11:24:26 +05:30
WSO2 Builder	4c0e505008	[WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration	2017-04-21 16:28:48 +05:30
WSO2 Builder	b653b4871d	[WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24	2017-04-21 16:28:35 +05:30
amalhub	ec75361c57	Adding latest android-agent.apk (https://github.com/wso2/cdmf-agent-android/releases/tag/v3.1.13)	2017-04-21 14:57:43 +05:30
WSO2 Builder	7a2b64605f	[WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare for next development iteration	2017-04-18 10:33:01 +05:30
WSO2 Builder	908ee841e9	[WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23	2017-04-18 10:32:45 +05:30
ayyoob	310525d066	added token recovery option when token refresh failed	2017-04-17 17:44:38 +05:30
WSO2 Builder	84220e2c25	[WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare for next development iteration	2017-04-07 14:56:29 +05:30
WSO2 Builder	5da8bf98b8	[WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare release v3.0.22	2017-04-07 14:56:13 +05:30
kamidu	bcdd78ae68	Merge branch 'master' into cloud-3.1.0	2017-04-07 14:31:11 +05:30
kamidu	dc0fda3925	fixing location and operation loading ui issues	2017-04-05 17:04:28 +05:30
kamidu	eb7a83bcc8	fixing location and operation loading ui issues	2017-04-05 17:02:38 +05:30
kamidu	9d3949ea37	enabling loading for location refrsh	2017-04-05 16:35:35 +05:30
kamidu	1d663e1b68	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0	2017-04-05 11:14:26 +05:30
kamidu	4662db6701	device status fic	2017-04-05 11:14:10 +05:30
charitha	6f3578f797	Adding agent 3.1.7 for cloud	2017-04-05 10:19:31 +05:30
kamidu	9ad8cb21ae	android enrollment ui fixes and operation in progress animation fix	2017-04-04 17:13:02 +05:30
Kamidu Sachith Punchihewa	8f169d0116	Revert "Updated device-mgt version & interface."	2017-04-04 13:10:05 +05:30
kamidu	2abd8823a3	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0	2017-04-03 18:28:30 +05:30
Harshan Liyanage	ff5a1c9c5d	Updated device-mgt version & interface.	2017-04-03 17:48:21 +05:30
kamidu	ee24a8baea	merging upstream cloud-3.1.0	2017-04-03 17:35:44 +05:30
kamidu	ace58b6649	policy filtering and location reload for cloud	2017-04-03 17:27:23 +05:30
WSO2 Builder	2cf8496351	[WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare for next development iteration	2017-03-30 10:31:28 +05:30
WSO2 Builder	7d6def8976	[WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare release v3.0.21	2017-03-30 10:31:12 +05:30
charitha	6398d79760	Fix https://github.com/wso2/product-iots/issues/332 ... (cherry picked from commit 0e4df87)	2017-03-29 23:16:39 +05:30
charitha	0e4df87dda	Fix https://github.com/wso2/product-iots/issues/332	2017-03-29 23:15:59 +05:30
charitha	110c9405b1	Update device enrollement steps ... (cherry picked from commit ca8ad9f)	2017-03-29 22:28:21 +05:30
charitha	ca8ad9f528	Update device enrollement steps	2017-03-29 22:27:26 +05:30
WSO2 Builder	de5f854367	[WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare for next development iteration	2017-03-29 15:23:01 +05:30
WSO2 Builder	13cbce1e37	[WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare release v3.0.20	2017-03-29 15:22:46 +05:30
charitha	179cc93c1a	Downgraded android OS version to avoid ANR ... (cherry picked from commit e13aa77)	2017-03-29 14:37:08 +05:30
charitha	6ea597233b	Add google play store links to device enrollment page ... (cherry picked from commit 243a3df)	2017-03-29 14:36:38 +05:30
charitha	572d85dbd1	Instruct mac users to restart after installing HAXM ... (cherry picked from commit b53fe60)	2017-03-29 14:35:59 +05:30
charitha	e13aa77b21	Downgraded android OS version to avoid ANR	2017-03-29 14:30:12 +05:30
charitha	2d67d33eb6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-03-29 14:09:02 +05:30
charitha	243a3df89d	Add google play store links to device enrollment page	2017-03-29 14:06:15 +05:30
WSO2 Builder	0f3318e353	[WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare for next development iteration	2017-03-29 11:13:40 +05:30
WSO2 Builder	41041f3f6d	[WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare release v3.0.19	2017-03-29 11:13:18 +05:30
charitha	d8218ef221	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-03-29 09:46:07 +05:30
charitha	b53fe60807	Instruct mac users to restart after installing HAXM	2017-03-29 09:45:34 +05:30
WSO2 Builder	cf3d543fea	[WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare for next development iteration	2017-03-24 15:45:48 +05:30
WSO2 Builder	59194a1286	[WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18	2017-03-24 15:45:32 +05:30
charitha	52060c9d40	Fixed unzipping issue in tryit tool ... (cherry picked from commit 01187db)	2017-03-24 14:45:19 +05:30
charitha	33342e0e97	Fix documentation links	2017-03-24 14:44:55 +05:30
charitha	01187db029	Fixed unzipping issue in tryit tool	2017-03-24 14:35:31 +05:30
WSO2 Builder	82ac8417d3	[WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare for next development iteration	2017-03-23 13:14:16 +05:30
WSO2 Builder	d0e9362ee1	[WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17	2017-03-23 13:14:05 +05:30
charitha	6aee69ef5b	Updated splash screen images	2017-03-23 08:53:28 +05:30
charitha	8ee81f497d	Adding latest Android agent	2017-03-23 01:11:14 +05:30
charitha	3bfa383cea	Adding Android-tryit tool ... (cherry picked from commit c3e241e)	2017-03-23 01:08:33 +05:30
Charitha Goonetilleke	6c6cde7df0	Merge pull request #623 from sameeragunarathne/master ... fix android apk install operation issue by checking resource access s…	2017-03-22 20:06:50 +05:30
sinthuja	09033aef51	Fixing the issue in feature installation.	2017-03-22 19:04:47 +05:30
sameera910409	d907f1bc51	fix https://wso2.org/jira/browse/EMM-1880	2017-03-22 19:02:47 +05:30
sinthuja	b1af6eeaf4	Moving the cdmf-analytics repo components to device-mgt-iot-plugins.	2017-03-22 18:19:17 +05:30
WSO2 Builder	2049e44319	[WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare for next development iteration	2017-03-22 15:53:43 +05:30
WSO2 Builder	d15dc25c13	[WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16	2017-03-22 15:53:34 +05:30
Geeth	bc7b77e07a	Merge pull request #622 from charithag/master-androidtryit ... Adding Android-tryit tool	2017-03-22 15:32:54 +05:30
charitha	c3e241e1d5	Adding Android-tryit tool	2017-03-22 15:29:37 +05:30
WSO2 Builder	8df6e56f40	[WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare for next development iteration	2017-03-21 20:11:47 +05:30
WSO2 Builder	2e8f5a63d2	[WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15	2017-03-21 20:11:33 +05:30
Ayyoob Hamza	632547447c	Merge pull request #621 from sinthuja/master ... Changes to adhere to the new directory structure.	2017-03-21 19:56:07 +05:30
megala21	c8f25a0b77	Updating json version	2017-03-16 21:42:44 +05:30
Harshan Liyanage	893eccd817	Merge pull request #618 from hasuniea/master ... resolved #616	2017-03-16 15:55:27 +05:30
Harshan Liyanage	bd2ded8563	Removed unnecessary braces.	2017-03-16 15:54:39 +05:30
Susinda	1c13f1b97d	Cloud and general doc links issue fixed	2017-03-16 14:42:09 +05:30
Hasunie	809a30fc7a	fixing code format issue	2017-03-16 14:22:24 +05:30
Hasunie	7de234c164	resolved #616	2017-03-16 14:14:32 +05:30
Hasunie	42cc311f00	Fixing NPE in AndroidAPIUtils ... resolved #616	2017-03-16 12:57:04 +05:30
Hasunie	143569b83b	Fixing null property in AndriodAPIUtils	2017-03-16 12:26:37 +05:30
Hasunie	a30fbfdbec	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-03-16 12:04:24 +05:30
WSO2 Builder	c49b33bb4a	[WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare for next development iteration	2017-03-15 18:08:34 +05:30
WSO2 Builder	e1064dca07	[WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14	2017-03-15 18:08:26 +05:30
Kamidu Sachith Punchihewa	95f64b0a15	Merge pull request #615 from wso2/cloud-3.1.0 ... Cloud related fixes	2017-03-15 17:47:31 +05:30
WSO2 Builder	68f329cbda	[WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare for next development iteration	2017-03-14 16:48:21 +05:30
WSO2 Builder	8669d1b44e	[WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13	2017-03-14 16:48:11 +05:30
Harshan Liyanage	2753deb365	Merge pull request #602 from sameeragunarathne/master ... refactor code for firebase cloud messaging	2017-03-14 16:41:19 +05:30
sinthuja	2f20502d81	Merge branch 'wso2-master'	2017-03-14 00:45:59 +05:30
sinthuja	5c79504529	Resolving the startup issue in the broker profile.	2017-03-13 21:51:52 +05:30
Harshan Liyanage	1882171824	Merge pull request #611 from Kamidu/cloud-3.1.0 ... android view related ui fixes	2017-03-13 17:47:10 +05:30
WSO2 Builder	18d3518236	[WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration	2017-03-13 17:43:20 +05:30
WSO2 Builder	867790d3cb	[WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12	2017-03-13 17:43:10 +05:30
kamidu	c97dfb4080	android view related ui fixes : MACOS :: Git config auto genarated for sachithp@wso2's-MacBook-Pro.local	2017-03-13 17:40:26 +05:30
sameera910409	078209347a	refactor code for firebase cloud messaging	2017-03-13 14:30:27 +05:30
Susinda	1ebc84450f	revert the implementation 'agent download from github release'	2017-03-13 14:15:03 +05:30
Susinda	286d293ddd	revert the implementation 'agent download from github release'	2017-03-13 13:55:42 +05:30
Susinda	7c3d94cf77	Added README file to avoid git ignoring empty dirs	2017-03-10 12:43:31 +05:30
Susinda	f96389e671	Android agent downloadded from github relese location, Hasuni's fix on initial operations added	2017-03-10 12:00:27 +05:30
Susinda Perera	fb6cfb6699	Merge pull request #1 from susinda/cloud-3.1.0 ... Merging from Cloud 3.1.0	2017-03-09 12:45:44 +05:30
kamidu	d2d56651cc	fix for leaflet tile not loading issues ... (cherry picked from commit 6604c23257)	2017-03-07 15:25:24 +05:30
ayyoob	2dd7f53489	added log support for server to server communication	2017-03-07 02:04:26 +05:30
Harshan Liyanage	b82a59c828	Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0	2017-03-03 17:45:26 +05:30
Hasunie	7fcf4e9a3b	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0	2017-03-03 17:38:39 +05:30
Hasunie	3e50f0b737	adding initial operations	2017-03-03 17:37:55 +05:30
Harshan Liyanage	dc054e6ed5	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0	2017-03-03 17:10:17 +05:30
Harshan Liyanage	f2761e9b0a	Removed info operation addition upon page load	2017-03-03 17:10:02 +05:30
ayyoob	a10eb7cb14	removed feature	2017-03-03 17:03:57 +05:30
ayyoob	77ec1c4107	fixed operation bar permission rendering issue	2017-03-02 20:27:46 +05:30
Milan Perera	360a58dce6	Merge pull request #596 from Kamidu/cloud-3.1.0 ... fix for leaflet tile not loading issues	2017-03-02 15:23:48 +05:30
kamidu	6604c23257	fix for leaflet tile not loading issues	2017-03-02 15:20:27 +05:30
ayyoob	eda4710211	resolved device type download issue in windows OS and added log support for service clients.	2017-03-02 00:32:39 +05:30
susinda	5ad6dc1f1d	Fxing PhoneNumber Serach for android	2017-02-28 20:28:48 +05:30
lakshani	3505cc8abc	Adding (cherry-pick) lakshani's commit on 'Fixed the issue in server startu'	2017-02-28 20:28:43 +05:30
Susinda Perera	6f9ea52218	Merge pull request #593 from wso2/cloud-3.1.0 ... Merging to 3.1.0-test from Cloud 3.1.0 - Till Feb-28	2017-02-28 19:25:12 +05:30
ayyoob	384ab40f5b	added ssl context	2017-02-27 16:44:26 +05:30
Hasunie	17c017379c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-02-21 11:50:12 +05:30
lakshani	ffee269a0e	Fixed the issue in server startup- removed error logs	2017-02-20 14:01:56 +05:30
lakshani	964e2aade7	Fixed the issue in server startup error logs	2017-02-20 13:53:18 +05:30
Kamidu Sachith Punchihewa	740bb976fa	adding location operation to device view page	2017-02-19 19:10:20 +05:30
kamidu	afaa75d3a9	adding screen shots	2017-02-17 20:46:09 +05:30
kamidu	463d8a9dff	wording sugessions for cloud	2017-02-16 00:23:58 +05:30
Imesh Chandrasiri	20bd1b399b	Removed conflict markings	2017-02-15 11:16:41 +05:30
Imesh Chandrasiri	a890d9fb89	Device enrollment page revamp	2017-02-15 11:14:07 +05:30
Imesh Chandrasiri	bccc47ebd2	Conflict fix	2017-02-15 10:46:07 +05:30
Imesh Chandrasiri	4b7637a426	Device enrollment page revampl	2017-02-15 10:43:47 +05:30
Imesh Chandrasiri	37b032d710	Merge branch 'cloud-3.1.0' into cloud-3.1.0	2017-02-15 10:20:21 +05:30
Imesh Chandrasiri	67313882ed	Device enrollment page changes for cloud	2017-02-14 22:39:17 +05:30
kamidu	71c93eec29	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0	2017-02-14 19:27:11 +05:30
kamidu	305df1c2bd	enhansing the device cloud ui	2017-02-14 19:27:02 +05:30
kamidu	9d733d6cc1	Fixing android location issue	2017-02-14 12:58:13 +05:30
Susinda Perera	8a9affc4b8	Merge pull request #582 from ayyoob/210releasepatch ... added device management api to be default	2017-02-14 12:06:48 +05:30
Imesh Chandrasiri	f10e26f0a9	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0	2017-02-14 10:27:20 +05:30
Imesh Chandrasiri	2fcd5ca020	Model Popup title space issue fix	2017-02-14 10:26:56 +05:30
Hasunie	0c87c32094	Merging changes	2017-02-14 10:18:57 +05:30
lakshani	f5d71d917e	Added change device status feature to mobile plugings	2017-02-09 14:14:44 +05:30
ayyoob	a294c20a2a	added device management api to be default	2017-02-09 09:59:24 +05:30
lakshani	3c349a71e6	removed unwanted repositories from restconnector	2017-02-07 10:42:28 +05:30
lakshani	edb8e71ac2	Added change device status feature to mobile plugings	2017-02-07 10:38:12 +05:30
ayyoob	e66311b844	fixed few multi tenant issues	2017-02-06 03:47:54 +05:30
ayyoob	00feadac97	fixed validation url property	2017-02-05 21:49:37 +05:30
ayyoob	dd3017578a	added artefact deployment support for device types	2017-02-05 17:52:52 +05:30
kamidu	fe338aa412	removing the module vfa plugin	2017-02-03 17:20:25 +05:30
Kamidu Sachith Punchihewa	68b36babe6	Merge pull request #575 from wso2/master ... UI fixes for device cloud	2017-02-03 16:53:19 +05:30
kamidu	bd715b7aac	resolving branch conflicts	2017-02-03 16:51:25 +05:30
kamidu	53840dcc37	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-02-03 13:01:21 +05:30
ayyoob	56de095599	resolved app connector build slowness issue	2017-02-03 05:00:57 +05:30
WSO2 Builder	d7e4580e77	[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration	2017-02-02 16:06:06 +05:30
WSO2 Builder	1737eaaa79	[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11	2017-02-02 16:05:58 +05:30
Hasunie	3b98e0f754	Merge pull request #572 from charithag/master-update-swagger-docs ... Update swagger docs	2017-02-02 14:58:11 +05:30
ayyoob	e0f6e9579d	fixed multi tenant issues after testing	2017-02-02 03:17:19 +05:30
ayyoob	2cfc4540f4	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0	2017-02-02 01:59:53 +05:30
ayyoob	50d8aedade	fixed analytics multi tenant issues	2017-02-02 01:59:48 +05:30
charitha	9bf38af4f7	Fix issues in swagger docs	2017-02-01 15:03:10 +05:30
Milan Perera	99782e6360	Resolved conflicts and merged	2017-02-01 14:13:01 +05:30
Hasunie	1ab1def2b6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-02-01 12:04:18 +05:30
Hasunie	fb28a4042f	fixing windows config issues	2017-02-01 12:02:50 +05:30
Milan Perera	cc8066896b	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud	2017-02-01 11:31:42 +05:30
Milan Perera	e1a419425e	Added cloud agent to the download page	2017-02-01 11:31:15 +05:30
ayyoob	73eb590a7c	renamed grant type to default	2017-02-01 00:08:32 +05:30
Kamidu Sachith Punchihewa	64cb8b5223	Update load-map.js	2017-01-31 14:10:29 +05:30
kamidu	55489d5e52	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-01-31 13:44:12 +05:30
kamidu	192e1c3edc	adding missing classes in hbs	2017-01-31 13:41:01 +05:30
WSO2 Builder	7034dae2b5	[maven-release-plugin] prepare for next development iteration	2017-01-31 12:58:56 +05:30
WSO2 Builder	a2224f96ff	[maven-release-plugin] prepare release v3.0.10	2017-01-31 12:58:45 +05:30
lakshani	67663449d2	removed unwanted versions from the pom	2017-01-31 11:02:49 +05:30
Hasunie	f9bb3f6e89	removing swagger annotation from enrollment ... (cherry picked from commit 3dc1418)	2017-01-31 10:23:02 +05:30
Hasunie	3dc1418290	removing swagger annotation from enrollment	2017-01-31 10:16:56 +05:30
lakshani	1319806a6c	removed snapshot versions	2017-01-30 19:32:26 +05:30
lakshani	f62e7021d6	updated the pom to latest version	2017-01-30 19:03:30 +05:30
lakshani	8f53a05962	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-01-30 18:44:33 +05:30
lakshani	fff1a3f168	fixed the issues in rest connector	2017-01-30 18:44:23 +05:30
WSO2 Builder	4554d8929d	[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration	2017-01-30 18:07:35 +05:30
WSO2 Builder	da7c040224	[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9	2017-01-30 18:07:24 +05:30
GPrathap	1d488b06a8	allowing every internal users to view device analytics dashboard	2017-01-30 17:53:02 +05:30
lakshani	ffdcd2b217	updated pom based on review comments	2017-01-30 11:45:19 +05:30
lakshani	ebc6c6ec11	added java doc comments	2017-01-30 09:41:39 +05:30
lakshani	d6b6da9c14	added rest-connector	2017-01-30 09:29:33 +05:30
ayyoob	036d6936a7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-25 14:05:36 +05:30
ayyoob	3021947f30	updated saml grant type config name	2017-01-25 14:03:57 +05:30
GPrathap	21abaa8270	changed websocket token retrieval mechanism	2017-01-25 11:24:41 +05:30
ayyoob	8b5dd4d811	resolved merge issues	2017-01-24 19:57:25 +05:30
ayyoob	4f1f1a3e7e	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-24 19:46:39 +05:30
WSO2 Builder	e64fe695ab	[maven-release-plugin] prepare for next development iteration	2017-01-20 13:36:50 +00:00
WSO2 Builder	5fbd40c579	[maven-release-plugin] prepare release v3.0.8	2017-01-20 13:31:44 +00:00
kamidu	0679aab11d	adding missing classes in hbs	2017-01-20 18:26:15 +05:30
Rasika Perera	1fdaf0dc2f	Merge pull request #554 from ayyoob/arduino ... arduino fix is added	2017-01-20 18:01:23 +05:30
Rasika Perera	10428e7ca2	Merge pull request #553 from hasuniea/windows10 ... fixing synapse configs	2017-01-20 18:01:09 +05:30
ayyoob	affbd00796	arduino fix is added	2017-01-20 17:05:41 +05:30
Hasunie	8eed99c215	fixing passcode issue	2017-01-20 16:09:18 +05:30
sinthuja	f517975bf0	Adding wso2 event receiver to geo capp.	2017-01-20 15:33:01 +05:30
Hasunie	9467c52707	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-20 15:31:53 +05:30
Rasika Perera	3fc33d9e49	Merge pull request #552 from Jasintha/release-3.0.x ... MQTT subscription topic patten should changed to this format to get policy updates	2017-01-20 14:56:59 +05:30
Jasintha	d515dc6d03	Fixing policy topic chanaged issue	2017-01-20 14:28:38 +05:30
Hasunie	636eb91a0a	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-20 10:21:10 +05:30
Hasunie	b3d096f02c	removining app restriction policy from policy edit UI	2017-01-20 08:07:46 +05:30
WSO2 Builder	9687362258	[maven-release-plugin] prepare for next development iteration	2017-01-20 02:04:54 +00:00
WSO2 Builder	ee063a1a43	[maven-release-plugin] prepare release v3.0.7	2017-01-20 02:03:09 +00:00
Rasika Perera	0d6dd3b96e	Merge pull request #548 from hasuniea/windows10 ... Removing windows app restriction policy from Policy UI	2017-01-19 23:34:08 +05:30
Hasunie	68631a2dbd	removing windows app restriction policy from Policy UI	2017-01-19 23:26:43 +05:30
Chatura Dilan	57d6fb12ce	updating android agent	2017-01-19 22:54:34 +05:30
kamidu	c6d0c4ba44	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-19 22:39:15 +05:30
kamidu	50a2c3d89a	Enable opasity variation with time on location records	2017-01-19 22:38:52 +05:30
Hasunie	10cab941ee	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-19 22:35:30 +05:30
Hasunie	86d91c3bdf	fixing Windows synapse config issues	2017-01-19 22:33:58 +05:30
Chatura Dilan	b2ff6c4181	Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-19 21:33:16 +05:30
Chatura Dilan	57cdf8e1a5	updating android agent	2017-01-19 21:31:07 +05:30
kamidu	09de477e74	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-19 21:30:39 +05:30
kamidu	eb9c789b51	Enable opasity variation with time on location records	2017-01-19 21:30:29 +05:30
Rasika Perera	3b5159bed5	Merge pull request #542 from hasuniea/windows10 ... Fixing Windows10 passcode policy issue	2017-01-19 19:33:15 +05:30
kamidu	60046823dd	Enable location histry for android sense	2017-01-19 18:42:58 +05:30
kamidu	156402153d	git Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-19 17:41:26 +05:30
kamidu	86a3b18464	adding location history to map view	2017-01-19 17:41:08 +05:30
Rasika Perera	737d1da07b	Changed webapps title [EMM] into [IoT Server]	2017-01-19 17:04:01 +05:30
Hasunie	857e971fa6	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-19 15:58:01 +05:30
Hasunie	399496ce82	fixing windows10 policy issue	2017-01-19 15:57:19 +05:30
Menaka Jayawardena	872baf637f	Replacing android sense agent apk.	2017-01-19 13:00:35 +05:30
Menaka Jayawardena	ed28fb6adb	Adding permission updater for other device types.	2017-01-19 13:00:35 +05:30
Menaka Jayawardena	a7692b66d4	Removing commented code and refactoring.	2017-01-19 13:00:35 +05:30
Rasika Perera	3b7257c93f	Fixing "process" not found issues	2017-01-19 07:41:13 +05:30
Rasika Perera	9a3fc7e446	Cleaned windows-web-agent config.json	2017-01-19 01:34:48 +05:30
Rasika Perera	fe6c35ebca	Cleaned android-web-agent config.json	2017-01-19 01:34:48 +05:30
Rasika Perera	c04851d448	Removed iOS stuff from windows-web-agent	2017-01-19 01:34:48 +05:30
Rasika Perera	8b1a27a181	Merge pull request #536 from hasuniea/windows10 ... Fixing Windows plugin issues	2017-01-19 01:26:08 +05:30
Rasika Perera	a521b41352	Merge pull request #539 from menakaj/release-3.0.x ... Permissions added for android sense	2017-01-19 01:24:07 +05:30
Rasika Perera	0bc380c7d0	Merge pull request #538 from Kamidu/release-3.0.x ... Enable location history	2017-01-19 01:23:55 +05:30
Rasika Perera	1d10dbee88	Now UI configs supports system parameters with eg. %iot.core.host%	2017-01-19 00:58:13 +05:30
Menaka Jayawardena	6df9479fea	device-mgt user permissions added for android sense.	2017-01-18 22:51:31 +05:30
Menaka Jayawardena	e19802312e	Operation bar removed from android-sense device.	2017-01-18 22:51:31 +05:30
kamidu	c522809bd5	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-18 22:41:48 +05:30
kamidu	234157b6f5	adding location history to map view	2017-01-18 22:41:11 +05:30
Megala	574a106977	Adding fixes to path	2017-01-18 21:46:37 +05:30
Hasunie	736b09de31	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-18 19:14:02 +05:30
Hasunie	164ae997b1	fixing synapse config issues	2017-01-18 19:09:46 +05:30
Hasunie	1362e2d7fe	Fixing windows policy issues	2017-01-18 18:03:28 +05:30
Rasika Perera	357010120a	Merge pull request #535 from Jasintha/release-3.0.x ... receiving message format has been changed ,so updated the client according to …	2017-01-18 17:27:43 +05:30
Jasintha	55e0cec875	receving message has been chaged ,so updated the client according to that	2017-01-18 16:20:46 +05:30
Chatura Dilan	7e58c17b1e	Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-18 15:20:25 +05:30
Chatura Dilan	6db0885eb9	remove cosu whitelisting apps	2017-01-18 15:19:05 +05:30
Menaka Jayawardena	8e33e31704	Giving high priority for call and sms receivers and replacing android sense agent.	2017-01-18 11:59:14 +05:30
Megala	c35727ae0b	resolving conflicts	2017-01-18 09:47:00 +05:30
Megala	444119790c	Fixing geo dashboard issues	2017-01-18 02:33:04 +05:30
ayyoob	f1e75d9375	apim seperation	2017-01-18 01:48:43 +05:30
Rasika Perera	1d0753ab8d	Merge pull request #529 from DimalChandrasiri/release-3.0.x ... Fixed android type view notification pane message inconsistancy issue	2017-01-17 19:41:19 +05:30
Rasika Perera	c74e9de2f5	Merge pull request #527 from dunithd/release-3.0.x ... Formatting the anchor text after fixing 500 error	2017-01-17 19:40:38 +05:30
Rasika Perera	00ff43bfb4	Merge pull request #530 from hasuniea/windows10 ... fixing win10, 8.1 conflicting issues	2017-01-17 19:40:22 +05:30
Imesh Chandrasiri	dc840c389a	Fix for inconsistant notification message	2017-01-17 17:48:12 +05:30
Imesh Chandrasiri	62ba568e05	Fixed android type view notification pane message inconsistancy issue	2017-01-17 17:34:51 +05:30
Hasunie	95a7ff6aaf	fixing windows app-conf issue	2017-01-17 16:48:10 +05:30
Hasunie	e030be3d24	fixed code conflicts	2017-01-17 16:40:06 +05:30
Menaka Jayawardena	88b8901f75	Removed unused Test page from portal dashboard.	2017-01-17 16:15:23 +05:30
Menaka Jayawardena	f699ba54b3	Added Api annotation to AndroidSenseService	2017-01-17 16:14:49 +05:30
Hasunie	38216c4b9d	fixing win10,8.1 conflicting issues	2017-01-17 16:04:48 +05:30
Dunith Dhanushka	bbbfff28d9	UI Improvements for Geo Fencing	2017-01-17 15:40:27 +05:30
Dunith Dhanushka	d4107747ab	Update device-view.js	2017-01-17 15:35:59 +05:30
Rasika Perera	05e2cb7bb8	Changed [EMM] title into [IoT Server]	2017-01-17 15:34:08 +05:30
Dunith Dhanushka	54b08f9b7a	Adding the JSON formatted anchor text	2017-01-17 15:10:46 +05:30
Dunith Dhanushka	6634dded55	Building the anchor text	2017-01-17 15:09:05 +05:30
Rasika Perera	0b983855cf	Merge pull request #522 from DimalChandrasiri/release-3.0.x ... Fix for multiple popup issue	2017-01-17 11:49:59 +05:30
Dunith Dhanushka	c6437c3065	Formatting the title	2017-01-17 11:14:58 +05:30
Dunith Dhanushka	c1de144bcf	Setting device id and type to page title	2017-01-17 11:04:19 +05:30
ayyoob	dad3a34a27	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-16 22:40:03 +05:30
Dunith Dhanushka	b4f876d961	Updating the label text for Geo fencing link	2017-01-16 18:57:45 +05:30
Dunith Dhanushka	97d4fb1ef9	Removing advanced Geo fencing controls	2017-01-16 18:54:42 +05:30
Dunith Dhanushka	2c696b7222	Displaying the sidebar while page loads	2017-01-16 18:41:10 +05:30
ayyoob	76326b936c	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-16 18:30:01 +05:30
ayyoob	9d64fd0d4b	fixed multi tenant login issue	2017-01-16 16:08:07 +05:30
Menaka Jayawardena	ed85f78311	Replacing android-sense agent	2017-01-16 14:14:18 +05:30
Menaka Jayawardena	d8c2d65f05	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-16 00:13:35 +05:30
Imesh Chandrasiri	8eb95c3695	Fix for multiple popup issue	2017-01-14 23:56:51 +05:30
Imesh Chandrasiri	d918e32d59	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-14 23:51:43 +05:30
Imesh Chandrasiri	e112371d8e	Fix for multiple popup issue	2017-01-14 23:51:07 +05:30
WSO2 Builder	3f1b7a6005	[maven-release-plugin] prepare for next development iteration	2017-01-14 12:22:40 +00:00
WSO2 Builder	91a0edb0a0	[maven-release-plugin] prepare release v3.0.6	2017-01-14 12:17:46 +00:00
Menaka Jayawardena	4eb186140a	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-14 16:37:52 +05:30
Rasika Perera	3ae9fba143	Updating IoTS doc links	2017-01-13 23:14:26 +05:30
Rasika Perera	a3e97b4356	Merge pull request #521 from dunithd/release-3.0.x ... Replacing the value of GLOBAL-STATE param with comma separated deviceId,deviceType	2017-01-13 22:42:53 +05:30
Dunith Dhanushka	a097482b91	Passing deviceId and deviceType into view	2017-01-13 20:26:13 +05:30
Dunith Dhanushka	33e57efc3d	Replacing JSON object with comma separated values	2017-01-13 20:25:03 +05:30
Chatura Dilan	d55e0f21b7	Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-13 20:21:33 +05:30
Chatura Dilan	809d292c95	Added Android scopes	2017-01-13 20:21:14 +05:30
Hasunie	bd0f1f1900	fixing windows requestToken issue	2017-01-13 19:31:35 +05:30
Hasunie	810bbafea3	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-13 18:43:48 +05:30
Hasunie	ed0b40215a	fixing synapse config issues	2017-01-13 18:43:03 +05:30
Hasunie	c162f379b4	adding windows operation scope	2017-01-13 18:19:40 +05:30
Rasika Perera	f84e3526f5	changed [fw-ok] with [fw-success]	2017-01-13 17:50:19 +05:30
Hasunie	97705311b9	removing install app tab from the device view	2017-01-13 16:09:45 +05:30
Hasunie	a2ae12f9d1	adding windows 10 updates 1607/1511 changes	2017-01-13 16:08:58 +05:30
Hasunie	4c4fd00593	fixing issue in different type of windows device payloads	2017-01-13 16:06:31 +05:30
Hasunie	8655da595e	removing swagger definition from the soap endpoints	2017-01-13 16:05:10 +05:30
Rasika Perera	72d9e2d0d3	Merge pull request #515 from hasuniea/windows10 ... Fixing gateway issues in windows	2017-01-13 13:01:40 +05:30
Hasunie	e81d2b1c20	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-13 09:08:04 +05:30
Hasunie	429266d9d2	adding windows synaps configs	2017-01-13 09:07:33 +05:30
ayyoob	09f7fb3a5f	moved the traffic through the gateway	2017-01-13 04:49:35 +05:30
ayyoob	466c2b1151	moved to gateway mode	2017-01-12 19:29:59 +05:30
Rasika Perera	ebe47ef972	Merge pull request #516 from DimalChandrasiri/release-3.0.x ... Updating font wso2 to version 1.2.1	2017-01-11 22:41:29 +05:30
Milan Perera	76f52af4a5	Refactored android sense agent	2017-01-11 15:44:50 +05:30
Hasunie	32d99bcab6	fixing jira IOTS-378	2017-01-11 14:13:08 +05:30
Imesh Chandrasiri	fc3d15887e	Updating font wso2 to version 1.2.1	2017-01-11 11:20:21 +05:30
Hasunie	43a61d046b	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-11 09:03:35 +05:30
Hasunie	a905f22651	fixing Windows gatway issues	2017-01-11 09:03:03 +05:30
Menaka Jayawardena	672f153551	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-10 14:34:33 +05:30
Milan Perera	2eb18e304a	Change scope of android configuration	2017-01-10 11:39:09 +05:30
charitha	b812b6af2e	Fixed issue in showing android device location map	2017-01-09 12:36:06 +05:30
Hasunie	9e59993900	fixing issue in admin service tag	2017-01-09 08:25:54 +05:30
ayyoob	1df7d20a81	moved common configuration to global properties for input and output adapters	2017-01-08 21:26:14 +05:30
ayyoob	4cb6aca5b0	merge with upstream	2017-01-08 01:32:16 +05:30
ayyoob	ccaf47112a	removed DCR, added global configuration values for input and output adapter	2017-01-08 01:20:04 +05:30
WSO2 Builder	b10579950b	[maven-release-plugin] prepare for next development iteration	2017-01-07 11:25:51 +00:00
WSO2 Builder	b7a5454c2f	[maven-release-plugin] prepare release v3.0.5	2017-01-07 11:22:33 +00:00
ayyoob	2e8279b61a	removed scep impl from virtual fire alarm	2017-01-07 14:54:46 +05:30
Rasika Perera	0790689635	Removing unused package import in virtual_firealarm	2017-01-06 21:43:26 +05:30
Rasika Perera	7d07585cf1	Merge pull request #509 from hasuniea/windows10 ... Windows10 Location support	2017-01-06 20:36:01 +05:30
Hasunie	de533a0667	merging changes	2017-01-06 19:55:44 +05:30
Rasika Perera	82a1839fe9	Merge pull request #508 from dunithd/release-3.0.x ... Adding Geo fencing link to Android device	2017-01-06 19:42:51 +05:30
madhawap	c98bb39fea	resolving conflicts	2017-01-06 19:22:03 +05:30
Rasika Perera	55a7cee60e	Removed unneccessary pom import	2017-01-06 19:04:52 +05:30
Hasunie	440473bc13	adding context path to web xml nonsecuredEndpoints	2017-01-06 18:49:52 +05:30
dunithd	8c36f31030	Adding Geo fencing link to Android device	2017-01-06 18:36:16 +05:30
Hasunie	e186ef6bb3	fixing jira issue IOTS-368	2017-01-06 18:29:32 +05:30
madhawap	9bb3839c87	Adding Swagger to Android sense end-points	2017-01-06 17:05:48 +05:30
Milan Perera	77d1e684f6	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-06 16:48:02 +05:30
Rasika Perera	530c112b8e	Merge pull request #505 from rasika/release-3.0.x ... Replaced [EMM] with [IoT Server]	2017-01-06 16:46:48 +05:30
sinthuja	8b7be8db38	Adding date picker for the full history view.	2017-01-06 16:33:54 +05:30
Rasika Perera	2c9c02dc00	Replaced [EMM] with [IoT Server]	2017-01-06 16:26:59 +05:30
dunithd	41095da20c	Fixing the geo dashboard link for Android sense, Raspberry and Arduino devices	2017-01-06 15:40:13 +05:30
Hasunie	8bd06c60f2	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2017-01-06 15:12:41 +05:30
Hasunie	32d603c8f6	updating API context and publish names	2017-01-06 14:56:57 +05:30
Hasunie	d7b94a7f07	adding location,reboot operation icons	2017-01-06 14:18:20 +05:30
Rasika Perera	46494c0d74	Merge pull request #502 from dunithd/release-3.0.x ... Adding Geo Dashboard link for Arduino and RaspberryPi devices	2017-01-06 14:17:21 +05:30
Rasika Perera	81c62b3a13	Merge pull request #501 from ayyoob/release-3.0.x ... made policy manager to be part of device mgt service	2017-01-06 14:15:23 +05:30
Hasunie	0a5cafd6ef	fixing windows device view	2017-01-06 14:14:25 +05:30
Hasunie	223a973cda	adding Windows 10 location support	2017-01-06 14:12:14 +05:30
inoshperera	7da5ae239b	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-06 11:38:41 +05:30
inoshperera	22a58121d2	changing the Andrid API tag to standerdise	2017-01-06 11:38:09 +05:30
dunithd	cff23fe7aa	Adding Geo Dashboard link for Arduino and RaspberryPi devices	2017-01-06 11:11:22 +05:30
Milan Perera	86aac810ce	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-06 10:11:16 +05:30
Milan Perera	d2d912fb6d	Refactored scopes strings	2017-01-06 10:10:45 +05:30
ayyoob	f603f58fd1	moved compliance payload generation code to api impl	2017-01-05 22:06:37 +05:30
dunithd	7dc5a2000d	Adding Geo Dashboard link to device view page	2017-01-05 21:23:34 +05:30
Maninda	0c7f1adcba	Fixed some issues reported with FindBugs while security plugin is enabled.	2017-01-05 19:36:52 +05:30
ayyoob	54011d2197	removed provider tenant domain and user from the web.xml	2017-01-05 17:57:04 +05:30
ayyoob	55d200514b	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-05 17:55:17 +05:30
Rasika Perera	04fcb0a0e3	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-05 17:19:27 +05:30
Rasika Perera	4fa044357b	Replaced [Enterprise Mobility Manager] with [WSO2 IoT Server]	2017-01-05 17:16:31 +05:30
Chatura Dilan	4f486ab633	Merge pull request #498 from madhawap/release-3.0.x ... android sense fixes	2017-01-05 17:03:23 +05:30
madhawap	0aab12b1b2	android sense fixes	2017-01-05 16:59:04 +05:30
Menaka Jayawardena	a0646ff1ee	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-05 16:40:38 +05:30
ayyoob	3fa679a3e9	made policy manager to be part of device type mgt service	2017-01-05 14:37:27 +05:30
Madawa Soysa	855162c028	Improving scope annotations in windows plugin	2017-01-05 14:30:33 +05:30
Madawa Soysa	1b56ebb831	Improving scope annotations in android plugin	2017-01-05 14:26:43 +05:30
Rasika Perera	f3588c7951	config.json [usernameLength] moved to [userValidationConfig][usernameLength]	2017-01-04 22:28:12 +05:30
Rasika Perera	2550096cea	config.json [apimgt-gateway] renamed to [gatewayEnabled]	2017-01-04 22:15:01 +05:30
Rasika Perera	838223c67a	Removed unneccesary configs	2017-01-04 00:18:28 +05:30
Milan Perera	a05acad85e	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-03 15:08:13 +05:30
sinthuja	29cff5ae8a	fixing the ip resolving issue.	2017-01-03 13:31:30 +05:30
Milan Perera	45162ac155	Fixed conflicts and merged	2017-01-03 10:43:55 +05:30
GPrathap	809992fb9f	remove hardcoded oauth2 token	2017-01-02 15:33:01 +05:30
Menaka Jayawardena	c273fd4d0a	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-02 12:25:33 +05:30
WSO2 Builder	227d4685c9	[maven-release-plugin] prepare for next development iteration	2016-12-24 03:15:18 +00:00
WSO2 Builder	6c38ce6385	[maven-release-plugin] prepare release v3.0.4	2016-12-24 03:13:35 +00:00
Menaka Jayawardena	951acdd59a	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-23 12:27:14 +05:30
Ace	c302d7b25a	Coorecting version import ranges	2016-12-23 09:58:28 +05:30
Ruwan	dd9e04e75d	Merge pull request #493 from charithag/release-3.0.x-email-invites ... Release 3.0.x email invites	2016-12-22 18:38:51 +05:30
charitha	a4841d87ba	Add custom email template for android	2016-12-22 18:31:05 +05:30
Menaka Jayawardena	bdb4421a8e	Changed the url to point to the portal home page. (Sensors view)	2016-12-22 17:52:24 +05:30
Menaka Jayawardena	2fcaf12373	Code reformatting.	2016-12-22 16:42:48 +05:30
Menaka Jayawardena	81b5b1a907	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-22 16:36:14 +05:30
Menaka Jayawardena	c45a06b95a	New gadgets were added for Accelerometer, Gyroscope, Rotation and Magnetic field.	2016-12-22 16:34:45 +05:30
Menaka Jayawardena	f0d7e4648a	Android sense execution plans changed to be used with multiline charts.	2016-12-22 16:33:27 +05:30
Menaka Jayawardena	4add08545a	Removed previously created accelerometer gadgets.	2016-12-22 16:32:06 +05:30
Rasika Perera	5465cea76d	Fixing QR modal unit not found issue	2016-12-22 14:03:49 +05:30
Ace	34c4d00d4f	Bumping identity dependencies	2016-12-22 12:34:28 +05:30
Ace	8ac0971a24	Updating identity dependencies to latest	2016-12-22 11:01:56 +05:30
Geeth	b8472666ad	Merge pull request #488 from Supun94/release-3.0.x ... Support for Device Management Policy Merging	2016-12-22 10:37:59 +05:30
Rasika Perera	27e066e92a	IOTS-336: Fixing android and windows mobile agents title	2016-12-22 09:37:37 +05:30
charitha	0c2465d03e	Add enrollment invitations API EP for android	2016-12-20 23:48:21 +05:30
Menaka Jayawardena	8de3587717	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-20 12:34:10 +05:30
Menaka Jayawardena	f6927be10a	Created gadgets and streams for sensor data.	2016-12-20 12:31:49 +05:30
charitha	2211ad2a59	Update device type detail pages and moved QR modal to device mgt core	2016-12-19 15:26:29 +05:30
Ace	488c2abafa	removing slf4j from packing in the android devicemgt jaxrs	2016-12-19 15:24:02 +05:30
Charitha Goonetilleke	38903585ba	Merge pull request #486 from DimalChandrasiri/release-3.0.x ... Adding email sender changes	2016-12-19 13:46:37 +05:30
Charitha Goonetilleke	8b258ce24f	Merge pull request #485 from hasuniea/windows10 ... adding Windows10 operation and policy support	2016-12-19 13:45:55 +05:30
Ace	6697dbcc59	upgrading to latest version of identity	2016-12-19 11:38:12 +05:30
Imesh Chandrasiri	48461af2c3	Adding email sender changes	2016-12-19 11:27:43 +05:30
Imesh Chandrasiri	6464fcb615	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-19 11:12:49 +05:30
Hasunie	45fdd2a7e0	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2016-12-19 08:54:25 +05:30
Hasunie	2b2c38aa46	fixing formatting issues	2016-12-19 08:53:39 +05:30
Rasika Perera	d1842ca64c	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-19 08:41:18 +05:30
Hasunie	1d0752f09c	fixing device name issue in windows8.1 enrollment	2016-12-19 08:33:32 +05:30
Hasunie	0ffb142023	fixing windows10 enrollment endpoiny issues	2016-12-19 08:32:47 +05:30
Hasunie	965f396757	adding Device Details to Device-view UI	2016-12-19 08:21:58 +05:30
Hasunie	fcb5a354a2	fixing enrollment service issues	2016-12-19 08:11:46 +05:30
Hasunie	67e75ee38a	adding DeviceInfo operation handler	2016-12-19 08:06:36 +05:30
Supun94	57f0ea7ce4	Changing policy compliance view	2016-12-19 04:57:17 +05:30
Imesh Chandrasiri	da4eb14144	Device view changes for email invite and agent download	2016-12-16 14:56:15 +05:30
Megala	600e2529bd	Fixing race conditions in refresh token generation	2016-12-16 14:10:38 +05:30
Rasika Perera	a08e58a574	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-16 12:43:55 +05:30
Ruwan	bb1435e273	Merge pull request #482 from menakaj/release-3.0.x ... Android Sense Analytics script modifications.	2016-12-16 10:46:39 +05:30
Menaka Jayawardena	9f4f70af61	Disabled unused battery script deployment.	2016-12-16 10:39:34 +05:30
Menaka Jayawardena	d4851c9815	Corrected android headset script name.	2016-12-16 10:38:11 +05:30
Menaka Jayawardena	08a0a290c2	Fixed : SMS Script not executing automatically.	2016-12-16 10:36:47 +05:30
Hasunie	d82670fa94	fixing windows annotation issues	2016-12-15 18:38:13 +05:30
Hasunie	c03a2fabc7	adding DeviceInfo properties	2016-12-15 16:46:26 +05:30
Hasunie	b3ffc7fdd7	adding win10 alert constants	2016-12-15 16:45:44 +05:30
Hasunie	1eb8c8e9db	adding win10 operation trigger alert	2016-12-15 16:44:49 +05:30
Hasunie	6857ba1b74	adding Device Info to win10	2016-12-15 16:43:14 +05:30
sinthuja	3d504afa35	Fixing issues in the full history view in geo fence.	2016-12-15 16:12:02 +05:30
Hasunie	69ebf70484	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2016-12-15 14:53:33 +05:30
Hasunie	db03b6fc19	refactoring windows UI	2016-12-15 14:51:09 +05:30
Hasunie	19f289c8fa	adding windows operation properties	2016-12-15 14:46:21 +05:30
Hasunie	158e5fca2a	removing services path	2016-12-15 14:38:20 +05:30
Hasunie	90ad21e960	adding bean refference for win10	2016-12-15 14:35:24 +05:30
Hasunie	fc7d86801f	fixing windows8.1 Device name issue	2016-12-15 14:34:15 +05:30
Hasunie	9571d782c8	configure to enroll win10 on csr sigining step	2016-12-15 14:27:36 +05:30
Hasunie	b9b5edc342	adding new devicemanegement endpoint to getpending operations	2016-12-15 14:26:07 +05:30
Hasunie	c52c292d15	adding Device-Info operation	2016-12-15 14:25:01 +05:30
Hasunie	84a6522cb8	removing unwanted values from notification	2016-12-15 14:18:15 +05:30
Hasunie	120283adf4	adding windows10 csp	2016-12-15 14:09:54 +05:30
Megala	39bb1f92ba	Removing hard coded values and adding missing file	2016-12-15 14:05:16 +05:30
Hasunie	89a4482124	adding windows 10 plugin constants	2016-12-15 14:02:07 +05:30
Hasunie	471c8c628b	deleting unused hbs file	2016-12-15 13:59:39 +05:30
Menaka Jayawardena	ba5486c05c	Typo fixed in analytics scripts.	2016-12-14 18:08:57 +05:30
sinthuja	b223f7374e	Committing the changes for the android persisted goe alert.	2016-12-14 17:13:43 +05:30
sinthuja	550322fc0f	Merge pull request #479 from menakaj/release-3.0.x ... Removed unwanted artifact dependency.	2016-12-14 16:57:47 +05:30
Menaka Jayawardena	e47ae4cad2	Removed unwanted artifact dependancy.	2016-12-14 15:08:37 +05:30
Imesh Chandrasiri	fe195ca8f7	UI Fixes	2016-12-14 14:03:41 +05:30
Megala	0b1acaa990	Updating the agent apk file	2016-12-14 10:56:03 +05:30
Milan Perera	72a33b7930	Fixed conflicts and merged	2016-12-14 09:20:42 +05:30
Megala	ec5936d013	Updating the apk file to switch between event enabling and disabling	2016-12-13 19:37:42 +05:30
Megala	5eefdfc2c0	Merge remote-tracking branch 'upstream/release-3.0.x' into embed	2016-12-12 17:56:39 +05:30
Hasunie	316362e974	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10	2016-12-12 00:52:27 +05:30
Hasunie	d3bf748233	implementing windows10 devicemgt session	2016-12-12 00:34:23 +05:30
Hasunie	b57573ecae	Merging relese-3.0.x	2016-12-12 00:27:16 +05:30
Rasika Perera	b5e220799a	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-09 18:39:59 +05:30
WSO2 Builder	a398686ec7	[maven-release-plugin] prepare for next development iteration	2016-12-09 05:46:04 +00:00
WSO2 Builder	3bafccc303	[maven-release-plugin] prepare release v3.0.3	2016-12-09 05:43:17 +00:00
Hasunie	359bd948d2	Fixing bst issue	2016-12-09 10:53:07 +05:30
Hasunie	222ef41a3f	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-09 10:43:50 +05:30
Chatura Dilan	49d81766f6	fixed conflicts	2016-12-09 10:35:36 +05:30
Chatura Dilan	e22d4d3530	Fixed UI issues in the policy screen	2016-12-09 10:29:53 +05:30
Megala	5b7b4124b0	Adding minor UI fixes	2016-12-09 10:10:47 +05:30
Hasunie	0e680ab26b	fixing json provider issue in windows cxf	2016-12-09 09:36:27 +05:30
Milan Perera	6ad6bbbdc0	Commiting permission-scope mapping improvements	2016-12-08 20:41:44 +05:30
Charitha Goonetilleke	6cea2f19fc	Merge pull request #470 from hasuniea/release-3.0.x ... fixing message issue in configurationmgtservice	2016-12-08 20:08:24 +05:30
charitha	a49a5650c6	Fix issues	2016-12-08 20:07:16 +05:30
Hasunie	34153371d3	fixing message issue in configurationmgtservice	2016-12-08 19:15:34 +05:30
charitha	1598748a5b	Merge branch 'release-3.0.x' of https://github.com/menakaj/carbon-device-mgt-plugins into release-3.0.x	2016-12-08 19:13:31 +05:30
charitha	5d7fd0d66d	Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x	2016-12-08 19:00:22 +05:30
Harshan Liyanage	ce5d907801	Added operation bar.json	2016-12-08 18:55:50 +05:30
Harshan Liyanage	2f7214cd5b	Resolved conflicts in device type-vies files.	2016-12-08 18:31:53 +05:30
Harshan Liyanage	f55cd20a73	Resolved conflicts in device type-vies files.	2016-12-08 18:27:56 +05:30
Ruwan	82c0af1053	Merge pull request #467 from madhawap/release-3.0.x ... Adding separate tasks to carry out device monitoring for each device type	2016-12-08 18:12:59 +05:30
Harshan Liyanage	26bbb55af5	Resolved conflicts with release-3.0.x	2016-12-08 18:07:14 +05:30
Menaka Jayawardena	bad0331dc7	Added new Android Sense Agent	2016-12-08 17:56:29 +05:30
madhawap	6618b919d1	Adding separate tasks to carry out device monitoring for each device type	2016-12-08 17:40:43 +05:30
Charitha Goonetilleke	34fb3cad0b	Merge pull request #459 from menakaj/release-3.0.x ... Android Sense stabilization	2016-12-08 17:23:57 +05:30
Hasunie	68cabad5b8	deleting unused components	2016-12-08 16:43:05 +05:30
Harshan Liyanage	559fa3fe38	Resolved conflicts	2016-12-08 16:40:18 +05:30
Menaka Jayawardena	862a14c2b5	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-08 16:37:52 +05:30
Menaka Jayawardena	e0afb8d205	Refactoring Android Sense agent. ... Increased the battery data retrieving sequence. Completed network data reading implementation. The data publishing interval is changed to 1000ms.	2016-12-08 16:36:29 +05:30
Hasunie	d2d39a241e	adding error handler	2016-12-08 16:18:01 +05:30
Hasunie	b3eacb99cd	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-08 16:06:17 +05:30
Hasunie	36cbc96713	adding swagger annotations	2016-12-08 16:04:46 +05:30
Madawa Soysa	548213d601	Fixing issue with COSU policy configuration	2016-12-08 14:22:23 +05:30
Rasika Perera	f8817988b6	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-08 14:03:18 +05:30
Madawa Soysa	22dccce027	IOTS-296: Moving windows operation-mod to android plugin ... This commit moves the operation-mod functions to windows plugin and refactor policy CRUD code to use plugin specific operation mod functions.	2016-12-08 12:26:36 +05:30
Menaka Jayawardena	49ee7c2986	Added new battery history chart gadget.	2016-12-08 12:16:22 +05:30
Menaka Jayawardena	779435a91d	Persisting battery data stream and added analytics scripts.	2016-12-08 12:15:43 +05:30
Madawa Soysa	0b8db53b91	IOTS-296: Moving android operation-mod to android plugin ... This commit moves the operation-mod functions to android plugin and refactor policy CRUD code to use plugin specific operation mod functions.	2016-12-08 10:32:35 +05:30
Rasika Perera	c722dfa779	Adding ui permissions to the operations on android	2016-12-07 22:57:53 +05:30
Menaka Jayawardena	2bd3c4a50c	Added android sense battery execution plan.	2016-12-07 17:19:27 +05:30
Megala	f808478c92	Fixing bundle loading problem	2016-12-07 15:29:32 +05:30
inoshperera	fc3cb449be	adding UI for clear passcode	2016-12-07 14:35:22 +05:30
Menaka Jayawardena	0e32b646d3	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x ... # Conflicts: # components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs	2016-12-07 12:09:50 +05:30
Menaka Jayawardena	8ad1b0a891	Removed unwanted analytics graphs and added redirect to portal app.	2016-12-07 11:57:46 +05:30
Megala	82c2227929	Merge remote-tracking branch 'upstream/release-3.0.x' into embed	2016-12-07 11:03:48 +05:30
sinthuja	f23fd9c85f	Merge branch 'android-sense-agent-fixes' into release-3.0.x	2016-12-07 11:00:49 +05:30
Hasunie	0456502bbe	implementing windows 10 enrollment	2016-12-07 09:18:43 +05:30
Menaka Jayawardena	8a759db8da	Changed the type check of location execution plan to 'gps'.	2016-12-07 01:32:18 +05:30
Megala	6e23d498b8	Fixing the parent path problem	2016-12-06 21:35:44 +05:30
Charitha Goonetilleke	7fa0a4b11f	Merge pull request #454 from madawas/IOTS-296 ... IOTS-296: Genaralizing policy view UI for windows and android	2016-12-06 19:11:24 +05:30
charitha	5fc3e82d35	Fix agent download issue	2016-12-06 19:00:56 +05:30
sinthuja	ce8134bd28	Merge pull request #456 from Megala21/embed ... Fixing the version problem	2016-12-06 17:46:33 +05:30
Megala	5a3809b493	Fixing the version problem	2016-12-06 17:40:27 +05:30
sinthuja	fa933059da	Merge pull request #455 from Megala21/embed ... Adding siddhi extension and analytics for android-agent	2016-12-06 17:32:50 +05:30
Megala	363dedaedd	Adding the focus point for map	2016-12-06 17:29:41 +05:30
Megala	02f87e7531	Removing unwanted files	2016-12-06 17:26:35 +05:30
Menaka Jayawardena	a2e8537fcf	Changed the realtime gadgets to get query parameters.	2016-12-06 17:26:00 +05:30
Ace	17f82d1da3	Adding changes to descriptor and ui changes	2016-12-06 17:22:45 +05:30
Megala	4bfd9a72b6	Adding siddhi extension and analytics for android-agent	2016-12-06 17:18:20 +05:30
sinthuja	6426a87c8d	Fixing 'The cache status is not STARTED' issue whe sending the events from android sense.	2016-12-06 16:40:18 +05:30
Rasika Perera	ac51eadade	Merge pull request #423 from ctienshi/master ... Corrected spelling mistake	2016-12-06 16:36:43 +05:30
inoshperera	d3c5625eec	Merge pull request #451 from inoshperera/master ... adding a button and connection to ios factory reset backend API	2016-12-06 13:53:52 +05:30
Ace	3d21f84a76	merging with upstream	2016-12-06 13:34:28 +05:30
Ace	3dd59ed250	Adding changes to descriptor and ui changes	2016-12-06 13:31:41 +05:30
Madawa Soysa	cb44d9a824	IOTS-296: Genaralizing policy view UI for windows and android ... Moving device type specific UI components related to policy view. This commit includes modifications for both android and windows plugins.	2016-12-06 12:22:25 +05:30
sinthuja	59fd3a6fc7	Merge pull request #450 from menakaj/android-sense-agent-fixes ... Android sense agent fixes	2016-12-06 10:53:38 +05:30
Menaka Jayawardena	1cb9be42fd	Corrected package names.	2016-12-05 21:49:15 +05:30
Menaka Jayawardena	9e92fc6963	Added classes for reading network data.	2016-12-05 21:48:22 +05:30
Imesh Chandrasiri	c884ec34d1	Fixing text overlapping and UX issues in device pages commit 2	2016-12-05 16:20:32 +05:30
Imesh Chandrasiri	f642b18b29	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-05 16:13:41 +05:30
Imesh Chandrasiri	ba0eea6344	Fixing text overlapping and UX issues in device pages	2016-12-05 16:13:23 +05:30
Megala	ba0c973aa9	Addding execution plan	2016-12-05 15:32:21 +05:30
Megala	453989db03	Adding execution plan for android sense geolocation	2016-12-05 15:27:55 +05:30
Menaka Jayawardena	60cc084170	Modifications for Android Sense app. ... 1. Updated agent enrollment process. 2. Fixed ArrayIndexOutOfBound exception when enrolling. 3. Added Network data to the event stream.	2016-12-05 15:10:44 +05:30
Charitha Goonetilleke	c9a8566e94	Merge pull request #446 from DimalChandrasiri/release-3.0.x ... Layout changes for device enrollment views	2016-12-05 14:19:44 +05:30
sinthuja	9e9a480486	Merge pull request #447 from Megala21/embed ... Adding minor fixes to geo fencing	2016-12-05 14:12:30 +05:30
Megala	f851b15e49	Reverting changes to android-sense	2016-12-05 13:49:20 +05:30
Megala	e55c380120	Removing the hard coded type	2016-12-05 13:43:15 +05:30
Charitha Goonetilleke	e4ce5a29fa	Merge pull request #445 from GPrathap/release-3.0.x ... added expiration time of application access token	2016-12-05 12:53:28 +05:30
Imesh Chandrasiri	446e2427e0	Layout changes for device enrollment views commit 2	2016-12-05 12:15:29 +05:30
Imesh Chandrasiri	b55c64d551	Layout changes for device enrollment views	2016-12-05 11:49:40 +05:30
Ace	749f680dad	Adding missed configurations	2016-12-05 10:42:01 +05:30
Ace	8a96aa204c	Adding generalizations to android-operations bar	2016-12-05 10:35:40 +05:30
GPrathap	752b2e8dbf	added expiration time of application access token	2016-12-05 09:57:10 +05:30
Megala	7045a94615	Changing the publishes and execution plans to work with android-sense	2016-12-03 23:02:10 +05:30
Megala	09805d451c	Adding initial fixes for geo dashboard	2016-12-03 02:59:53 +05:30
Madawa Soysa	3ed9b530f5	IOTS-296: Generalizing policy UI for windows device type ... This commit includes moving policy flow device type specific client side logic and UI components to the windows plugin.	2016-12-02 17:06:02 +05:30
Madawa Soysa	37f0bc396d	IOTS-296: Moving policy profile generation to android plugin ... Policy profile generation part is removed from the CDMF core and moved to plugins as policy profile is dependent on the device type. In this commit, policy profile generation for android device type is implemnted in android plugin.	2016-12-02 17:03:19 +05:30
WSO2 Builder	619dab548e	[maven-release-plugin] prepare for next development iteration	2016-12-01 13:52:49 +00:00
WSO2 Builder	4a0aa3be8e	[maven-release-plugin] prepare release v3.0.2	2016-12-01 13:50:48 +00:00
charitha	ee496d93fe	removed unnecessary logs	2016-12-01 17:18:57 +05:30
charitha	e6eb6bb2d2	Merge branch 'release-3.0.x' of https://github.com/hasuniea/carbon-device-mgt-plugins into release-3.0.x	2016-12-01 17:08:57 +05:30
charitha	693515c4df	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-01 16:48:05 +05:30
madhawap	d7c3f5c18a	refactored code	2016-12-01 16:34:49 +05:30
Hasunie	8ff55aada8	changing add enromment	2016-12-01 16:21:57 +05:30
Hasunie	b19629ab23	adding windows enrollment image	2016-12-01 16:20:05 +05:30
madhawap	d66292f933	refactored code	2016-12-01 16:11:01 +05:30
madhawap	429b52f037	resolve conflicts	2016-12-01 16:04:43 +05:30
madhawap	3249079965	Seperate out task operations	2016-12-01 15:41:07 +05:30
Megala	5ec4e7dcb2	Adding IOT statistics dashboard feature	2016-12-01 14:06:01 +05:30
Hasunie	fc10431b41	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-01 09:42:40 +05:30
Hasunie	35ba0b2a9b	fixing windows enrollment flow	2016-12-01 09:40:29 +05:30
Hasunie	0fd317d027	adding windows operation bar	2016-12-01 09:35:01 +05:30
Hasunie	fa6ef30d17	fixing windows device view issues	2016-12-01 09:26:14 +05:30
charitha	721e6e2321	Bug fixes	2016-11-30 19:06:27 +05:30
Ruwan	84dd19a53c	Merge pull request #437 from charithag/release-3.0.x ... Move geo dashboard to components	2016-11-30 18:26:15 +05:30
charitha	2ca8e732de	Move geo dashboard to components	2016-11-30 18:15:33 +05:30
Chatura Dilan	7dc3535af6	Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x	2016-11-30 17:24:35 +05:30
Chatura Dilan	df20fbc0aa	Added COSU policy wizard	2016-11-30 17:24:13 +05:30
Charitha Goonetilleke	621ef6fd37	Merge pull request #436 from ruwany/release-3.0.x ... Adding android operations-bar related changes	2016-11-30 17:09:33 +05:30
Ace	326d59e7c1	Adding android operations-bar related changes	2016-11-30 16:51:49 +05:30
Charitha Goonetilleke	ac50d49e8f	Merge pull request #435 from lgobinath/feature-android-analytics-new-sensors ... Add new sensors to the android sense plugin	2016-11-30 15:06:34 +05:30
Gobinath	ab418dbde3	Add new sensors to the android sense plugin ... Incoming and outgoing calls tracker Screen on off detector SMS tracker Audio playing and headset tracker Application install and uninstall detector User activity detector	2016-11-30 14:55:53 +05:30
GPrathap	00a12f3ae1	removed oauth token sending as query param	2016-11-30 12:52:51 +05:30
GPrathap	b3a7ed91c0	oauth token retrieval mechanism changed ... Now oauth token is taken from http cookie	2016-11-30 12:50:50 +05:30
Madawa Soysa	215fd51ffb	Merge pull request #426 from madawas/IOTS-296 ... IOTS-296: Generalizing policy UI for Android device type	2016-11-29 18:37:32 +05:30
WSO2 Builder	4ae70fe1f1	[maven-release-plugin] prepare for next development iteration	2016-11-29 10:24:35 +00:00
WSO2 Builder	42c2b04c62	[maven-release-plugin] prepare release v2.2.7	2016-11-29 10:12:05 +00:00
Harshan Liyanage	3787ae1431	Merge pull request #431 from wso2/release-2.2.6 ... Updating component versions after release.	2016-11-29 15:34:08 +05:30
Harshan Liyanage	3673e38274	Updated android agent apk	2016-11-29 15:24:39 +05:30
WSO2 Builder	ab087bf934	[maven-release-plugin] prepare for next development iteration	2016-11-29 07:23:41 +00:00
WSO2 Builder	072dd089ef	[maven-release-plugin] prepare release v2.2.6	2016-11-29 07:21:29 +00:00
Hasunie	1038c23c98	adding windows qr-code scanner	2016-11-29 11:24:22 +05:30
Harshan Liyanage	02baf19cc7	Added latest android agent	2016-11-29 10:35:14 +05:30
inoshperera	a9ca9cf352	adding a fix for web app user retrival.	2016-11-28 22:36:48 +05:30
Madawa Soysa	ea7da0724f	IOTS-296: Generalizing policy UI for Android device type ... This commit includes moving policy flow device type specific client side logic and UI components to the android plugin.	2016-11-28 16:45:10 +05:30
inoshperera	c36681baac	Fixing the issue of duplicate application operations being set to the same device.	2016-11-28 16:18:46 +05:30
dilanua	4e001afef2	Changing emm device statistics menu item to work with relative path	2016-11-28 15:19:35 +05:30
geethkokila	b7f3691d90	Fixing the app manager issue by calling the correct getDevices method	2016-11-27 07:40:44 +05:30
dilanua	6de9925198	Changing EMM device statistics menu icon	2016-11-26 09:29:24 +05:30
dilanua	9fb5c3fd93	Fixes to JIRA: https://wso2.org/jira/browse/EMM-1845	2016-11-26 08:30:54 +05:30
Megala	7b3be4294e	Fixing problems in displaying operation bar for ios	2016-11-25 15:49:10 +05:30
ching	074e500cda	Corrected spelling mistakes in the UI	2016-11-25 15:28:00 +05:30
ching	c8315101c3	Corrected spelling mistakes in the UI	2016-11-25 15:23:59 +05:30
WSO2 Builder	bfa2c5fa61	[maven-release-plugin] prepare for next development iteration	2016-11-25 09:14:26 +00:00
WSO2 Builder	09d434bda9	[maven-release-plugin] prepare release v3.0.1	2016-11-25 09:11:13 +00:00
Charitha Goonetilleke	cd30635715	Merge pull request #422 from DimalChandrasiri/IoTS-1.0.0 ... Changes for IoT build	2016-11-25 11:00:44 +05:30
Megala	6c9c4a15fd	Removing the sender id	2016-11-25 09:44:23 +05:30
sinthuja	4da1d5ec3a	Adding JSON message format support for secure-websocket.	2016-11-25 00:08:09 +05:30
GPrathap	dca34e7fb3	added cron expression	2016-11-24 18:46:16 +05:30
Imesh Chandrasiri	bc075dedf0	Changes for IoT build	2016-11-24 18:29:35 +05:30
inoshperera	78232cd34c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-11-24 16:09:04 +05:30
inoshperera	18c0760ba5	Changing gcm endpoint to fcm	2016-11-24 16:08:48 +05:30
Harshan Liyanage	e1afb5bcdc	Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins	2016-11-24 13:40:06 +05:30
inoshperera	3b867a533d	fixing http status code	2016-11-24 12:46:33 +05:30
Harshan Liyanage	6cc3f39dd3	Added security filters to emm-web-agent app	2016-11-24 12:36:36 +05:30
GPrathap	dd86f91de6	moved from org.wso2.carbon.device.mgt.iot.androidsense.analytics2	2016-11-23 23:49:51 +05:30
inoshperera	d9a449dd26	adding modify enrollment capability to save chnages in enrollment such as GCM token update	2016-11-23 12:36:05 +05:30
ayyoob	cf5525dc3f	removed device type and feature annotation	2016-11-21 20:55:12 +05:30
ayyoob	d6bfce396d	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0	2016-11-21 19:18:32 +05:30
ayyoob	c7a29f0637	few changes in coding issues	2016-11-21 19:14:21 +05:30
sinthuja	cf1782391f	Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0	2016-11-21 17:10:28 +05:30
sinthuja	d3d176ebdc	fixing some issues in the andriod analytics carbon apps.	2016-11-21 17:10:10 +05:30
inoshperera	b027f5dbe9	adding a button and connection to ios factory reset backend API	2016-11-21 11:53:33 +05:30
Ace	f3de1cf85e	Adding windows-web-agent	2016-11-21 11:15:30 +05:30
dilanua	1cce94cef9	Fixing operation button stuck issue	2016-11-20 22:31:27 +05:30
GPrathap	3d971d2bb7	removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations	2016-11-20 19:04:11 +05:30
dilanua	861c5f861e	Updating device statistics menu item url	2016-11-20 12:09:59 +05:30
dilanua	dbeedf246b	Adding deviceStatisticsEnabled property to check visibility of device-statistics menu item	2016-11-20 10:55:56 +05:30
ayyoob	bfb9c62968	changed device access verification approach	2016-11-20 02:37:42 +05:30
dilanua	edd400bde4	Changing menu item names	2016-11-18 19:54:59 +05:30
Ruwan	93ed31c584	Merge pull request #413 from ayyoob/IoTS-1.0.0 ... changes in operation bar and deployer files	2016-11-18 16:52:08 +05:30
ayyoob	68f1fb34fe	changes in operation bar and deployer.xml	2016-11-17 23:33:26 +05:30
sinthuja	f3fc531a53	Adding the new version of android analytics carbon apps.	2016-11-17 22:51:54 +05:30
WSO2 Builder	61ca4c4900	[maven-release-plugin] prepare for next development iteration	2016-11-16 13:57:06 +00:00
WSO2 Builder	4746bf0c74	[maven-release-plugin] prepare release v3.0.0	2016-11-16 13:55:17 +00:00
Ace	ae33d236fa	Adding android device-view changes	2016-11-16 15:43:23 +05:30
Ace	7e3df67548	Adding android-base-plugin	2016-11-16 15:07:44 +05:30
charitha	1170263139	Update component versions for IoTS-1.0.0 release	2016-11-16 13:32:45 +05:30
Dilan U. Ariyaratne	9c69e914e0	Merge pull request #409 from Megala21/master ... Adding additional configurations to SSO	2016-11-16 11:04:25 +05:30
inoshperera	e25e9fd4a1	adding support for webclip uninstallation for ios	2016-11-16 09:33:43 +05:30
Megala	3ff394902e	Removing unnecessary require statements	2016-11-15 23:04:51 +05:30
Megala	6d3fbc422f	Adding link for the dashboard in tenant mode	2016-11-15 22:59:12 +05:30
Megala	57e46525f8	Changing the dashboard menu to be only visible for super-tenant users	2016-11-15 10:25:33 +05:30
Megala	dec2950f6e	Adding additional configurations for app-conf	2016-11-13 19:21:15 +05:30
Malintha Fernando	5722a9fbe6	Fixing javax.xml.parsers.import.pkg.version issue	2016-11-11 14:04:23 +05:30
Ace	ea14e32337	Adding android-web-agent	2016-11-11 10:05:12 +05:30
Malintha Fernando	09f004bfd8	importing javax.xml package for javax.xml.XMLConstants	2016-11-11 06:38:36 +05:30
sinthuja	0ef0d871fb	fixing the issues when reading the mqtt receiver configurations.	2016-11-10 21:23:14 +05:30
Kamidu Sachith Punchihewa	218e7aa58f	Merge pull request #406 from Malintha/master ... Adding secured documentBuilder factory	2016-11-10 15:08:25 +05:30
Malintha Fernando	13cb358153	Adding secured documentBuilder factory	2016-11-10 15:04:03 +05:30
Ace	3d32ad984c	Adding fixes to android qr-gen code	2016-11-10 12:08:05 +05:30
kamidu	f5c3a55aa8	add dashboard link to emm webapp	2016-11-10 11:06:35 +05:30
sinthuja	6bb0387dac	Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0	2016-11-09 16:07:42 +05:30
sinthuja	3001a31a33	updating the secure-ui publisher name.	2016-11-09 16:07:29 +05:30
Madawa Soysa	40907a954a	Adding cache prevention filter to emm-web-agent app	2016-11-09 15:06:02 +05:30
Ace	cea96cc841	Merging with master	2016-11-09 12:54:33 +05:30
Chatura Dilan	47ba440fbb	fixed extends	2016-11-09 12:36:37 +05:30
Chatura Dilan	ca2d837ecc	Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0	2016-11-08 18:05:02 +05:30
Chatura Dilan	9e78b87365	Fixed issue in device operation bar	2016-11-08 18:04:42 +05:30
Chatura Dilan	d6701ee04c	Fixed issue in device view UI	2016-11-08 18:02:47 +05:30
Chatura Dilan	1f4cda26e9	Merge pull request #403 from GPrathap/IoTS-1.0.0 ... adding mb mqtt authorization extension	2016-11-08 16:05:30 +05:30
GPrathap	136f2f34b1	changing MQTT message broker port to 1886	2016-11-08 15:59:04 +05:30
GPrathap	c96f2a8162	adding mb mqtt authorization extension	2016-11-08 15:53:09 +05:30
Chatura Dilan	49dd83ed33	Adding CDMF operation bar to Android	2016-11-08 15:16:10 +05:30
Chatura Dilan	b207e5d624	Added missing units	2016-11-08 15:08:57 +05:30
ayyoob	ecdbf6d272	few changes in sample device types to load cdmc specific units	2016-11-07 00:51:47 +05:30
Ace	7d14e23d00	merging with upstream	2016-11-04 20:09:13 +05:30
Ace	daf37338c6	merging changes with upstream ... partial	2016-11-04 19:41:33 +05:30
Ace	46ad530735	adding missing files ... continuation from restructuring effort.	2016-11-04 19:17:21 +05:30
Ace	e38941e81e	restructuring iot-plugins ... removing mobile/iot base plugins and other restructuring	2016-11-04 19:16:44 +05:30
Chatura Dilan	3227f3f650	Chages to device view for Android	2016-11-04 11:17:41 +05:30
Chatura Dilan	269376a135	Changes to Android operation bar	2016-11-03 15:22:17 +05:30
Chatura Dilan	76887c4277	Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0	2016-11-03 14:50:55 +05:30
Chatura Dilan	1e3d8021e9	Adding Android and Windows operation bars	2016-11-03 14:48:14 +05:30
Megala	411d006f5e	Updating apk	2016-11-02 11:15:52 +05:30
ayyoob	685d57b452	merged with origin	2016-11-02 09:44:42 +05:30
ayyoob	bd05fb721a	merged with origin IoTS-1.0.0	2016-11-02 07:47:48 +05:30
sinthuja	d5a68fb5a9	Removing the mistakenly added getAllDevices permission from the andriod sense API	2016-11-01 18:38:34 +05:30
sinthuja	aa423787e8	Removing the mistakenly added getAllDevices from the andriod sense API	2016-11-01 18:37:09 +05:30
sinthuja	96e0ef92d7	Adding changes related to removing DAS components.	2016-11-01 18:35:09 +05:30
charitha	b5e8df5ddb	Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0	2016-11-01 15:05:26 +05:30
charitha	6d10f5c9fb	Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0	2016-11-01 15:02:41 +05:30
WSO2 Builder	c9861e9636	[maven-release-plugin] prepare for next development iteration	2016-10-31 11:57:15 +00:00
WSO2 Builder	3e664dc304	[maven-release-plugin] prepare release v2.2.5	2016-10-31 11:55:04 +00:00
kamidu	4acc2b6925	Fix for ios device details view	2016-10-31 16:30:06 +05:30
kamidu	cab7a8c2d6	Fiz ios related numeric view	2016-10-31 14:40:15 +05:30
kamidu	af9c525594	Fixing styling issues and adding new apk	2016-10-31 14:33:36 +05:30
kamidu	a9308c3f22	removing the unnessary ' ' from hbs files	2016-10-31 11:59:29 +05:30
Rasika Perera	a40ce98698	Make analytics and groups view disable for mobile plugins	2016-10-29 23:47:36 +05:30
Kamidu Sachith Punchihewa	4cd74f0a5c	Merge pull request #393 from Megala21/master ... Fixing EMM-1792	2016-10-28 08:39:42 +05:30
Harshan Liyanage	e7d79044d6	Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins	2016-10-28 01:59:54 +05:30
Harshan Liyanage	d92c89048a	EMM-1783:Fix for enterprise and public ios app installation & uninstallation	2016-10-28 01:59:34 +05:30
Megala	53efe7d0d6	changing the android-agent according to new change	2016-10-27 23:51:59 +05:30
Megala	55efa84834	Fixing EMM-1792	2016-10-27 23:21:20 +05:30
Harshan Liyanage	494b545c4b	Merge pull request #392 from Megala21/master ... Fixing EMM-1787	2016-10-27 17:18:16 +05:30
Megala	287d27a332	Fixing EMM-1787	2016-10-27 16:35:45 +05:30
hasuniea	78e9d74031	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-27 13:33:26 +05:30
hasuniea	afd8e16c4c	fixing ios LDAP issue	2016-10-27 13:32:50 +05:30
Harshan Liyanage	242253b8f2	Merge pull request #391 from shavidissa/master ... Added swagger annotations and refined the messages	2016-10-27 12:21:26 +05:30
Shavindri	f6c0aeecfc	Added swagger annotations and refined the messages	2016-10-27 12:05:17 +05:30
kamidu	3f39ebf757	Fix for EMM-1766	2016-10-27 09:23:40 +05:30
kamidu	5b6289326b	Fixing ui issues in policy management	2016-10-26 18:37:54 +05:30
kamidu	de60fa325e	Fix the ios- manage domain policy issue	2016-10-26 17:41:35 +05:30
Kamidu Sachith Punchihewa	5396a4ca9e	Merge pull request #380 from madawas/modal-refactor ... Refactoring pages to use new modal unit	2016-10-26 17:26:14 +05:30
inoshperera	b0ccf2d27d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-26 15:18:02 +05:30
inoshperera	87fc819364	fixing EMM-1788 calDAV policy validation issue	2016-10-26 15:17:52 +05:30
Harshan Liyanage	4fdc358786	Merge pull request #387 from Megala21/master ... Fixing EMM-1779	2016-10-26 12:26:40 +05:30
Megala	fcdce211b7	Changing the required fields use css to add astriek	2016-10-26 11:57:56 +05:30
Saad Sahibjan	91f0722b1d	Fix for variable declaration with single var	2016-10-26 10:24:55 +05:30
Megala	b752dc4d90	Merge remote-tracking branch 'upstream/master'	2016-10-26 09:16:45 +05:30
Megala	e23ecc5b64	Fixing EMM-1779	2016-10-25 17:34:53 +05:30
ayyoob	391cdbb435	avoided lazy initialization	2016-10-25 14:01:51 +05:30
ayyoob	ed708852dc	fixed formatting issues	2016-10-25 13:58:01 +05:30
ayyoob	968fa4f837	added message directly to log	2016-10-25 13:57:36 +05:30
kamidu	51dac16206	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-25 12:06:17 +05:30
kamidu	8af596702b	Fix payload issues in manage payload policy	2016-10-25 12:05:08 +05:30
Saad Sahibjan	eff6c9d367	Fix spacing issue	2016-10-25 12:00:54 +05:30
Saad Sahibjan	2d020f611e	Merge conflicts	2016-10-25 11:32:21 +05:30
Geeth	00be80eb2a	Merge pull request #382 from inoshperera/master ... fixing EMM-1714 by removing the supervised mode only operations from …	2016-10-25 09:53:04 +05:30
inoshperera	b554ff76e8	fixing EMM-1714 by removing the supervised mode only operations from the UI	2016-10-25 09:44:17 +05:30
kamidu	0251ba2a4a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-24 16:49:26 +05:30
kamidu	7f4e1e3da0	Fix the ui issues in policy view,edit and create and device view sections	2016-10-24 16:48:49 +05:30
Megala	465ea0154d	Fixing EMM-1778	2016-10-24 14:51:12 +05:30
ayyoob	8cbd68bcc6	few changes after testing the configs	2016-10-24 11:41:15 +05:30
Saad Sahibjan	5f50059d49	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-24 10:49:57 +05:30
Madawa Soysa	a31940e9d9	Refactoring pages to use new modal unit	2016-10-24 10:36:46 +05:30
ayyoob	b195759dcf	refactored device type after changes done for the deployer	2016-10-24 09:41:31 +05:30
ayyoob	8906d964b0	refactored device type after changes done for the deployer	2016-10-24 09:40:53 +05:30
dilanua	a2d9d4302c	Fixing feature configured icon malfunctioning issue on switch double-click	2016-10-23 20:41:59 +05:30
ayyoob	59baa97926	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into st2	2016-10-23 14:36:05 +05:30
ayyoob	aa518e6b6c	few changes to support the deployer	2016-10-23 14:24:15 +05:30
ayyoob	23138855a7	added changes in feature extraction for device types	2016-10-23 01:24:58 +05:30
hasuniea	2bc0d31af9	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-21 22:21:42 +05:30
hasuniea	e63c2dd321	fixing ios email config policy issue	2016-10-21 22:21:31 +05:30
WSO2 Builder	19e0d65db0	[maven-release-plugin] prepare for next development iteration	2016-10-21 11:27:51 +00:00
WSO2 Builder	537a99d05d	[maven-release-plugin] prepare release v2.2.4	2016-10-21 11:25:53 +00:00
kamidu	d460cf1370	Fixing wifi payload issue in ios policies	2016-10-21 16:33:44 +05:30
kamidu	79a25f15b7	Fix for ui issues in policy creation	2016-10-21 16:21:36 +05:30
Saad Sahibjan	3d90487466	Fix incorrect spacing - AFW COSU	2016-10-21 15:02:29 +05:30
Saad Sahibjan	ccdc64152c	Fix incorrect spacing - AFW COSU	2016-10-21 14:56:38 +05:30
Saad Sahibjan	10e0ddd8b3	Fix incorrect spacing - AFW COSU	2016-10-21 14:31:32 +05:30
Saad Sahibjan	af4fdb0fdc	Fix incorrect spacing - AFW COSU	2016-10-21 14:12:17 +05:30
dilanua	76827640f0	Fixing JIRA: https://wso2.org/jira/browse/EMM-1767	2016-10-20 15:13:03 +05:30
dilanua	67d660ef1f	Fixing JIRA: EMM-1765	2016-10-19 19:08:34 +05:30
Vishanth	b3d89e38eb	fixing the ios wifi payload	2016-10-19 17:28:23 +05:30
Saad Sahibjan	6f0b7cb5b7	Remove blank line space - AFW COSU	2016-10-19 15:37:27 +05:30
WSO2 Builder	b095196e65	[maven-release-plugin] prepare for next development iteration	2016-10-18 15:36:09 +00:00
WSO2 Builder	d455b13e62	[maven-release-plugin] prepare release v2.2.3	2016-10-18 15:33:59 +00:00
Kamidu Sachith Punchihewa	932d43f272	Merge pull request #371 from wso2/release-2.2.3 ... Release 2.2.3	2016-10-18 20:31:38 +05:30
kamidu	86174cc1cc	Version uodate and ui fixes	2016-10-18 20:28:57 +05:30
Kamidu Sachith Punchihewa	d23af95cdd	Merge pull request #369 from Megala21/master ... Fixing count of roles	2016-10-18 20:26:10 +05:30
kamidu	73489f3194	UI fixes in ios related uis	2016-10-18 18:48:36 +05:30
Hasitha Amal De Silva	0e6b19d737	Revert fix on EMM1328 for revisiting later.	2016-10-17 18:39:11 +05:30
kamidu	50e9da2d11	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-17 18:00:41 +05:30
Hasitha Amal De Silva	29f91fbee2	EMM-1328 - Hide the COPE radio button and mandate the value of BYOD radio button to be true.	2016-10-17 15:40:09 +05:30
kamidu	f6cd675a1c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-17 10:21:21 +05:30
Megala	9a8a146d16	Merge remote-tracking branch 'upstream/master'	2016-10-17 08:54:59 +05:30
Milan Perera	ea4d7bc823	Merge branch 'master' of https://github.com/wso22/carbon-device-mgt-plugins	2016-10-17 07:56:57 +05:30
Milan Perera	63c40e8696	Fixed notification sending issue in iOS	2016-10-17 07:56:36 +05:30
Megala	65647fafad	Merge remote-tracking branch 'upstream/master'	2016-10-15 21:49:48 +05:30
kamidu	b50979a697	Enable ios enrollment without agent installation	2016-10-14 20:50:12 +05:30
kamidu	f6b8847e69	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-14 20:01:45 +05:30
kamidu	ec138be594	Fixing the ui issue is ios policy modification and policy view	2016-10-14 20:01:32 +05:30
Kamidu Sachith Punchihewa	43117a2b75	Merge pull request #364 from DimalChandrasiri/master ... Fix for the bug EMM-1719	2016-10-14 17:57:52 +05:30
thusithakalugamage	89336bb80f	skip download agent link added	2016-10-14 17:32:35 +05:30
Megala	9aa84e7b55	Merge remote-tracking branch 'upstream/master'	2016-10-14 16:04:08 +05:30
Imesh Chandrasiri	cce96f26fc	Fix for the bug EMM-1719	2016-10-14 14:48:45 +05:30
Imesh Chandrasiri	2dd86c80b4	Fix for the bug EMM-1719	2016-10-13 20:11:38 +05:30
thusithakalugamage	c3ea6e0853	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-13 18:54:09 +05:30
thusithakalugamage	70728a3e17	Fixing device detail view pannel height defect	2016-10-13 18:52:42 +05:30
Megala	7bd78f0558	Merge remote-tracking branch 'upstream/master'	2016-10-13 17:02:08 +05:30
Megala	9f0f3a8560	Fixing issues related with the roles of secondary user store	2016-10-13 16:58:50 +05:30
harshanl	d3902a861c	updated agent to check the communication protocol before downloading apps	2016-10-13 12:15:52 +05:30
kamidu	b16730f70d	Fix for EMM-1723 and Device view related ui fixes	2016-10-12 17:46:11 +05:30
harshanl	4e5f373c9c	Updated agent.apk for alert size fix	2016-10-12 17:28:50 +05:30
thusithakalugamage	47f6147857	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-11 18:37:00 +05:30
thusithakalugamage	f3dec07a47	[EMM-1618] - related improvements on remaining occurences	2016-10-11 18:36:09 +05:30
harshanl	5de9e1a57f	EMM-1731:Removed duplicate alert box	2016-10-11 16:48:16 +05:30
harshanl	5db518e5a8	EMM-1725:Added validation for system app	2016-10-10 16:50:46 +05:30
kamidu	1f0e39fddf	Fix for EMM-1601 ad EMM-1708	2016-10-10 14:16:29 +05:30
ayyoob	6de419519e	removed certificate configuration for device types	2016-10-09 22:14:11 +05:30
Megala	9f75c3a9a9	Merge remote-tracking branch 'upstream/master'	2016-10-07 16:46:26 +05:30
Megala	588f75cef5	Changing android apk with the changes for GCM	2016-10-07 16:39:24 +05:30
Kamidu Sachith Punchihewa	cc0ae4444d	Merge pull request #359 from thusithak/master ... EMM 2.2.0-Alpha2 theme migration and issue fixes	2016-10-07 14:38:22 +05:30
kamidu	058c96e87c	Fix for EMM-1468	2016-10-07 13:08:29 +05:30
thusithakalugamage	b2134d34d3	[EMM-1685] - fix and few other related improvements	2016-10-07 12:31:05 +05:30
kamidu	7635db3167	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-07 10:04:31 +05:30
kamidu	85e1241feb	Fixing type check in device view	2016-10-07 10:04:25 +05:30
Kamidu Sachith Punchihewa	bd2197d489	Merge pull request #357 from thusithak/master ... EMM 2.2.0-Alpha2 theme migration and issue fixes	2016-10-06 22:47:21 +05:30
kamidu	68840eae94	Fix for EMM-1680	2016-10-06 22:38:47 +05:30
harshanl	f43ba554d5	EMM-1678:Updated the oauth component versions	2016-10-06 19:44:47 +05:30
thusithakalugamage	324952defc	policy edit button group clear fix	2016-10-06 18:57:49 +05:30
Milan Perera	2bda72a5ce	Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins	2016-10-06 17:39:42 +05:30
Milan Perera	75f4e91004	Fixed conflicts and merged	2016-10-06 17:39:37 +05:30
Milan Perera	72329d93f0	Added pulse secure payload to UI	2016-10-06 17:36:13 +05:30
thusithakalugamage	06b2c44644	Header nav menu responsiveness improvements	2016-10-06 16:41:52 +05:30
kamidu	9f558ffd0f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-06 15:08:43 +05:30
kamidu	b3b429b664	Fixing EMM-1697	2016-10-06 15:00:01 +05:30
kamidu	db581a9575	removing redundence loggings	2016-10-06 12:20:52 +05:30
Kamidu Sachith Punchihewa	ffd5597828	Merge pull request #356 from Megala21/master ... Fixing EMM-1688	2016-10-06 12:07:20 +05:30
Megala	10372a7f4e	Changing the equality check	2016-10-06 11:50:57 +05:30
Megala	51d6baf1d2	Reformatting code	2016-10-06 11:48:23 +05:30
Megala	4c54ba434a	Fixing EMM-1688	2016-10-06 11:31:45 +05:30
thusithakalugamage	97f3dcf4c7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-05 19:18:16 +05:30
thusithakalugamage	9d9e8a8195	[EMM-1694] - Header responsive issues fix	2016-10-05 19:18:06 +05:30
kamidu	7431654f25	Fix for device view consistancy problems	2016-10-05 18:15:11 +05:30
thusithakalugamage	3acaf47209	Device details view tablist container height defect fix	2016-10-05 12:50:47 +05:30
kamidu	22ec7aa695	Fixes for the ui isuess in EMM 2.2.0-beta	2016-10-05 12:25:37 +05:30
kamidu	5936884c16	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-05 12:23:04 +05:30
harshanl	529ed17f82	New android agent with complaince monitoring issue fix	2016-10-04 20:03:03 +05:30
thusithakalugamage	c37ad8f56d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-10-04 15:15:47 +05:30
thusithakalugamage	73a600713c	resolving conflicts	2016-10-04 15:13:04 +05:30
kamidu	faf0f36683	Fix for EMM-1665	2016-10-04 13:27:21 +05:30
Rasika Perera	119a3e16c5	Fixes to android sense download	2016-10-03 21:22:39 +05:30
Rasika Perera	214e56770b	Upgrading carbon-analytics version from 1.0.6-ALPHA to 1.2.8	2016-10-03 21:22:39 +05:30
Rasika Perera	20f0720a72	Styling improvements to the virtual firealarm agent download	2016-10-03 16:18:54 +05:30
Rasika Perera	6cbbb75c45	Fixing android sense download issue	2016-10-03 16:05:22 +05:30
Rasika Perera	d58b8f1f53	Fixing realtime analytics websocket authentication	2016-10-03 16:05:22 +05:30
thusithakalugamage	0cbf647854	resolving conflicts	2016-10-03 11:56:57 +05:30
kamidu	19a2c1d1bd	Fix for Jira issue : EMM-1639	2016-10-03 11:50:57 +05:30
hasuniea	2ad390b877	removing duplicate event related classes	2016-09-30 13:40:17 +05:30
Chatura Dilan Perera	0b66649841	[maven-release-plugin] prepare for next development iteration	2016-09-29 21:47:43 +05:30
Chatura Dilan Perera	362003c9ab	[maven-release-plugin] prepare release v2.2.2	2016-09-29 21:47:34 +05:30
Chatura Dilan Perera	97b52b3645	changes to pom.xml	2016-09-29 21:44:15 +05:30
harshanl	821142b78d	windows ui fix	2016-09-29 21:29:51 +05:30
harshanl	5062a8dfae	Windows issue	2016-09-29 20:08:25 +05:30
harshanl	fd82cfcddd	Added new agent with policy fix	2016-09-29 18:51:31 +05:30
Rasika Perera	2517b7b385	Merge pull request #354 from rasika/iots-ga ... Merge iot-ga branch	2016-09-29 15:20:18 +05:30
Rasika Perera	ca952e2e6c	Merge branch 'master' of https://github.com/rasika/carbon-device-mgt-plugins into iots-ga	2016-09-29 12:21:59 +05:30
Rasika Perera	9d92b71bab	Merge pull request #1 from warunalakshitha/master ... Upgrade iot product to latest carbon versions	2016-09-29 11:24:25 +05:30
Megala	90f509c065	Merge remote-tracking branch 'upstream/master'	2016-09-29 09:09:47 +05:30
Megala	c6b12f799f	Adding the check on the existence of the database before creating one	2016-09-29 01:42:11 +05:30
warunalakshitha	799aba9dfd	Fix osgi issue with package version conflicts of org.wso2.carbon.device.mgt.iot bundle	2016-09-29 00:45:27 +05:30
warunalakshitha	f258f0992d	Fix compilation issue after migrating iot components to carbon 4.4.9	2016-09-29 00:44:23 +05:30
dilanua	0ffce8b177	Improving device view UI - adding ios specific device details support	2016-09-28 21:28:04 +05:30
dilanua	0a9ba54bb7	Improving policy listing UI	2016-09-28 20:58:07 +05:30
dilanua	9dfd06f95e	Fix for JIRA: https://wso2.org/jira/browse/EMM-1650	2016-09-28 15:44:32 +05:30
hasuniea	54ca0cacc5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-28 14:27:49 +05:30
hasuniea	2cc9a50b92	adding permission for windows enrollment	2016-09-28 14:27:16 +05:30
dilanua	8bb1428df8	Improving device view info.retrieval - UI	2016-09-28 14:11:25 +05:30
Rasika Perera	6ee958bbe7	Fixing JWT token issue for realtime analytics	2016-09-28 11:03:46 +05:30
charitha	a719c11d75	Update the agent application	2016-09-27 23:56:43 +05:30
Rasika Perera	85a382e16a	Removed error log	2016-09-27 22:56:56 +05:30
Rasika Perera	177f77bde4	Fixing invalid device object returned	2016-09-27 21:57:53 +05:30
Rasika Perera	0d07295623	Fixing invalid invoker util URLs	2016-09-27 21:47:20 +05:30
Harshan Liyanage	f8bc1ff3bf	Merge pull request #352 from Megala21/master ... EMM-1626 : Unable to retrieve device location for an enrolled android device	2016-09-27 17:59:01 +05:30
Megala	c55b62fdf4	Fixing EMM-1626	2016-09-27 17:40:29 +05:30
charitha	ea999bc98b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-27 15:24:36 +05:30
charitha	975fb078b5	(cherry picked from commit d68c4c8)	2016-09-27 15:24:18 +05:30
Megala	e51231fd66	Merge remote-tracking branch 'upstream/master'	2016-09-27 13:37:40 +05:30
Megala	135019f987	Fixing EMM-1626	2016-09-27 13:33:12 +05:30
dilanua	074abf3053	Fix for JIRA: https://wso2.org/jira/browse/EMM-1640	2016-09-27 12:46:50 +05:30
charitha	c0feb96590	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-27 11:22:19 +05:30
Chatura Dilan Perera	0cdde82c1b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-26 22:10:20 +05:30
Chatura Dilan Perera	f6de82bb77	Fixed android agent	2016-09-26 22:10:00 +05:30
Kamidu Sachith Punchihewa	47e6909f8d	Merge pull request #349 from saadsahibjan/master ... Fix for https://wso2.org/jira/browse/EMM-1584	2016-09-26 22:02:41 +05:30
Saad Sahibjan	d05280cdf5	Fix for https://wso2.org/jira/browse/EMM-1584	2016-09-26 21:59:38 +05:30
Ace	2a2f749523	Adding appm extension component & feature	2016-09-26 21:34:13 +05:30
Kamidu Sachith Punchihewa	f6c77e9b9e	Merge pull request #348 from saadsahibjan/master ... Fix for https://wso2.org/jira/browse/EMM-1634	2016-09-26 20:24:23 +05:30
Saad Sahibjan	41865d07eb	Fix for https://wso2.org/jira/browse/EMM-1634	2016-09-26 20:19:20 +05:30
Kamidu Sachith Punchihewa	3944c5489e	Merge pull request #347 from saadsahibjan/master ... Update the description of system update policy and whitelist applications - Android UI	2016-09-26 20:10:23 +05:30
dilanua	77836d80d9	Updating bulk operations info message	2016-09-26 20:07:16 +05:30
dilanua	17e7b92b23	FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633	2016-09-26 19:52:54 +05:30
Rasika Perera	3f9bcd50ea	Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username	2016-09-26 19:17:05 +05:30
Saad Sahibjan	e4741c0b73	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-26 19:14:12 +05:30
Saad Sahibjan	891d9601ba	Update the description of system update policy and whitelist applications - Android UI	2016-09-26 19:03:23 +05:30
Rasika Perera	d8d69f3092	Updating modal name element	2016-09-26 18:52:52 +05:30
kamidu	e3a08d824a	Resolve conflicts with master	2016-09-26 18:12:53 +05:30
kamidu	e4cc0f0c0c	Fix for EMM-1329, EMM-1479	2016-09-26 18:06:45 +05:30
charitha	9886e2e75f	Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3 ... # Conflicts: # components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java (cherry picked from commit 257d6cd)	2016-09-26 18:01:46 +05:30
charitha	ba2acb5e75	Refactor code ... (cherry picked from commit 01f2a91)	2016-09-26 18:01:12 +05:30
dilanua	9d35017744	FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585	2016-09-26 17:28:22 +05:30
Rasika Perera	17dd96aa10	Returning correct representation of the device to template.	2016-09-26 17:15:12 +05:30
Rasika Perera	52dfcecb62	Updating devicemgt_admin into /api/device-mgt/v1.0.	2016-09-26 15:58:00 +05:30
Rasika Perera	9cef6f0d8c	Few Fixes to the virtual firealarm analytics view.	2016-09-26 11:18:22 +05:30
hasuniea	fb6eded30c	fixed device lock issue	2016-09-23 22:27:34 +05:30
hasuniea	fc61128b8b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-23 22:06:49 +05:30
hasuniea	ece43f53bd	fixing windows issues	2016-09-23 22:06:14 +05:30
dilanua	bdd7703465	Fix for JIRA: https://wso2.org/jira/browse/EMM-1602	2016-09-23 20:33:02 +05:30
dilanua	7697c3ca39	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-23 19:47:12 +05:30
dilanua	ddea023fc2	Fixing the alignment issue of policy compliance listing of device view page	2016-09-23 19:46:48 +05:30
Ruwan	3d7dfa741b	Merge pull request #346 from ruwany/carbon-kernel-4.4.7 ... Migrating kernel/apim/appm/identity to latest versions	2016-09-23 17:04:26 +05:30
dilanua	0d8da5f63f	Fix for jira: https://wso2.org/jira/browse/EMM-1621	2016-09-23 16:02:53 +05:30
dilanua	f85e28c902	Fix for jira: https://wso2.org/jira/browse/EMM-1622	2016-09-23 15:57:04 +05:30
dilanua	8bd20911fe	Refactoring application list view for improper text placement issues	2016-09-23 12:28:15 +05:30
dilanua	a92070f16e	Fix for jira: https://wso2.org/jira/browse/EMM-1617	2016-09-23 11:45:13 +05:30
dilanua	4947664b4b	Fix for jira: https://wso2.org/jira/browse/EMM-1617	2016-09-23 11:15:45 +05:30
dilanua	3a7dbb81ea	Fix for JIRA: https://wso2.org/jira/browse/EMM-1616	2016-09-23 06:59:12 +05:30
dilanua	36eb2e2b16	Fix for JIRA: https://wso2.org/jira/browse/EMM-1615	2016-09-23 06:37:24 +05:30
dilanua	f47a1cdc55	Fix for JIRA: https://wso2.org/jira/browse/EMM-1614	2016-09-22 22:59:42 +05:30
dilanua	f5d95f0695	Fix for JIRA: https://wso2.org/jira/browse/EMM-1613	2016-09-22 22:45:28 +05:30
dilanua	2a4757539a	Fix for JIRA: https://wso2.org/jira/browse/EMM-1593	2016-09-22 22:12:46 +05:30
dilanua	bff3b3ee12	Fix for JIRA: https://wso2.org/jira/browse/EMM-1610	2016-09-22 19:45:29 +05:30
Ace	0cb99be949	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7	2016-09-22 19:09:26 +05:30
dilanua	1cca664e96	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-22 18:35:30 +05:30
dilanua	36d4c7dfcb	Updating emm device listing - UI	2016-09-22 18:35:13 +05:30
harshanl	212dcae8e7	Added scheduled time to App-install operation	2016-09-22 18:26:13 +05:30
dilanua	13aedbc6c6	Updating notifications side bar - UI	2016-09-22 18:19:28 +05:30
Rasika Perera	fd9c491637	Fixing virtual firealarm device download modal issue	2016-09-22 18:10:27 +05:30
dilanua	1efbc15cdb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-22 15:58:31 +05:30
dilanua	d7872782cc	https://wso2.org/jira/browse/EMM-1608	2016-09-22 15:58:13 +05:30
Rasika Perera	71784e6609	Fixing modal popups	2016-09-22 15:24:59 +05:30
Rasika Perera	b99bd42a91	Fixing download modal issue on virtual firealarm	2016-09-22 14:36:56 +05:30
Chatura Dilan	e0499a5d86	Merge pull request #345 from saadsahibjan/master ... Remove unused COSU tab-Android EMM UI	2016-09-22 14:05:36 +05:30
Saad Sahibjan	9ac367cf8a	Remove unused COSU tab-Android EMM UI	2016-09-22 14:04:06 +05:30
dilanua	b6a150da23	Fixing JIRA: https://wso2.org/jira/browse/EMM-1603	2016-09-22 13:59:06 +05:30
dilanua	6665ac2642	Improvements to notifications side bar - UI	2016-09-22 13:14:45 +05:30
dilanua	215093b9a8	Updating android operation failure notification message format	2016-09-22 13:00:31 +05:30
Chatura Dilan	6bd25a4aad	Merge pull request #343 from saadsahibjan/master ... Added validations for COSU create and edit configurations - Android E…	2016-09-21 16:00:18 +05:30
Chatura Dilan Perera	7174945f21	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-21 13:51:44 +05:30
Chatura Dilan Perera	ae99d189e7	Fixed logcat and events get APIs	2016-09-21 13:51:29 +05:30
Ace	282fe25b47	Fixing dependency related issues	2016-09-21 12:57:03 +05:30
dilanua	b99529d9d0	Fixing JIRA: https://wso2.org/jira/browse/EMM-1588	2016-09-21 11:21:35 +05:30
thusithakalugamage	706894cd89	resolving conflicts	2016-09-21 10:59:36 +05:30
dilanua	c4c2df3723	Updating device listing UI - EMM	2016-09-20 22:21:45 +05:30
dilanua	d25779e335	Updating notification side-bar message format	2016-09-20 20:21:37 +05:30
dilanua	87d8c75682	Updating notification side-bar message format	2016-09-20 19:15:24 +05:30
dilanua	ab14f9516c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-20 19:04:36 +05:30
dilanua	13d784009c	Updating android operation failure notification message	2016-09-20 19:04:15 +05:30
Chatura Dilan Perera	eaaadfae32	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-20 18:02:56 +05:30
Ace	6c3ba5e688	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7	2016-09-20 18:02:42 +05:30
Saad Sahibjan	f5009d8406	Added validations for COSU create and edit configurations - Android EMM UI	2016-09-20 16:29:36 +05:30
kamidu	3bb8bcb79e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-20 14:46:52 +05:30
kamidu	6144d9eea2	Fic for EMM-1581	2016-09-20 14:46:08 +05:30
dilanua	cd7f63502a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-20 14:21:58 +05:30
dilanua	afea5fcfc6	Refactoring notifications side-pane - EMM UI	2016-09-20 14:21:40 +05:30
Chatura Dilan	a8319c6770	Merge pull request #342 from saadsahibjan/master ... Adding COSU policy view configurations - Android EMM UI	2016-09-20 13:53:37 +05:30
Saad Sahibjan	31b9c0c3dd	Adding COSU policy view configurations - Android EMM UI	2016-09-20 12:57:49 +05:30
dilanua	712f62aa43	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-20 12:50:44 +05:30
dilanua	00448814e8	Refactoring notifications side-pane - EMM UI	2016-09-20 12:50:18 +05:30
Saad Sahibjan	d18b9a4082	Adding COSU policy edit configurations - Android EMM UI	2016-09-20 12:39:10 +05:30
Ace	03c0108db5	Removing unwanted dependencies from windows api	2016-09-20 10:39:34 +05:30
Chatura Dilan Perera	bf72d212f7	[maven-release-plugin] prepare for next development iteration	2016-09-19 19:53:27 +05:30
Chatura Dilan Perera	18780e5274	[maven-release-plugin] prepare release v2.2.1	2016-09-19 19:52:58 +05:30
Chatura Dilan Perera	93cecb0ded	Merge branch 'master' into release-2.2.1	2016-09-19 18:37:57 +05:30
dilanua	b65e99a4a7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-19 18:36:31 +05:30
dilanua	9add795fe4	Adding date picker to oper.bar - EMM	2016-09-19 18:35:34 +05:30
Chatura Dilan Perera	42b50b642a	Merge branch 'master' into release-2.2.1	2016-09-19 18:01:54 +05:30
hasuniea	8c877b3071	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-19 17:57:27 +05:30
hasuniea	9ecbd4e1b4	fixing windows operation issue	2016-09-19 17:54:58 +05:30
Chatura Dilan Perera	4088c736eb	Changes to android agent	2016-09-19 17:17:42 +05:30
dilanua	ed5af90c46	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-09-19 17:13:26 +05:30
dilanua	4c8094be4f	Adding date-picker unit - EMM	2016-09-19 17:13:02 +05:30
hasuniea	29c1b055d9	fixing code conflicts	2016-09-19 16:29:04 +05:30
hasuniea	18e577a84a	adding windowsplugin changes	2016-09-19 15:49:16 +05:30
Rasika Perera	245ea2b0d6	Fixing incorrect text formatting	2016-09-19 14:35:43 +05:30
dilanua	4e9b19f3a5	Updating android permissions - operation-bar	2016-09-19 14:20:49 +05:30
dilanua	4a78cd6ece	Updating android permissions	2016-09-19 14:09:39 +05:30
Ace	a05dad6f4d	Merging with master	2016-09-19 12:22:11 +05:30
Rasika Perera	35d9678075	Updating permissions on operation bar for windows and iOS	2016-09-19 10:19:58 +05:30
dilanua	42a5493a89	Fixing JIRA: https://wso2.org/jira/browse/EMM-1577	2016-09-18 17:02:12 +05:30
dilanua	9925a20964	Fixing JIRA: https://wso2.org/jira/browse/EMM-1576	2016-09-18 16:31:17 +05:30
dilanua	69efc7ada7	Updating operation-mod with windows operation apis	2016-09-18 16:07:10 +05:30
dilanua	d8ce43fe04	Updating windows api path lockreset-devices to lock-reset-devices	2016-09-18 15:57:07 +05:30
dilanua	9d486a5a0a	Updating Device Listing - EMM UI	2016-09-18 10:27:17 +05:30