Commit Graph

696 Commits

Author SHA1 Message Date
sinthuja
b363714446 fixing the issue in creating the connected cup instance. 2017-06-22 20:45:52 +05:30
sinthuja
602e012e2e committing the intermediate changes. 2017-06-22 18:11:52 +05:30
Geeth
911d001aa6 Merge pull request #1034 from sinthuja/test-merge
Fixing  https://github.com/wso2/product-iots/issues/776.
2017-06-22 14:45:00 +05:30
sinthuja
56cbef3f35 Fixing https://github.com/wso2/product-iots/issues/776. 2017-06-22 14:23:05 +05:30
Harshan Liyanage
c240fb9a71 Merge branch 'master' of https://github.com/wso2/product-iots 2017-06-21 18:34:03 +05:30
Harshan Liyanage
0a7e33961a Fixed sample-deployer issues which resolves wso2/product-iots#458 2017-06-21 18:33:39 +05:30
Rasika Perera
d48b7d4939 Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied 2017-06-21 14:52:25 +05:30
Rasika Perera
c2b573b32c Adding geo fencing 2017-06-16 16:15:15 +05:30
sinthuja
b59aec2e48 Fixing the license year in script files. 2017-06-15 13:51:59 +05:30
sinthuja
38963cb807 Fixing #1003. 2017-06-15 13:42:18 +05:30
sinthuja
6ac04eba48 Fixing https://github.com/wso2/product-iots/issues/1000. 2017-06-13 12:56:24 +05:30
sinthuja
2fc5104043 Fixing https://github.com/wso2/product-iots/issues/522. 2017-06-13 12:19:13 +05:30
Janak Amarasena
c3ad20b18a Add new supported grant type 2017-06-07 14:26:29 +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
79a4f58929 Fixing issue in tenant-conf.json copying location 2017-05-16 09:06:27 +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
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
Amal Gunatilake
7db4733b1d Merge pull request #399 from sinthuja/test-merge
Merging profile related fixes.
2017-05-03 14:38:20 +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
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
megala21
ed7e574939 Adding policy mangement test cases 2017-05-02 13:16:55 +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
fbab71b0f7 Improving multi-tenancy test cases and fixing certificate management public publish issue 2017-04-27 17:35:17 +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
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
Amal Gunatilake
a7c21fd22b Updating the latest carbon.device.mgt.plugin.version 2017-04-25 14:16:11 +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
e5df961298 Adding initial integration with device management api jmeter scripts 2017-04-21 15:50:53 +05:30