417 Commits

Author	SHA1	Message	Date
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
ayyoob	a294c20a2a	added device management api to be default	2017-02-09 09:59:24 +05:30
ayyoob	dd3017578a	added artefact deployment support for device types	2017-02-05 17:52:52 +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	53840dcc37	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-02-03 13:01:21 +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
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
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
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
ayyoob	3021947f30	updated saml grant type config name	2017-01-25 14:03:57 +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
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
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
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	eb9c789b51	Enable opasity variation with time on location records	2017-01-19 21:30:29 +05:30
Rasika Perera	737d1da07b	Changed webapps title [EMM] into [IoT Server]	2017-01-19 17:04:01 +05:30
Rasika Perera	3b7257c93f	Fixing "process" not found issues	2017-01-19 07:41:13 +05:30
Rasika Perera	fe6c35ebca	Cleaned android-web-agent config.json	2017-01-19 01:34:48 +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
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