261 Commits

Author	SHA1	Message	Date
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
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
Ace	a05dad6f4d	Merging with master	2016-09-19 12:22:11 +05:30
Chatura Dilan Perera	89621ddfcb	[maven-release-plugin] prepare for next development iteration	2016-09-09 21:48:18 +05:30
Chatura Dilan Perera	28898a85e9	[maven-release-plugin] prepare release v2.2.0	2016-09-09 21:48:05 +05:30
mharindu	0d3cd0c9e1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.7	2016-08-24 14:56:23 +05:30
Chatura Dilan Perera	ca2e631076	Fix conflicts	2016-08-19 15:25:51 +05:30
Chatura Dilan Perera	7ff9204646	[maven-release-plugin] prepare for next development iteration	2016-08-18 22:52:56 +05:30
Chatura Dilan Perera	5e43c5bef9	[maven-release-plugin] prepare release v2.1.2	2016-08-18 22:52:47 +05:30
hasuniea	97ff014b1b	fixing log info message issue	2016-08-17 15:53:38 +05:30
hasuniea	5e2a42d798	fixing app-install issue	2016-08-17 15:31:18 +05:30
ayyoob	55107aaae5	fixing commit issues	2016-08-15 15:04:26 +05:30
ayyoob	38b9f017c3	merged with origin	2016-08-12 10:55:25 +05:30
harshanl	b207554bba	Refacotered IOT plugins to use own keystore.	2016-08-11 12:38:11 +05:30
mharindu	b9289e801f	Addin carbon 4.4.7 migration changes	2016-08-11 12:21:28 +05:30
harshanl	e1e7bccd57	Temporary removed VirtualFireAlarm module to fix the build issue	2016-08-10 14:19:37 +05:30
mharindu	352574d2fe	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl	2016-08-08 19:29:36 +05:30
hasuniea	4562b4d318	adding security fixes	2016-08-08 18:06:14 +05:30
mharindu	8ddee3b217	Refactored scopes	2016-08-04 17:47:26 +05:30
ayyoob	d70c576ff0	refactored android configuration	2016-08-03 17:23:09 +05:30
mharindu	5f917e51f1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl	2016-08-03 12:53:36 +05:30
Rasika Perera	7b62aa3361	Fixing: Requested resource /app/conf/reader/main.js cannot be found	2016-08-02 22:23:23 +05:30
dilanua	42cfd92575	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-08-02 14:04:13 +05:30
dilanua	6fe83cd0ac	Updating path changes to business-controllers	2016-08-02 14:03:50 +05:30
mharindu	576bfb8236	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl	2016-08-01 12:27:30 +05:30
Chatura Dilan Perera	fb4d8ae990	refactor files	2016-08-01 11:52:03 +05:30
mharindu	2b3dfa0ce2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl	2016-07-29 12:40:50 +05:30
Dilan U. Ariyaratne	cd7ca448a0	Merge pull request #311 from ayyoob/com ... Added missing license headers	2016-07-28 17:54:10 +05:30
ayyoob	04b1a22a00	Added missing license headers	2016-07-28 17:52:06 +05:30
ayyoob	618230e121	remove new line	2016-07-28 17:48:28 +05:30
Dilan U. Ariyaratne	4f07a42a95	Merge pull request #310 from ayyoob/com ... removed error message variable	2016-07-28 17:39:26 +05:30
ayyoob	b60487304f	removed error message variable	2016-07-28 17:37:18 +05:30