1195 Commits

Author	SHA1	Message	Date
sinthuja	13e8764f23	Removing unnecessary configuration elements.	2017-03-07 16:50:21 +05:30
sinthuja	546fc02ac4	fixing the build failure.	2017-03-07 16:46:35 +05:30
sinthuja	2f3eb595a2	Adding iot distribution with restructure components.	2017-03-07 16:42:46 +05:30
sinthuja	2a9f940b48	Adding analytics, broker profiles.	2017-03-06 16:32:40 +05:30
sinthuja	39e781c492	Making the core with default profile.	2017-03-06 16:09:20 +05:30
Susinda	06c8e7ae36	mobile-qsg refactored and dependencies copied from maven	2017-03-02 22:53:01 +05:30
Susinda	89357d0f0d	Using the carbon.api.mgt.version 6.1.69, hence removing api#am#store.war	2017-02-28 20:02:59 +05:30
amalhub	1a79017ac1	Fixing issue: IOTS-492, Replace default api#am#store.war with the patched war	2017-02-27 17:35:44 +05:30
Rasika Perera	088d1a802e	Fixing carbon apps copy path	2017-02-23 15:10:30 +05:30
madhawap	00ab274d9e	resolving conflicts when merging cloud and master brnaches	2017-02-14 16:56:55 +05:30
madhawap	74edd97322	minor fix	2017-02-14 12:56:41 +05:30
Susinda Perera	905a7d8c50	Merge pull request #289 from ayyoob/210releasepatch ... merging from Ayyoob - removed mutualssl feature and the updated apim version	2017-02-13 17:13:58 +05:30
lakshani	d0926571dc	added test cases for chage device status	2017-02-13 15:04:02 +05:30
Rasika Perera	b697618b42	Update pom.xml	2017-02-13 14:51:55 +05:30
Menaka Jayawardena	f4c26edb74	Enabled backend integration tests in the build	2017-02-13 14:50:07 +05:30
Menaka Jayawardena	9535f4f8c0	Removed unwanted dependency	2017-02-13 14:45:48 +05:30
susinda	5de566ca0c	device operation permisions changed, removed 'any-device', added 'disenrole' and 'owning-device'	2017-02-13 14:42:57 +05:30
Menaka Jayawardena	e70306ac17	Fixed Android Operations Integration Tests.	2017-02-13 14:42:27 +05:30
susinda	84adbc45ae	binaries and images removed, added all (script + jars) in the script_and_resources.zip file	2017-02-13 14:41:32 +05:30
susinda	cb1a3d462d	ios policy addition moved to bottom, passwords changed	2017-02-13 14:41:07 +05:30
lakshani	14645232b8	merging lakshani's changes on app-manager	2017-02-13 14:32:37 +05:30
GPrathap	f3f1fc40cb	fixing a csrf property issue	2017-02-13 14:27:27 +05:30
Menaka Jayawardena	4d485c39c1	Merge PR #272 from menakaj	2017-02-13 14:26:23 +05:30
Menaka Jayawardena	134200375a	merging menaka's commit	2017-02-13 14:22:27 +05:30
susinda	16c8948dea	adding modified jars	2017-02-13 14:00:27 +05:30
susinda	ba7a9c2f45	Some issues fixed for ios app upload and logs added, readme modified with new usernames	2017-02-13 13:59:19 +05:30
Menaka Jayawardena	816657a117	Removed Thread.sleep usages.	2017-02-13 13:57:41 +05:30
Menaka Jayawardena	962623f257	Fixed Mobile device management and Android Enrollment test flows.	2017-02-13 13:57:16 +05:30
susinda	cffb96bc93	Adding required files (apk, ipa, images and other)	2017-02-13 13:55:51 +05:30
susinda	c2891c76e0	emm renamed to IoTs, some permisiosn issues fixed, names changed to ryan and milan	2017-02-13 13:54:59 +05:30
susinda	0779e358ed	merging susinda's commit 'mobile-qsg code added'	2017-02-13 13:53:21 +05:30
ayyoob	cb9d17882c	removed mutualssl feature and the updated apim version	2017-02-09 03:04:25 +05:30
ayyoob	59b86f9d50	Merge branch 'cloud-3.1.0' of https://github.com/wso2/product-iots into cloud-3.1.0	2017-02-08 13:14:23 +05:30
ayyoob	7daedd6516	added jwt authenticator	2017-02-08 13:11:03 +05:30
kamidu	0eb45e7c92	add the cloud menu to the iot pack	2017-02-07 20:24:23 +05:30
ayyoob	ef99c0f306	added default credential as properties	2017-02-06 03:48:20 +05:30
ayyoob	1e25f08945	fixed tokenValidationUrlIssue	2017-02-06 00:52:36 +05:30
ayyoob	f890415bae	enabled mutual ssl support and added artifact deployment related features	2017-02-05 17:53:37 +05:30
ayyoob	ecda000395	used jwt grant type instead of saml	2017-02-04 20:52:24 +05:30
ayyoob	b03b958979	changes adapter configs after testing	2017-02-02 03:17:40 +05:30
ayyoob	c61cd953b2	few fixes after testing sso	2017-02-01 00:08:51 +05:30
ayyoob	3610ed762d	enabled UseAuthenticatedUserDomainCrypto	2017-01-31 14:19:02 +05:30
ayyoob	ab70dbe38a	few changes after testing multi tenancy	2017-01-30 22:33:18 +05:30
Ayyoob Hamza	26197ef770	Merge pull request #271 from ayyoob/3.0.0 ... removed apim dependencies and solved sso tenant login issues.	2017-01-26 12:18:33 +05:30
ayyoob	ca53efdab0	fixed sso login issue in portal in multi tenant	2017-01-26 00:30:03 +05:30
Menaka Jayawardena	a6519d1e04	Restored data sources change.	2017-01-25 17:14:03 +05:30
Menaka Jayawardena	3f010951af	POM versions updated for next release.	2017-01-25 17:10:47 +05:30
Menaka Jayawardena	e8508b1dd0	Modifying Integration tests.	2017-01-25 16:26:40 +05:30
Menaka Jayawardena	5d41fe313b	Merge branch 'backend-integration' ... # Conflicts: # modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java # modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java # modules/integration/tests-integration/src/test/resources/automation.xml # modules/integration/tests-integration/src/test/resources/testng.xml	2017-01-25 15:50:43 +05:30
ayyoob	2ca23cce29	changed configs to support custom grant type	2017-01-25 14:25:28 +05:30