Commit Graph

1847 Commits

Author SHA1 Message Date
sinthuja
a8b4699cb9 Fixing intermittent NPE in mobile QSG 2017-06-23 11:05:32 +05:30
sinthuja
c04b8e7872 Fixing the old references of the plugins-deployer, and owsap log in the integration tests. 2017-06-22 23:26:45 +05:30
sinthuja
099ce78ea3 Adding missing http push notification extension. 2017-06-22 22:56:09 +05:30
sinthuja
eb473cb7ea Fixing the integration tests with modified plugin-deployer.xml name 2017-06-22 22:03:12 +05:30
sinthuja
778c890616 Updating the snapshot versions to released versions. 2017-06-22 21:58:29 +05:30
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
sinthuja
3e89a7564f Merge branch 'wso2-master' into test-merge
# Conflicts:
#	pom.xml
2017-06-22 16:29:53 +05:30
sinthuja
93f8acebb6 Updating the repo versions. 2017-06-22 16:28:48 +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
Geeth
7927d4c533 Merge pull request #1031 from harshanL/master
Fixed product-iots#458
2017-06-21 18:55:17 +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
a5513f5500 Merge pull request #1020 from rasika/master
Adding geo fencing
2017-06-21 14:53:43 +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
Geeth
003b3d904a Merge pull request #1028 from sinthuja/test-merge
Updating the cipher tool version.
2017-06-20 16:53:58 +05:30
sinthuja
ade2a65f68 Updating the cipher tool version. 2017-06-20 16:52:20 +05:30
Rasika Perera
c2b573b32c Adding geo fencing 2017-06-16 16:15:15 +05:30
Geeth
4452947c20 Merge pull request #1017 from harshanL/master
Updated device-mgt & device-mgt-plugin versions.
2017-06-16 11:46:02 +05:30
Harshan Liyanage
4a5c538395 Updated device-mgt & device-mgt-plugin versions. 2017-06-15 17:15:17 +05:30
Geeth
ef8ce3e1c6 Merge pull request #1016 from sinthuja/test-merge
Fixing the issues in cipher tool.
2017-06-15 14:19:13 +05:30
sinthuja
b59aec2e48 Fixing the license year in script files. 2017-06-15 13:51:59 +05:30
sinthuja
760f35f912 Merge branch 'wso2-master' into test-merge 2017-06-15 13:42:56 +05:30
sinthuja
38963cb807 Fixing #1003. 2017-06-15 13:42:18 +05:30
Rasika Perera
53d56a9e1c Merge pull request #1014 from ruwany/master
Updatint Jenkins build link
2017-06-15 10:52:29 +05:30
Ruwan
c88ccf4e57 Updatint Jenkins build link 2017-06-15 10:50:16 +05:30
Charitha Goonetilleke
7700e555ea Merge pull request #1013 from ruwany/master
Updated readme to reflect change in jenkins
2017-06-14 21:28:07 +05:30
Ruwan
bf6e0f32bf readme changes 2017-06-14 21:21:02 +05:30
Ruwan
fe00a52b56 Updated Readme
Updated Readme to reflect change in jenkins build
2017-06-14 21:19:42 +05:30
inoshperera
27eb8f3a34 Merge pull request #1012 from ruwany/master
Increasing timeout
2017-06-14 20:32:53 +05:30
Ace
e2def31fdf Increasing timeout 2017-06-14 19:19:56 +05:30
Harshan Liyanage
6aedd8ac5a Merge pull request #1011 from ruwany/master
Optimizing server start up time when running integration tests
2017-06-14 15:31:41 +05:30
Ace
8890408f38 Optimizing server start up time when running integration tests 2017-06-14 12:37:46 +05:30
Geeth
74db12e08f Merge pull request #1006 from ruwany/master
Fixing test failure
2017-06-13 17:12:45 +05:30
Ace
a75f6bc12e Fixing test failure 2017-06-13 17:12:06 +05:30
Ruwan
5f8b74e94c Merge pull request #1001 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/1000.
2017-06-13 13:04:22 +05:30
sinthuja
6ac04eba48 Fixing https://github.com/wso2/product-iots/issues/1000. 2017-06-13 12:56:24 +05:30
Ruwan
fbf45f8f8f Merge pull request #999 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/522.
2017-06-13 12:20:52 +05:30
sinthuja
2fc5104043 Fixing https://github.com/wso2/product-iots/issues/522. 2017-06-13 12:19:13 +05:30
Ace
e6850a2b2b increasing timeout for test 2017-06-12 17:20:00 +05:30
Ayyoob Hamza
0710e92640 Merge pull request #996 from Megala21/test_case_fixes
Increasing the timeout in test cases
2017-06-12 10:41:24 +05:30
megala21
6b5d4bf05f Increasing the timeout 2017-06-10 23:46:24 +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