341 Commits

Author	SHA1	Message	Date
charithag	4dcd064f8b	Use custom carbon xml and Add DAS portal jaggery app	2015-12-11 11:06:37 +05:30
charithag	4b8662f58f	Add required changes for android sense	2015-12-11 08:52:51 +05:30
charithag	f876abf3e4	Add carbonapps to deployment	2015-12-10 20:24:03 +05:30
Charitha Goonetilleke	0021029913	Merge pull request #1 from menaka121/master ... Changes for the android sense: Spark scripts and p2 profile changes	2015-12-10 19:03:16 +05:30
charithag	c08aa706e6	Removed oltu patch since it is included in identity 5.0.3	2015-12-10 18:56:20 +05:30
charithag	ccf1af3ea4	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-12-10 18:45:36 +05:30
menaka	594bd03b84	Merge remote-tracking branch 'origin/master'	2015-12-10 15:04:14 +05:30
Ace	8cc653a788	bumping identity to 5.0.3 and other fixes	2015-12-10 14:31:01 +05:30
charithag	5b7fee6043	Excluded jaggery.conf in uuf-base app	2015-12-10 13:43:47 +05:30
menaka	a91f75a34d	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-12-09 15:50:25 +05:30
Charitha Goonetilleke	6632cfc272	Merge pull request #27 from charithag/master ... Update console logo and removed asm-all_4.1.0.wso2v1.jar	2015-12-08 23:21:39 +05:30
charithag	4f6dfac0fa	Removed asm-all_4.1.0.wso2v1.jar from distribution and include mdm based app mgt feature from plugins	2015-12-08 23:19:39 +05:30
Shabirmean	865372f9e8	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-12-08 23:02:16 +05:30
Shabirmean	910b52db75	adding social dbscripts to product	2015-12-08 23:02:02 +05:30
charithag	c494db99e7	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-12-08 22:49:36 +05:30
Ace	1250743458	Adding changes to identity.xml to fix logging issue	2015-12-08 21:46:46 +05:30
Shabirmean	9ae9bcfb31	Removing duplicate analytics version, switched "data-bridge-config.xml' to be copied from feature	2015-12-08 15:02:43 +05:30
Shabirmean	63dcd1e04e	Addidng SocialDB to distribution pom	2015-12-08 12:02:58 +05:30
Menaka Madushanka	309d38de72	Added the accelerometer script	2015-12-08 10:59:05 +05:30
menaka	1c0242fe7e	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-12-08 10:55:08 +05:30
Menaka Madushanka	efe53204c8	Added the accelerometer script	2015-12-08 10:54:05 +05:30
Shabirmean	d09128f482	excluding "appmoauth2.war" from the build	2015-12-07 18:53:32 +05:30
charithag	584ba63494	Update logo	2015-12-07 13:44:59 +05:30
Shabirmean	808771056c	removing the common-api feature from the build	2015-12-07 13:41:45 +05:30
charithag	2c1efd1af0	Migrated to EMM based product	2015-12-05 14:05:35 +05:30
ayyoob	098547efaa	removing unnecessary es store files	2015-11-30 00:28:47 +05:30
ayyoob	320f754356	resolved few started errors	2015-11-28 01:27:40 +05:30
charithag	247dfa9820	Migrated to CDMF with Generic UI	2015-11-27 11:10:37 +05:30
Rasika Perera	29a0bf2fe2	fixing invalid relative paths in pom.xml	2015-11-03 11:38:14 +05:30
Ace	1d2d57259b	fixing some minor bugs	2015-10-30 19:43:13 +05:30
ayyoob	a0ee671515	resolved errors on sample build and few changes on android service	2015-10-25 02:32:19 +05:30
ayyoob	e39ee91518	update version and few changes on android sense service	2015-10-24 21:20:56 +05:30
charithag	82740dec44	Revert pom changes to previous	2015-10-23 12:29:38 +05:30
ayyoob	5625b83b64	added android sense service and required stream definitions	2015-10-23 07:42:29 +05:30
Rasika Perera	fb21dc8b72	Merge pull request #13 from rasika90/master ... Generalizing in memory map into any sensor reading	2015-10-23 01:11:11 +05:30
Rasika Perera	e31fda92a6	generalizing inmemory map into any sensor	2015-10-23 01:04:55 +05:30
charithag	16f1fc7d5e	Remove duplicate portal jaggery app	2015-10-22 19:11:08 +05:30
charithag	928dd66ae3	License updated	2015-10-22 07:52:19 +05:30
charithag	36bf7a529a	Redirect user to the login page upon successful registration	2015-10-22 06:51:53 +05:30
charithag	08d2d9d6a7	Removed un used cdm dbscripts	2015-10-22 06:48:00 +05:30
ayyoob	ec47429127	few changes after testing	2015-10-16 18:30:19 +05:30
ayyoob	aa001675b3	Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud	2015-10-16 16:58:58 +05:30
ayyoob	2d2ab1cdf3	update the bin file	2015-10-16 16:58:51 +05:30
ayyoob	fd2e7c3ed2	DAS update	2015-10-16 16:58:39 +05:30
charithag	e4f0cd3059	Fix sample deployment issue for samples except virtual fire alarm	2015-10-16 15:40:50 +05:30
charithag	76de89bd05	Add components necessory to work with internal APIM	2015-10-13 00:46:26 +05:30
ayyoob	388af5f248	merged with upstream	2015-10-12 11:56:22 +05:30
ayyoob	08c518c0c2	added api managed on virtual fire alarm and few changes on internal api	2015-10-12 11:37:24 +05:30
charithag	b63c062eb8	Include virtual agent to pack by default	2015-10-11 20:33:04 +05:30
charithag	4c64456b36	Add ES themed login page	2015-10-08 14:19:56 +05:30