83 Commits

Author	SHA1	Message	Date
Shabirmean	40ea51d3bf	Changed the source of the device-type datasources to copy from.	2015-12-21 11:54:31 +05:30
charithag	71a19d05c4	Fix api-store loggin issue	2015-12-14 18:26:05 +05:30
Shabirmean	727e6358d1	Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server	2015-12-14 17:03:11 +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
sajithar	a9bc546253	changed bin.xml to exclude 'app-conf.json' from UUF and CDMF apps.	2015-12-14 15:33:26 +05:30
charithag	99b123bf74	Add jaggery conf from cdmf	2015-12-14 13:54:30 +05:30
charithag	c32caa6067	Copy cdmf related uuf contents from devicemgt-cdmf	2015-12-14 12:25:57 +05:30
Ace	7e0d384dc9	Copying api publisher/store feature to pack	2015-12-12 12:19:52 +05:30
charithag	a9dcd8cd21	Moved analytics toCDMF coomponents	2015-12-11 22:54:17 +05:30
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
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
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
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	910b52db75	adding social dbscripts to product	2015-12-08 23:02:02 +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	d09128f482	excluding "appmoauth2.war" from the build	2015-12-07 18:53:32 +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
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
ayyoob	ec47429127	few changes after testing	2015-10-16 18:30:19 +05:30
ayyoob	2d2ab1cdf3	update the bin file	2015-10-16 16:58:51 +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
Ace	933b01a4f8	Adding fix for MT issue and missing config files	2015-10-08 11:47:40 +05:30
Ace	57da4fb9c4	changing bin.xml to fix duplicate files in pack	2015-10-07 12:21:16 +05:30
charithag	b525895ac2	Fix sso-idp-config issue	2015-10-05 12:01:28 +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
charithag	4631df2770	Merge remote-tracking branch 'origin/master'	2015-09-23 11:58:55 +05:30
charithag	8797dc4e1b	Temporary fix for build break due to analytics lite feature dependency until Ayyob commits his changes	2015-09-23 11:58:41 +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
Shabir Mohamed	4ccc8b58c5	changes to enable default samples with the new deviceType txt	2015-09-22 11:24:28 +05:30
Rasika Perera	83d8acffe8	removing excludes on jaggery app copy	2015-09-16 18:36:42 +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