sinthuja
|
602e012e2e
|
committing the intermediate changes.
|
8 years ago |
|
sinthuja
|
3e89a7564f
|
Merge branch 'wso2-master' into test-merge
# Conflicts:
# pom.xml
|
8 years ago |
|
sinthuja
|
93f8acebb6
|
Updating the repo versions.
|
8 years ago |
Geeth
|
911d001aa6
|
Merge pull request #1034 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/776.
|
8 years ago |
|
sinthuja
|
56cbef3f35
|
Fixing https://github.com/wso2/product-iots/issues/776.
|
8 years ago |
|
Geeth
|
7927d4c533
|
Merge pull request #1031 from harshanL/master
Fixed product-iots#458
|
8 years ago |
Harshan Liyanage
|
c240fb9a71
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
8 years ago |
|
Harshan Liyanage
|
0a7e33961a
|
Fixed sample-deployer issues which resolves wso2/product-iots#458
|
8 years ago |
Rasika Perera
|
a5513f5500
|
Merge pull request #1020 from rasika/master
Adding geo fencing
|
8 years ago |
Rasika Perera
|
d48b7d4939
|
Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied
|
8 years ago |
|
Geeth
|
003b3d904a
|
Merge pull request #1028 from sinthuja/test-merge
Updating the cipher tool version.
|
8 years ago |
|
sinthuja
|
ade2a65f68
|
Updating the cipher tool version.
|
8 years ago |
|
Rasika Perera
|
c2b573b32c
|
Adding geo fencing
|
8 years ago |
|
Geeth
|
4452947c20
|
Merge pull request #1017 from harshanL/master
Updated device-mgt & device-mgt-plugin versions.
|
8 years ago |
|
Harshan Liyanage
|
4a5c538395
|
Updated device-mgt & device-mgt-plugin versions.
|
8 years ago |
|
Geeth
|
ef8ce3e1c6
|
Merge pull request #1016 from sinthuja/test-merge
Fixing the issues in cipher tool.
|
8 years ago |
|
sinthuja
|
b59aec2e48
|
Fixing the license year in script files.
|
8 years ago |
|
sinthuja
|
760f35f912
|
Merge branch 'wso2-master' into test-merge
|
8 years ago |
|
sinthuja
|
38963cb807
|
Fixing #1003.
|
8 years ago |
|
Rasika Perera
|
53d56a9e1c
|
Merge pull request #1014 from ruwany/master
Updatint Jenkins build link
|
8 years ago |
Ruwan
|
c88ccf4e57
|
Updatint Jenkins build link
|
8 years ago |
Charitha Goonetilleke
|
7700e555ea
|
Merge pull request #1013 from ruwany/master
Updated readme to reflect change in jenkins
|
8 years ago |
|
Ruwan
|
bf6e0f32bf
|
readme changes
|
8 years ago |
|
Ruwan
|
fe00a52b56
|
Updated Readme
Updated Readme to reflect change in jenkins build
|
8 years ago |
inoshperera
|
27eb8f3a34
|
Merge pull request #1012 from ruwany/master
Increasing timeout
|
8 years ago |
|
Ace
|
e2def31fdf
|
Increasing timeout
|
8 years ago |
|
Harshan Liyanage
|
6aedd8ac5a
|
Merge pull request #1011 from ruwany/master
Optimizing server start up time when running integration tests
|
8 years ago |
|
Ace
|
8890408f38
|
Optimizing server start up time when running integration tests
|
8 years ago |
|
Geeth
|
74db12e08f
|
Merge pull request #1006 from ruwany/master
Fixing test failure
|
8 years ago |
|
Ace
|
a75f6bc12e
|
Fixing test failure
|
8 years ago |
|
Ruwan
|
5f8b74e94c
|
Merge pull request #1001 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/1000.
|
8 years ago |
|
sinthuja
|
6ac04eba48
|
Fixing https://github.com/wso2/product-iots/issues/1000.
|
8 years ago |
|
Ruwan
|
fbf45f8f8f
|
Merge pull request #999 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/522.
|
8 years ago |
|
sinthuja
|
2fc5104043
|
Fixing https://github.com/wso2/product-iots/issues/522.
|
8 years ago |
|
Ace
|
e6850a2b2b
|
increasing timeout for test
|
8 years ago |
Ayyoob Hamza
|
0710e92640
|
Merge pull request #996 from Megala21/test_case_fixes
Increasing the timeout in test cases
|
8 years ago |
megala21
|
6b5d4bf05f
|
Increasing the timeout
|
8 years ago |
Amal Gunatilake
|
c71d6000d5
|
Merge pull request #995 from janakamarasena/master
Update CDM and Plugins version
|
8 years ago |
Janak Amarasena
|
4347c9aca9
|
Update CDM and Plugins version
|
8 years ago |
Chatura Dilan
|
861f194e18
|
Merge pull request #993 from janakamarasena/new-auth-grant
Add new supported grant type
|
8 years ago |
|
Janak Amarasena
|
c3ad20b18a
|
Add new supported grant type
|
8 years ago |
Megala Uthayakumar
|
38df008123
|
Merge pull request #707 from GDLMadushanka/master
CarbonServerManager class moved to IOTS from platform integration test tools
|
8 years ago |
GDLMadushanka
|
d376a91745
|
JavaDocs added
|
8 years ago |
|
GDLMadushanka
|
43d8dc38b1
|
Clean up code
|
8 years ago |
|
GDLMadushanka
|
f94713b70a
|
pom modified to version
|
8 years ago |
|
GDLMadushanka
|
5c782a6c15
|
CarbonServerManager moved to IOTS from platform integration test tools
|
8 years ago |
Hasunie
|
1375b89a4c
|
Merge pull request #497 from madhawap/master
Upgraded carbon.device.mgt and carbon.device.mgt.plugins versions
|
8 years ago |
madhawap
|
e2108e5c29
|
Upgraded carbon.device.mgt and carbon.device.mgt.plugins versions
Upgraded the versions carbon.device.mgt.version to 2.0.69 and carbon.device.mgt.plugins.version to 3.0.37
|
8 years ago |
|
sinthuja
|
cadfba3c05
|
Merge pull request #483 from Megala21/test_case_fixes
Adding test cases for virtual fire-alarm
|
8 years ago |
|
megala21
|
976bdb2292
|
Fixing issues
|
8 years ago |
