Commit Graph

2675 Commits

Author SHA1 Message Date
Charitha Goonetilleke
d6dc4b4120
Merge pull request #1591 from ruwany/master
updating component versions
2018-01-11 14:30:45 +05:30
Ace
94fdf8d97c Updating component releases to make product build auto release compatible 2018-01-11 13:55:02 +05:30
Charitha Goonetilleke
ea617c60cc
Merge pull request #1588 from ruwany/master
Fixed https://github.com/wso2/product-iots/issues/1577
2018-01-11 10:14:00 +05:30
Ace
88d2ed2b3d Merging with upstream 2018-01-11 09:19:31 +05:30
Ace
5ae5e3b344 Fixing https://github.com/wso2/product-iots/issues/1577 2018-01-10 14:03:12 +05:30
Charitha Goonetilleke
12e64ca90c
Merge pull request #1582 from rasika/master
Adding androidAgentDownloadURL for the change-ip script
2018-01-10 10:18:20 +05:30
Rasika Perera
0c89fe8b52 Version bump in devicemgt and devicemgt-plugins 2018-01-09 21:07:27 +05:30
Rasika Perera
6909c055e6 Removed android-web-agent app 2018-01-09 21:01:40 +05:30
Rasika Perera
03f5d14038 Adding androidAgentDownloadURL for the change-ip script 2018-01-09 20:09:00 +05:30
Rasika Perera
e997d89392
Merge pull request #1566 from lasanthaDLPDS/master
Adding super admin credentials changing script
2018-01-09 15:13:47 +05:30
lasantha
15bada6db5 Adding super admin credentials changing script 2017-12-31 15:04:47 +05:30
WSO2 Builder
56a181a7f6 [maven-release-plugin]prepare for next development iteration 2017-12-16 16:31:18 +00:00
WSO2 Builder
fbb708bf3c [maven-release-plugin]prepare release v3.1.0-update9 2017-12-16 16:31:02 +00:00
Madawa Soysa
7c4537b4b7 Merge pull request #1536 from lasanthaDLPDS/master
Modified Device-Mgt and Plugins Versions
2017-12-15 20:08:34 +05:30
lasantha
9df1251c79 Modify carbon-device-mgt and plugins versions for update release 2017-12-15 20:04:31 +05:30
lasantha
a6642db9ff Merge branch 'master' of https://github.com/wso2/product-iots 2017-12-15 19:59:12 +05:30
Madawa Soysa
93eccce613
Merge pull request #1535 from lasanthaDLPDS/vf-dev-api
Removing Duplicate P2 Generations
2017-12-15 14:49:52 +05:30
lasantha
2139c0f1dd removed feature generation for newly added API(v0.9) 2017-12-15 10:37:08 +05:30
lasantha
708b6a7bbb Merge branch 'master' of https://github.com/wso2/product-iots 2017-12-12 18:25:19 +05:30
lasantha
9c3137dda6 Adding new API version for backward compatibility 2017-12-12 18:20:37 +05:30
Madawa Soysa
b512077cd4
Merge pull request #1514 from madhawap/master
Additional jmeter tests for AppManager
2017-12-08 16:44:38 +05:30
madhawap
d15c8d7881 Additional jmeter tests for AppManager 2017-12-07 22:18:37 +05:30
WSO2 Builder
3f21724cc4 [maven-release-plugin] prepare for next development iteration 2017-11-30 07:02:38 +00:00
WSO2 Builder
0c96b1fba8 [maven-release-plugin] prepare release v3.1.0-update8 2017-11-30 07:02:23 +00:00
Ruwan
7980a8a2ba
Merge pull request #1507 from charithag/master
Prepare for IoTS-3.1.0-UPDATE8 release
2017-11-30 11:43:36 +05:30
charitha
1616e8873d Prepare for IoTS-3.1.0-UPDATE8 release 2017-11-30 11:41:01 +05:30
WSO2 Builder
217fb74d89 [maven-release-plugin] prepare for next development iteration 2017-11-23 15:42:07 +00:00
WSO2 Builder
5760894cd3 [maven-release-plugin] prepare release v3.1.0-update7 2017-11-23 15:41:52 +00:00
sumedharubasinghe
32c84a49d8
Merge pull request #1498 from charithag/master
Prepare for IoTS-3.1.0-UPDATE7 release
2017-11-23 20:23:45 +05:30
charitha
2c81f6cb3c Prepare for IoTS-3.1.0-UPDATE7 release 2017-11-23 20:20:35 +05:30
Madhawa Perera
2e71bed16a
Merge pull request #1495 from charithag/master
Add datasource for data archival #1394
2017-11-22 22:51:31 +05:30
charitha
06cb8382bc Merge branch 'master' of https://github.com/wso2/product-iot-server 2017-11-22 22:43:04 +05:30
charitha
feb8fbdc8f Add datasource for data archival #1394 2017-11-22 22:42:33 +05:30
WSO2 Builder
720ea983ed [maven-release-plugin] prepare for next development iteration 2017-11-17 18:41:06 +00:00
WSO2 Builder
7f3ff8b4fc [maven-release-plugin] prepare release v3.1.0-update6 2017-11-17 18:40:51 +00:00
Ruwan
a42605eed1
Merge pull request #1487 from charithag/master
Temporarily commenting Android Remote Management feature
2017-11-17 22:30:31 +05:30
charitha
812c8e5c8d Temporarily commenting Android Remote Management feature until OSGi issue being fixed 2017-11-17 22:27:50 +05:30
Madawa Soysa
3ce60dde56
Merge pull request #1486 from charithag/master
Fixed dependency resolving issue
2017-11-17 19:31:44 +05:30
charitha
a04bcbea93 Fixed dependency resolving issue 2017-11-17 19:26:51 +05:30
Charitha Goonetilleke
d7b888b411
Merge pull request #1447 from warunalakshitha/remote-control
Remote control feature
2017-11-17 19:08:04 +05:30
Kamidu Sachith Punchihewa
dcf3eb99ad
Merge pull request #1485 from charithag/master
Set device management & plugins versions to latest
2017-11-17 19:06:46 +05:30
charitha
70db05dc19 Set device management & plugins versions to latest 2017-11-17 18:52:23 +05:30
Charitha Goonetilleke
e10841587d
Merge pull request #1454 from menakaj/master
Changes and Improvements as per the code review.
2017-11-17 17:36:05 +05:30
warunalakshitha
9c37eb549a Fix conflicts with new cdmf versions 2017-11-17 15:13:56 +05:30
Kamidu Sachith Punchihewa
900ba4ea6f
Merge pull request #1483 from madhawap/master
Updating devicemgt core and plugin dependencies
2017-11-16 21:14:32 +05:30
madhawap
ae0427c0ac Updating devicemgt core and plugin dependencies 2017-11-16 21:00:48 +05:30
Madhawa Perera
fa09935cd8
Merge pull request #1461 from madawas/master
Fixing the test case failure occurred by reverting the fix for EMM-1298
2017-11-03 16:56:56 +05:30
Madawa Soysa
bff73d2bb6 Fixing the test case failure occured by reverting the fix for EMM-1298 2017-11-03 16:17:21 +05:30
Madhawa Perera
ebf76c11ab
Merge pull request #1460 from madawas/master
Increasing devicemgt and plugin versions
2017-11-02 18:26:30 +05:30
Madawa Soysa
dfbd945665 Increasing devicemgt and plugin versions 2017-11-02 18:25:07 +05:30