Commit Graph

1805 Commits

Author SHA1 Message Date
Ace
e6850a2b2b increasing timeout for test 2017-06-12 17:20:00 +05:30
Amal Gunatilake
c71d6000d5 Merge pull request #995 from janakamarasena/master
Update CDM and Plugins version
2017-06-09 14:51:50 +05:30
Janak Amarasena
4347c9aca9 Update CDM and Plugins version 2017-06-09 14:47:53 +05:30
Chatura Dilan
861f194e18 Merge pull request #993 from janakamarasena/new-auth-grant
Add new supported grant type
2017-06-07 16:47:35 +05:30
Janak Amarasena
c3ad20b18a Add new supported grant type 2017-06-07 14:26:29 +05:30
Megala Uthayakumar
38df008123 Merge pull request #707 from GDLMadushanka/master
CarbonServerManager class moved to IOTS from platform integration test tools
2017-06-06 10:55:50 +05:30
GDLMadushanka
d376a91745 JavaDocs added 2017-06-06 10:44:24 +05:30
GDLMadushanka
43d8dc38b1 Clean up code 2017-06-06 07:49:42 +05:30
GDLMadushanka
f94713b70a pom modified to version 2017-06-05 16:46:23 +05:30
GDLMadushanka
5c782a6c15 CarbonServerManager moved to IOTS from platform integration test tools 2017-06-05 16:40:45 +05:30
Hasunie
1375b89a4c Merge pull request #497 from madhawap/master
Upgraded carbon.device.mgt and carbon.device.mgt.plugins versions
2017-05-30 11:41:53 +05:30
madhawap
e2108e5c29 Upgraded carbon.device.mgt and carbon.device.mgt.plugins versions
Upgraded the versions carbon.device.mgt.version to 2.0.69 and carbon.device.mgt.plugins.version to 3.0.37
2017-05-30 11:37:48 +05:30
sinthuja
cadfba3c05 Merge pull request #483 from Megala21/test_case_fixes
Adding test cases for virtual fire-alarm
2017-05-23 14:55:18 +05:30
megala21
976bdb2292 Fixing issues 2017-05-23 12:03:05 +05:30
megala21
ee94b8ce8f Adding initial cut virtual fire-alarm policy publish scenario 2017-05-23 01:42:11 +05:30
megala21
1aadd2b171 Adding initial test cases for virtual fire alarm 2017-05-21 01:07:10 +05:30
sinthuja
fa21f8cfd6 Merge pull request #453 from Megala21/test_case_fixes
Adding test cases for android sense and mobile-qsg script execution.
2017-05-17 11:47:00 +05:30
megala21
70763e42c2 Merge remote-tracking branch 'upstream/master' into test_case_fixes 2017-05-16 20:21:00 +05:30
megala21
1178869ef3 Updating versions 2017-05-16 20:20:55 +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
974a113ac3 Resolving conflicts 2017-05-16 14:39:17 +05:30
megala21
8ee4c2dbba Adding test cases for quick start guide 2017-05-16 14:36:11 +05:30
sinthuja
022f11468f Merge pull request #442 from Megala21/master
Fixing test case failure
2017-05-16 10:10:48 +05:30
megala21
8cd51b41c3 Merge remote-tracking branch 'upstream/master' 2017-05-16 10:08:57 +05:30
megala21
2338043eee Fixing test case failure 2017-05-16 10:08:13 +05:30
sinthuja
881474f682 Merge pull request #441 from Megala21/master
Fixing issues in publisher UI and SSO login
2017-05-16 09:21:13 +05:30
megala21
79a4f58929 Fixing issue in tenant-conf.json copying location 2017-05-16 09:06:27 +05:30
megala21
f6507d1ed6 Fixing issues in publisher UI and SSO login 2017-05-15 22:24:18 +05:30
megala21
19b06bc8bc Adding android sense test cases 2017-05-15 00:31:24 +05:30
Rasika Perera
246d84cb19 Merge pull request #421 from ayyoob/new-master2
Added filter properties for analytics plugin deployer and added android sense as a feature to the pack
2017-05-11 15:39:45 +05:30
ayyoob
408f392af2 merged with origin 2017-05-09 19:46:59 +05:30
ayyoob
d8620a0088 merged with origin 2017-05-09 19:33:05 +05:30
ayyoob
663a125b4a updated pom version 2017-05-09 19:22:03 +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 Hamza
9689ecc99f Merge pull request #424 from sinthuja/test-merge
Modifying the plugins deployer with sub device type features.
2017-05-08 23:41:05 +05:30
sinthuja
2ec2c2e5b5 removing the android sense feature from key manager profile. 2017-05-08 23:36:03 +05:30
sinthuja
2f3819107a Merge branch 'wso2-master' into test-merge
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/distribution/src/core/plugins/plugins-deployer.xml
#	modules/p2-profile/iot-core-profile/pom.xml
#	pom.xml
2017-05-08 22:48:51 +05:30
sinthuja
efe3d7aefb Updating the device mgt plugins version. 2017-05-08 22:38:25 +05:30
sinthuja
afae580959 Fixing the issue in the build. 2017-05-08 22:37:22 +05:30
ayyoob
55a46201bd removed android sense from the default features 2017-05-08 17:23:42 +05:30
ayyoob
1ebffd2651 Merge branch 'master' of https://github.com/wso2/product-iots into new-master2 2017-05-08 17:12:40 +05:30
Amal Gunatilake
9608d22ef6 Merge pull request #405 from ayyoob/new-master2
Added missing appm features/ installed android sense feature / fixed stats deploying issue
2017-05-08 13:41:35 +05:30