megala21
|
1178869ef3
|
Updating versions
|
2017-05-16 20:20:55 +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 |
|
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 |
|
ayyoob
|
08286dd88b
|
Merge branch 'master' of https://github.com/wso2/product-iots into new-master2
|
2017-05-08 12:00:01 +05:30 |
|
sinthuja
|
c84dd34eaa
|
Merge branch 'wso2-master' into test-merge
# Conflicts:
# modules/distribution/src/core/plugins/plugins-deployer.xml
# pom.xml
|
2017-05-08 11:57:07 +05:30 |
|
sinthuja
|
b94b171057
|
Removing gateway profile, and merging it with device backend.
|
2017-05-08 11:47:31 +05:30 |
|
Hasunie
|
ba9e27278f
|
Merge pull request #411 from Megala21/test_case_fixes
Adding initial jmeter scripts for app-publisher
|
2017-05-08 09:23:07 +05:30 |
|
megala21
|
72d1891932
|
Adding initial jmeter scripts for app-publisher
|
2017-05-05 17:29:54 +05:30 |
|
ayyoob
|
59d84129e1
|
updated component version
|
2017-05-05 03:02:50 +05:30 |
|
ayyoob
|
475bd3ac84
|
added filter properties to pick the parent plugins version
|
2017-05-05 01:55:19 +05:30 |
|
ayyoob
|
834ad4f772
|
added missing appm features and installed android sense feature to the default pack
|
2017-05-05 01:36:36 +05:30 |
|
sinthuja
|
3c74373597
|
Adding virtual fire alarm device type into the plugins deployer.
|
2017-05-04 21:42:00 +05:30 |
|
sinthuja
|
6af2d23ef5
|
Adding Raspberry device type into the plugins deployer.
|
2017-05-04 16:29:27 +05:30 |
|
sinthuja
|
7f06333cf8
|
Adding the ardino features to the plugins.
|
2017-05-04 15:58:28 +05:30 |
|
sinthuja
|
37c3cf2d09
|
Adding andriod sense related features for the profiles.
|
2017-05-04 15:38:40 +05:30 |
|
Rasika Perera
|
7c4f1d9ae2
|
Merge pull request #401 from amalhub/master
Updating cdmf version
|
2017-05-03 20:50:02 +05:30 |
|
amalhub
|
8af5aa3beb
|
Updating cdmf version
|
2017-05-03 20:37:29 +05:30 |
|
Amal Gunatilake
|
7db4733b1d
|
Merge pull request #399 from sinthuja/test-merge
Merging profile related fixes.
|
2017-05-03 14:38:20 +05:30 |
|
Ayyoob Hamza
|
085c1a3ab0
|
Merge pull request #386 from amalhub/master
Updating cdmf/plugins version
|
2017-05-02 21:23:00 +05:30 |
|
Amal Gunatilake
|
af2d760e5b
|
Merge branch 'master' into master
|
2017-05-02 20:41:59 +05:30 |
|
Amal Gunatilake
|
448d2f9b69
|
Updating the latest carbon.device.mgt.plugin.version
|
2017-05-02 20:39:00 +05:30 |
|
Amal Gunatilake
|
8703eae326
|
Updating cdmf/plugins version
|
2017-05-02 20:37:43 +05:30 |
|
sinthuja
|
d0e449ced0
|
Fixing the issues in the server ports mapping.
|
2017-05-02 19:18:58 +05:30 |
|
sinthuja
|
c3743ea163
|
Merge branch 'wso2-master' into test-merge
|
2017-05-02 18:54:05 +05:30 |
|
Chatura Dilan
|
f0ecea5359
|
Merge pull request #392 from janakamarasena/master
Change comment in bin.xml
|
2017-05-02 17:07:46 +05:30 |
|
inoshperera
|
c7bd347618
|
Merge pull request #391 from sinthuja/local-branch2
Adding the missing social.xml file.
|
2017-05-02 16:05:11 +05:30 |
|
sinthuja
|
afbea8e4cf
|
Merge pull request #396 from Megala21/test_case_fixes
Adding policy mangement test cases
|
2017-05-02 13:54:02 +05:30 |
|
megala21
|
ed7e574939
|
Adding policy mangement test cases
|
2017-05-02 13:16:55 +05:30 |
|