Commit Graph

1759 Commits

Author SHA1 Message Date
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
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
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
sinthuja
8addff0bc2 Updating the appm component version. 2017-05-02 12:46:38 +05:30
Ayyoob Hamza
854d09f43a Merge pull request #389 from Megala21/test_case_fixes
Improving test-cases and moving the security related filters into the carbon-devicemgt level
2017-04-29 22:34:31 +05:30
megala21
a1688140c5 Adding notification management jmeter script 2017-04-29 22:23:01 +05:30
sinthuja
00947e30b2 Fixing an issue in the key manager URL. 2017-04-28 18:50:15 +05:30
sinthuja
0753585391 Adding the missing social.xml file. 2017-04-28 18:05:06 +05:30
sinthuja
30c4c40f08 Adding the profile related improvements. 2017-04-28 18:03:15 +05:30
Janak Amarasena
fd1cf890a2 Change comment 2017-04-28 16:53:39 +05:30
megala21
583b562d8e Removing the un-wanted copying of files 2017-04-28 00:19:48 +05:30
megala21
fbf9ab7c00 Merge remote-tracking branch 'upstream/master' into test_case_fixes 2017-04-27 21:57:16 +05:30
megala21
fbab71b0f7 Improving multi-tenancy test cases and fixing certificate management public publish issue 2017-04-27 17:35:17 +05:30
sinthuja
582260f40d Merge pull request #385 from Megala21/test_case_fixes
Adding initial test cases for group management and negative test cases for android apis
2017-04-27 17:32:45 +05:30
sinthuja
badc75a222 Merge branch 'wso2-master' into test-merge 2017-04-27 12:58:44 +05:30
sinthuja
5ec80d4c0a Moving the client-registration apps to device manager. 2017-04-27 12:58:13 +05:30
sinthuja
6ddc2da328 Adding fixes related to ease distributed setup. 2017-04-27 12:47:32 +05:30
Amal Gunatilake
7b092c8bb6 Adding Java 8 build status badge 2017-04-27 12:36:45 +05:30
megala21
fb5d73ecbe Improving scripts 2017-04-27 10:33:45 +05:30
megala21
0fea4d6eb0 Adding android negatove test cases and group management initial test cases 2017-04-27 01:42:35 +05:30
Amal Gunatilake
faa5eb34d6 Merge pull request #384 from sinthuja/test-merge
Adding device manager profile node also in the indexing profiles
2017-04-26 15:40:57 +05:30
sinthuja
7a4171be63 Removing the device-manager profile from webapp-publisher-config.xml. 2017-04-26 15:23:51 +05:30
sinthuja
93cd14bc43 Adding the device-manager backend profile as well for webapp publishing. 2017-04-26 14:18:06 +05:30
sinthuja
3a5f77c287 Adding device manager profile node also in the indexing profiles for the store to work in the distributed mode. 2017-04-26 14:10:02 +05:30