Commit Graph

2457 Commits

Author SHA1 Message Date
megala21
ddf7121315 Adding initial jacoco plugin 2017-09-08 01:51:28 +05:30
Megala Uthayakumar
60f4bb4531 Merge pull request #1387 from sameerawickramasekara/master
Fixes wso2/product-iots#1355
2017-09-07 10:44:39 +05:30
Sameera Wickramasekara
26db1eaee0 Fixes wso2/product-iots#1355 2017-09-07 10:39:18 +05:30
Ruwan
34c8caa577 Merge pull request #1386 from harshanL/master
Fixed integration tests
2017-09-06 17:02:36 +05:30
Harshan Liyanage
0fccc4f967 Updated device-mgt version. 2017-09-06 16:59:57 +05:30
Harshan Liyanage
3b97d1b2fd Integration test fix for issue wso2/product-iots#1035 2017-09-04 11:42:01 +05:30
Harshan Liyanage
54715e8108 Merge pull request #1379 from sinthuja/origin-master
updating the device-mgt version to include group management fixes.
2017-09-01 18:20:32 +05:30
sinthuja
eba8ee5ed4 updating the device-mgt version to include group management fixes. 2017-09-01 18:18:40 +05:30
Harshan Liyanage
9e0976e032 Merge pull request #1378 from sinthuja/origin-master
updating the device-mgt and device-mgt-plugins repo versions.
2017-09-01 17:53:17 +05:30
sinthuja
2ea3052557 updating the device-mgt and device-mgt-plugins repo versions. 2017-09-01 17:38:36 +05:30
warunalakshitha
aedf1c487a Merge branch 'master' of https://github.com/wso2/product-iots into remote-control 2017-08-31 11:58:06 +05:30
sinthuja
f9594e0e6d Merge pull request #1359 from sameerawickramasekara/master
Fixes for product-iots#599
2017-08-30 16:57:05 +05:30
Sameera Wickramasekara
5842857857 Fixes for product-iots#599 2017-08-30 16:42:16 +05:30
Charitha Goonetilleke
227dcdb65a Merge pull request #1344 from harshanL/master
This includes fixes for wso2/product-iots#1293
2017-08-29 13:17:48 +05:30
Harshan Liyanage
5fd140e523 This includes fixes for wso2/product-iots#1293 2017-08-29 13:11:11 +05:30
Charitha Goonetilleke
0cf732ba93 Merge pull request #1342 from dilee/master
Fixing product-iots#1236
2017-08-29 12:17:33 +05:30
Dileesha Rajapakse
ca66602fa6 Fixed typos in conf files 2017-08-29 12:03:32 +05:30
Dileesha Rajapakse
1b402be22d Merge branch 'master' of https://github.com/wso2/product-iots 2017-08-29 11:58:00 +05:30
Dileesha Rajapakse
13b4eda1c8 Fixing product-iots#1236
Fixed https://github.com/wso2/product-iots/issues/1236
2017-08-29 11:57:49 +05:30
sinthuja
e42744eb4d Merge pull request #1340 from Nirothipan/master
Fixes for [EMM-1816] By default https://localhost:9443/ redirect to carbon console - redirect to /emm instead
2017-08-29 10:13:16 +05:30
Nirothipan
bb68e6d59c redirecting default url from cabon home to devicemgt 2017-08-28 18:58:02 +05:30
Ruwan
975954e0cc Merge pull request #1337 from geethkokila/master
Fixing the instrumentations dependencies
2017-08-28 13:21:11 +05:30
geethkokila
f390f3695d Fixing the instrumentations dependencies 2017-08-28 12:04:55 +05:30
WSO2 Builder
224ae5a7f6 [maven-release-plugin] prepare for next development iteration 2017-08-23 05:55:38 +00:00
WSO2 Builder
667a23c03f [maven-release-plugin] prepare release v3.1.0-update1 2017-08-23 05:54:14 +00:00
Harshan Liyanage
688df8cb48 Merge pull request #1328 from ruwany/master
Correcting kernel version
2017-08-23 10:34:12 +05:30
Ace
d50986b6ac Correcting kernel version 2017-08-23 10:35:43 +05:30
Madhawa Perera
09761b2c1a Merge pull request #1327 from ruwany/master
Updating devicemgt core and plugin dependencies
2017-08-22 15:09:38 -04:00
Ace
21a3d56cc9 Updating devicemgt core and plugin dependencies 2017-08-23 00:32:24 +05:30
Geeth
55bbc8219e Merge pull request #1310 from milanperera/f-master
prepare for next development iteration
2017-08-18 10:19:44 +05:30
Milan Perera
975da56316 prepare for next development iteration 2017-08-18 10:13:48 +05:30
Kamidu Sachith Punchihewa
af1e9ace45 Merge pull request #1294 from sameerawickramasekara/master
New sample device type from Java code
2017-08-16 11:27:09 +05:30
Sameera Wickramasekara
6b4f3d0373 Trim deviceId to remove extra spaces 2017-08-14 17:41:41 +05:30
Sameera Wickramasekara
273cb989d4 Add new device type sampledevice 2017-08-14 17:17:57 +05:30
Sameera Wickramasekara
7450910748 remove raspberrypicodebased devicetype 2017-08-14 17:15:51 +05:30
WSO2 Builder
e7706289ff [maven-release-plugin]prepare for next development iteration 2017-08-11 09:56:41 +00:00
WSO2 Builder
526a8b95f3 [maven-release-plugin]prepare release v3.1.0-RC4 2017-08-11 09:55:17 +00:00
Geeth
3500937e95 Merge pull request #1297 from milanperera/release-master
Upgraded carbon core and plugins versions
2017-08-11 14:33:26 +05:30
Milan Perera
310ddd814d Upgraded carbon core and plugins versions 2017-08-11 14:31:12 +05:30
Sameera Wickramasekara
ed0b110ad6 Fix code formatting 2017-08-11 11:35:58 +05:30
WSO2 Builder
682babe830 [maven-release-plugin]prepare for next development iteration 2017-08-10 22:47:42 +05:30
WSO2 Builder
4b85767d39 [maven-release-plugin]prepare release v3.1.0-RC4 2017-08-10 22:47:28 +05:30
Rasika Perera
bdaf5b016b Merge pull request #1292 from milanperera/release-master
Upgraded carbon.core and plugin versions
2017-08-10 21:15:30 +05:30
Milan Perera
7e73c601b0 Upgraded carbon.core and plugin versions 2017-08-10 21:13:07 +05:30
Madawa Soysa
3bc6e2716e Merge pull request #1291 from milanperera/release-master
Modified change-ip script
2017-08-10 18:54:19 +05:30
Milan Perera
1b7c7860d7 Modified change-ip script
change-ip script has been modified to use same keystores across all three profiles in order to support carbon level server to server authentication
2017-08-10 18:51:33 +05:30
Rasika Perera
5ba3df6499 Merge pull request #1287 from evilkid/patch-1
Update change-ip.sh
2017-08-10 18:05:40 +05:30
Sameera Wickramasekara
3d359642bf Add new raspberrypicodebased device type to samples 2017-08-10 16:56:40 +05:30
Ouerghi Yassine
0f91ebfb3f Update change-ip.sh 2017-08-10 02:15:13 +01:00
warunalakshitha
a9a1b2c066 Merge branch 'master' of https://github.com/wso2/product-iots into remote-control 2017-08-09 18:24:05 +05:30