243 Commits

Author	SHA1	Message	Date
charithag	74c04dc49b	Merged with CDM master	2016-01-28 17:44:10 +05:30
ayyoob	2a30023d81	Merge pull request #61 from wso2-incubator/IoTS-1.0.0-M1 ... added start up script	2016-01-08 23:10:35 +05:30
ayyoob	754891e39a	added start up script	2016-01-08 20:56:21 +05:30
Ace	03a05472c4	Adding andes patch	2016-01-08 12:05:42 +05:30
Ace	fad444510c	Adding log fixes to spark core	2016-01-07 22:28:33 +05:30
Ace	a8ca6887f8	Adding fixes for DAS components to co-exist with MB components	2016-01-07 19:07:04 +05:30
Ace	82c0c226f9	Including mb features in pack	2016-01-06 10:51:21 +05:30
Ace	4752b12545	Integrating mb features to IotServer	2016-01-05 19:13:23 +05:30
Shabirmean	f29fa5e89e	Force add the temporary jars relevant to DAS fix patches	2016-01-05 11:00:53 +05:30
Ace	ddf04e867e	Changing gateway ports to http/https ports	2015-12-23 11:57:13 +05:30
Ace	424dd7979f	Adding white listed tag to apim config	2015-12-23 03:41:58 +05:30
Shabir Mohamed	b0f70a9b1b	Revert "Added mb feature"	2015-12-22 16:29:25 +05:30
sdkottegoda	1ee42cc94e	Added mb feature	2015-12-22 14:27:13 +05:30
charithag	959d275dca	Override server startup script to overcome out of memory error	2015-12-21 13:17:36 +05:30
Shabirmean	e02a31f6ee	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-12-18 11:13:31 +05:30
Shabirmean	dc475b3542	Adding updated keystone file with default "RA" and "CA" certs	2015-12-18 11:13:18 +05:30
Ace	35b3cf8d35	Adding additional listener to read features	2015-12-17 19:52:45 +05:30
Ace	75cdffb651	Adding device cloud grant type	2015-12-15 20:13:23 +05:30
Ace	2fd99fa85d	Adding fix for API Store/Publisher login	2015-12-15 11:22:22 +05:30
Shabirmean	86675ecf92	removing virtual_firealarm datasource info from master-datasources xml	2015-12-14 19:37:21 +05:30
Shabirmean	631d907613	Adding separate jaggery module "apimstore" to evade conflicts with the module used by APPM	2015-12-14 17:02:14 +05:30
Ace	5e7bbd6cb6	Fixing api manager store/publisher login issue	2015-12-14 10:25:08 +05:30
charithag	4dcd064f8b	Use custom carbon xml and Add DAS portal jaggery app	2015-12-11 11:06:37 +05:30
charithag	c08aa706e6	Removed oltu patch since it is included in identity 5.0.3	2015-12-10 18:56:20 +05:30
Ace	8cc653a788	bumping identity to 5.0.3 and other fixes	2015-12-10 14:31:01 +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
charithag	584ba63494	Update logo	2015-12-07 13:44:59 +05:30
charithag	2c1efd1af0	Migrated to EMM based product	2015-12-05 14:05:35 +05:30
ayyoob	320f754356	resolved few started errors	2015-11-28 01:27:40 +05:30
charithag	08d2d9d6a7	Removed un used cdm dbscripts	2015-10-22 06:48:00 +05:30
charithag	76de89bd05	Add components necessory to work with internal APIM	2015-10-13 00:46:26 +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	4c64456b36	Add ES themed login page	2015-10-08 14:19:56 +05:30
charithag	b525895ac2	Fix sso-idp-config issue	2015-10-05 12:01:28 +05:30
ayyoob	b7daf92ada	Integrated DAS for stat	2015-10-05 03:13:54 +05:30
charithag	864ee63807	Fix sso issue and copy sso-idp-configs.xml from src/repository to pack	2015-10-04 19:55:28 +05:30
ayyoob	a2ffaf170d	updated jaggery version and added ES IDP configs	2015-10-04 01:50:27 +05:30
ayyoob	e6d9cb82af	merged with upstream	2015-10-01 16:47:37 +05:30
ayyoob	ca11c630ad	APIM, Store, DAS features merged to one pack	2015-10-01 16:10:10 +05:30
ayyoob	09285aea5e	resolved build issues	2015-09-24 12:07:25 +05:30
ayyoob	d08d7cb048	added analytics commons data publisher and used dal layer to capture the data	2015-09-22 19:23:06 +05:30
Rasika Perera	034d1993fc	moving jaggery apps to device-cloud	2015-09-16 16:57:44 +05:30
Rasika Perera	b4b279bf13	moving jaggery apps to device-cloud	2015-09-16 16:56:15 +05:30
Rasika Perera	375731422c	moving jaggery apps to device-cloud	2015-09-16 16:40:57 +05:30
charithag	3766bbec06	Merge remote-tracking branch 'origin/master' ... # Conflicts: # modules/distribution/src/assembly/bin.xml	2015-09-16 16:09:44 +05:30
charithag	220b25a4ef	Update with device-cloud changes	2015-09-16 16:08:39 +05:30
Rasika Perera	af259ef021	adding deviceType.rxt and adding few extensions	2015-09-16 14:06:03 +05:30