ayyoob
|
76ddf4fe57
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
2017-06-17 19:33:14 +05:30 |
|
ayyoob
|
5f80490332
|
added device type test case
|
2017-06-17 18:54:59 +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 |
|
ayyoob
|
bf02c6ccb7
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
2017-06-15 10:00:56 +05:30 |
|
ayyoob
|
f167b20192
|
updated migration db queries
|
2017-06-15 09:47:46 +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 |
|
ayyoob
|
4e248659ed
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
2017-06-14 13:23:59 +05:30 |
|
ayyoob
|
72b66504f4
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
pom.xml
|
2017-06-14 13:23:48 +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
|
8ddac1d037
|
merged with origin
|
2017-06-12 11:50:45 +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 |
|
ayyoob
|
fcfd39f54d
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
pom.xml
|
2017-06-08 14:45:36 +05:30 |
|
ayyoob
|
bcffd2d41e
|
adding http push notification feature
|
2017-06-08 14:40:18 +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 |
|
ayyoob
|
d4ff9da16d
|
updated migration script
|
2017-06-06 11:01:16 +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 |
|
GDLMadushanka
|
f94713b70a
|
pom modified to version
|
2017-06-05 16:46:23 +05:30 |
|
GDLMadushanka
|
5c782a6c15
|
CarbonServerManager moved to IOTS from platform integration test tools
|
2017-06-05 16:40:45 +05:30 |
|
ayyoob
|
5785ee1072
|
intial commit for db migration from 3.0.0 - 3.1.0
|
2017-06-05 00:13:52 +05:30 |
|
ayyoob
|
12837efd6d
|
renamed content validator type name
|
2017-06-04 06:53:21 +05:30 |
|
ayyoob
|
80ecba8528
|
migrated new kernel and mb version
|
2017-06-01 10:47:59 +05:30 |
|
Hasunie
|
1375b89a4c
|
Merge pull request #497 from madhawap/master
Upgraded carbon.device.mgt and carbon.device.mgt.plugins versions
|
2017-05-30 11:41:53 +05:30 |
|
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
|
2017-05-30 11:37:48 +05:30 |
|
ayyoob
|
1a5c3ab51f
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-05-29 05:46:34 +05:30 |
|