42 Commits

Author	SHA1	Message	Date
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
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
ayyoob	d70c576ff0	refactored android configuration	2016-08-03 17:23:09 +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	6fe83cd0ac	Updating path changes to business-controllers	2016-08-02 14:03:50 +05:30
Ruwan	5356ee920c	Merge pull request #308 from ayyoob/transport ... changes in realtime analytics	2016-07-28 12:38:42 +05:30
ayyoob	d650e86e00	few changes in real time analytics	2016-07-27 14:45:31 +05:30
dilanua	01e32c86c8	Updating base ui app config reader	2016-07-25 05:54:32 +05:30
Chatura Dilan	0818ae6860	[maven-release-plugin] prepare for next development iteration	2016-07-08 20:18:00 +05:30
Chatura Dilan	62c16e07ce	[maven-release-plugin] prepare release v2.1.1	2016-07-08 20:17:52 +05:30
ayyoob	562ac197af	added configurations for device types	2016-06-17 17:21:13 +05:30
Rasika Perera	91cc0baaf5	Moved CSS into separate file	2016-05-26 18:34:07 +05:30
Rasika Perera	f0b5ad32c9	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-05-25 11:35:27 +05:30
Rasika Perera	c49e19a3c6	Adding licence headers for handlebar templates	2016-05-25 11:34:22 +05:30
mharindu	f3730c64ae	[maven-release-plugin] prepare for next development iteration	2016-05-20 17:49:18 +05:30
mharindu	7a982093a1	[maven-release-plugin] prepare release v2.1.0	2016-05-20 17:49:08 +05:30
mharindu	be4078cf38	[maven-release-plugin] rollback the release of v2.1.0	2016-05-20 17:35:17 +05:30
mharindu	a2d2f26123	[maven-release-plugin] prepare for next development iteration	2016-05-20 17:26:28 +05:30
mharindu	3af112898d	[maven-release-plugin] prepare release v2.1.0	2016-05-20 17:26:19 +05:30
Rasika Perera	6696603ec5	Showing error when device name is less than 4 letters	2016-05-19 15:55:05 +05:30
Ruwan	7f9b7c4914	Merge pull request #258 from ayyoob/transport ... refactored apis and resolved xmpp issues	2016-05-15 20:07:28 +05:30
ayyoob	67831883fb	refactored apis	2016-05-15 17:45:53 +05:30
charitha	f3d7608cdc	Add support to grouping and bug fixes	2016-05-15 13:12:50 +05:30
ayyoob	bb0b10f14c	resolved xmpp issues in virtual fire alarm	2016-05-15 11:59:10 +05:30
charitha	ffcbea8421	Fixed https://wso2.org/jira/browse/IOTS-104	2016-05-11 16:00:05 +05:30
charitha	4aa376b98e	Enable group analytics	2016-05-10 21:32:09 +05:30
ayyoob	6f000cbc64	refactoring version tags	2016-05-05 14:34:49 +05:30
ayyoob	14aac9f4f6	few changes after testing raspberry, arduino and refactored the jot plugins implementation	2016-04-29 16:41:18 +05:30
ayyoob	315177b787	Few changes to support multi tenancy for virtual fire alarm and android sense	2016-04-28 22:21:08 +05:30
ayyoob	012fc028cf	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext	2016-04-28 03:10:01 +05:30
ayyoob	32958b2076	few changes in android agent and added android sense realtime graphs	2016-04-28 01:52:12 +05:30
charithag	4ef3f8d461	Fix timing issue	2016-04-27 17:45:29 +05:30
charithag	fb71f5743c	Remove obsolete units and update analytics components	2016-04-27 15:41:27 +05:30
charithag	03c4768e7d	Update new analytics components.	2016-04-27 13:44:38 +05:30
ayyoob	313b48f01d	added virtual firealarm graphs	2016-04-26 15:58:54 +05:30
Rasika Perera	cb7f7a6cd9	Autocompleting API params for Operations Implemented	2016-04-26 11:35:35 +05:30
ayyoob	d128804b04	added real time analytics for virtual fire alarm	2016-04-23 20:30:37 +05:30
ayyoob	16fb54d463	Changes after testing with virtual firealarm and android sense	2016-04-22 20:58:13 +05:30
prabathabey	39d2ce12dc	merging resturctured iot and mobile plugins	2016-03-27 03:02:20 +05:30