293 Commits

Author	SHA1	Message	Date
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
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	a9308c3f22	removing the unnessary ' ' from hbs files	2016-10-31 11:59:29 +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
ayyoob	8cbd68bcc6	few changes after testing the configs	2016-10-24 11:41:15 +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
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
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
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
ayyoob	6de419519e	removed certificate configuration for device types	2016-10-09 22:14:11 +05:30
Milan Perera	75f4e91004	Fixed conflicts and merged	2016-10-06 17:39:37 +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
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
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	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
Rasika Perera	6ee958bbe7	Fixing JWT token issue for realtime analytics	2016-09-28 11:03:46 +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
Rasika Perera	d8d69f3092	Updating modal name element	2016-09-26 18:52:52 +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
Ace	0cb99be949	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7	2016-09-22 19:09:26 +05:30
Rasika Perera	fd9c491637	Fixing virtual firealarm device download modal issue	2016-09-22 18:10:27 +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