659 Commits

Author	SHA1	Message	Date
thisaripatabendi	67a6eb0db4	Fixing connected-cup issues.	2017-06-23 16:34:56 +05:30
sinthuja	0b85c80701	Updating the license headers.	2017-06-23 15:51:30 +05:30
sinthuja	cbd4507648	Adding missing connected cup version in the root pom.xml.	2017-06-23 15:30:53 +05:30
sinthuja	8afe1d5245	Cleaning up the files pom files.	2017-06-23 15:25:45 +05:30
sinthuja	cfe3e59ce3	Removing the unused file device-type, and removing datasource configs from UI feature.	2017-06-23 15:14:04 +05:30
sinthuja	2aad4c7bd4	Updating the coffeeking version as the bundle version.	2017-06-23 15:01:54 +05:30
sinthuja	1773b64d20	Reverting the change done for device type.	2017-06-23 14:08:19 +05:30
sinthuja	9d866509bd	Merge branch 'wso2-master' into test-merge	2017-06-23 13:19:32 +05:30
sinthuja	5aa641183b	Fixing some path issue in device type deployables.	2017-06-23 13:09:37 +05:30
sinthuja	c6876695fc	Seperating the connected cup feature into backend, api, ui features as recommended feature structure.	2017-06-23 12:54:23 +05:30
sinthuja	5483532882	Fixing some version problem in the connected cup sample.	2017-06-23 11:47:39 +05:30
ayyoob	8c4f13ee48	Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0	2017-06-23 04:12:26 +05:30
ayyoob	32c54e0ab6	adding client truststore key store - temporariy fix until kernel 4.4.17 is released	2017-06-23 04:07:25 +05:30
sinthuja	c04b8e7872	Fixing the old references of the plugins-deployer, and owsap log in the integration tests.	2017-06-22 23:26:45 +05:30
sinthuja	b363714446	fixing the issue in creating the connected cup instance.	2017-06-22 20:45:52 +05:30
sinthuja	602e012e2e	committing the intermediate changes.	2017-06-22 18:11:52 +05:30
Geeth	911d001aa6	Merge pull request #1034 from sinthuja/test-merge ... Fixing https://github.com/wso2/product-iots/issues/776.	2017-06-22 14:45:00 +05:30
sinthuja	56cbef3f35	Fixing https://github.com/wso2/product-iots/issues/776.	2017-06-22 14:23:05 +05:30
Harshan Liyanage	c240fb9a71	Merge branch 'master' of https://github.com/wso2/product-iots	2017-06-21 18:34:03 +05:30
Harshan Liyanage	0a7e33961a	Fixed sample-deployer issues which resolves wso2/product-iots#458	2017-06-21 18:33:39 +05:30
Rasika Perera	d48b7d4939	Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied	2017-06-21 14:52:25 +05:30
ayyoob	76ddf4fe57	Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0	2017-06-17 19:33:14 +05:30
Rasika Perera	c2b573b32c	Adding geo fencing	2017-06-16 16:15:15 +05:30
sinthuja	b59aec2e48	Fixing the license year in script files.	2017-06-15 13:51:59 +05:30
sinthuja	38963cb807	Fixing #1003.	2017-06-15 13:42:18 +05:30
ayyoob	f167b20192	updated migration db queries	2017-06-15 09:47:46 +05:30
ayyoob	4e248659ed	Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0	2017-06-14 13:23:59 +05:30
ayyoob	72b66504f4	Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 ... Conflicts: pom.xml	2017-06-14 13:23:48 +05:30
sinthuja	6ac04eba48	Fixing https://github.com/wso2/product-iots/issues/1000.	2017-06-13 12:56:24 +05:30
sinthuja	2fc5104043	Fixing https://github.com/wso2/product-iots/issues/522.	2017-06-13 12:19:13 +05:30
ayyoob	8ddac1d037	merged with origin	2017-06-12 11:50:45 +05:30
ayyoob	fcfd39f54d	Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 ... Conflicts: pom.xml	2017-06-08 14:45:36 +05:30
Janak Amarasena	c3ad20b18a	Add new supported grant type	2017-06-07 14:26:29 +05:30
ayyoob	d4ff9da16d	updated migration script	2017-06-06 11:01:16 +05:30
ayyoob	5785ee1072	intial commit for db migration from 3.0.0 - 3.1.0	2017-06-05 00:13:52 +05:30
ayyoob	12837efd6d	renamed content validator type name	2017-06-04 06:53:21 +05:30
ayyoob	80ecba8528	migrated new kernel and mb version	2017-06-01 10:47:59 +05:30
Ayyoob Hamza	5334745d0b	Merge pull request #448 from sinthuja/test-merge ... Removing some unnecessary features from the profiles.	2017-05-16 16:21:02 +05:30
sinthuja	b2495ad414	Fixing the formatting issue.	2017-05-16 15:23:44 +05:30
sinthuja	52fb2f732f	Fixing the formatting issue.	2017-05-16 15:22:14 +05:30
sinthuja	df48dbd3c0	Fixing the formatting issue.	2017-05-16 15:18:42 +05:30
sinthuja	955294135a	Moving the config files to the key manager profile.	2017-05-16 15:08:14 +05:30
sinthuja	28cc40db78	Removing unwanted features from profiles.	2017-05-16 15:01:16 +05:30
megala21	79a4f58929	Fixing issue in tenant-conf.json copying location	2017-05-16 09:06:27 +05:30
ayyoob	1c2d1ef231	added filter properties to pick plugins version from parent pom	2017-05-09 16:30:54 +05:30
ayyoob	43552543d2	added android sense analytics feature to the analytics runtime	2017-05-09 16:30:09 +05:30
ayyoob	2c7a7cd9b9	merged with origin	2017-05-09 16:29:32 +05:30
ayyoob	cd79929f42	added default values for global properties	2017-05-09 01:07:24 +05:30
ayyoob	475bd3ac84	added filter properties to pick the parent plugins version	2017-05-05 01:55:19 +05:30
ayyoob	834ad4f772	added missing appm features and installed android sense feature to the default pack	2017-05-05 01:36:36 +05:30