Commit Graph

1894 Commits

Author SHA1 Message Date
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
Ruwan
a862e76358 Merge pull request #382 from amalhub/master
Updating the latest carbon.device.mgt.plugin.version
2017-04-25 14:32:47 +05:30
Amal Gunatilake
a7c21fd22b Updating the latest carbon.device.mgt.plugin.version 2017-04-25 14:16:11 +05:30
Amal Gunatilake
6933ed2fad Updating the latest carbon.device.mgt.plugin.version 2017-04-25 14:14:52 +05:30
Charitha Goonetilleke
00e37baa15 Merge pull request #378 from ruwany/master
Merging cherrypicked commits from cloud-310 branch
2017-04-25 13:55:53 +05:30
Ace
53f8f2286f updating cdmf plugins and core versions 2017-04-25 13:55:14 +05:30
sinthuja
961f01c2ca Merge pull request #380 from amalhub/master
Updating carbon-dashboard version to resolve security issue
2017-04-25 10:59:12 +05:30
Amal Gunatilake
9558e5d694 Updating carbon-dashboard version to resolve security issue
https://github.com/wso2/product-iots/issues/379
2017-04-25 10:46:28 +05:30
Ace
0fbe53d75b Merging cherrypicked commits from cloud-310 branch 2017-04-25 09:54:32 +05:30
Ayyoob Hamza
66be42a9ba Merge pull request #374 from Megala21/test_case_fixes
Adding initial test cases with j-meter scripts
2017-04-21 17:02:32 +05:30
megala21
bb83e60475 Adding back the removed opera browser 2017-04-21 16:43:01 +05:30
megala21
e5df961298 Adding initial integration with device management api jmeter scripts 2017-04-21 15:50:53 +05:30
Ayyoob Hamza
0df8dd1646 Merge pull request #371 from Megala21/test_case_fixes
Fixing test case failure
2017-04-20 09:17:47 +05:30
megala21
81a4e7c503 Fixing test case failure 2017-04-20 09:15:02 +05:30
Amal Gunatilake
1e0c018d95 Merge pull request #367 from sinthuja/test-merge
Fixes for profile creator for windows.
2017-04-19 20:37:42 +05:30
sinthuja
2ef609d09c Bug files for the profile-creator.bat after testing in windows machine, and improvements for script file. 2017-04-19 19:07:35 +05:30