Commit Graph

2675 Commits

Author SHA1 Message Date
Milan Perera
471d1fe1c5 Revert "Merge pull request #283 from milanperera/cloud"
This reverts commit 6e5e149c87, reversing
changes made to dc0d0c0c53.
2017-02-02 10:38:30 +05:30
Ayyoob Hamza
2da70ad50a Merge pull request #284 from ayyoob/cloud-3.1.0
changes adapter configs after testing
2017-02-02 04:46:12 +05:30
ayyoob
fe81bb75ca updated apimgt version 2017-02-02 04:28:49 +05:30
ayyoob
b03b958979 changes adapter configs after testing 2017-02-02 03:17:40 +05:30
Milan Perera
6e5e149c87 Merge pull request #283 from milanperera/cloud
Merging changes of master to cloud branch
2017-02-01 15:14:54 +05:30
Milan Perera
9c8942cffc Upgraded device management versions 2017-02-01 15:01:10 +05:30
Milan Perera
d74ad8a76a Resolved conflicts and merged 2017-02-01 12:56:21 +05:30
Milan Perera
ce2f5f14d1 Merge branch 'cloud-3.1.0' of https://github.com/wso2/product-iots into cloud 2017-02-01 11:33:46 +05:30
Milan Perera
97a274ce62 Added latest scope validator to identity.xml 2017-02-01 11:33:31 +05:30
ayyoob
c61cd953b2 few fixes after testing sso 2017-02-01 00:08:51 +05:30
Rasika Perera
dc0d0c0c53 Merge pull request #282 from wso2/release-3.1.0-M1
Release 3.1.0 M1
2017-01-31 20:41:28 +05:30
WSO2 Builder
a283be7ed3 [maven-release-plugin] prepare for next development iteration 2017-01-31 14:54:18 +00:00
WSO2 Builder
9fba0db73f [maven-release-plugin] prepare release v3.1.0-M1 2017-01-31 14:52:29 +00:00
Rasika Perera
4d94d42305 Update pom.xml 2017-01-31 20:15:11 +05:30
ayyoob
3610ed762d enabled UseAuthenticatedUserDomainCrypto 2017-01-31 14:19:02 +05:30
Charitha Goonetilleke
222decd28d Merge pull request #281 from lakshani/master
updated plugings version
2017-01-31 14:01:02 +05:30
lakshani
35f1df24a6 updated plugings version 2017-01-31 13:57:15 +05:30
Ruwan
966dd41d4a Merge pull request #280 from menakaj/master
Enabled integration tests in build.
2017-01-31 04:35:13 +05:30
Menaka Jayawardena
98f5e86fd9 Bumped cdmf version to the latest release. 2017-01-31 01:30:33 +05:30
Menaka Jayawardena
756ecb1769 Enabled backend integration tests in the build 2017-01-31 01:29:54 +05:30
Menaka Jayawardena
1fec4b3289 Removed unwanted dependency 2017-01-30 23:56:20 +05:30
ayyoob
ab70dbe38a few changes after testing multi tenancy 2017-01-30 22:33:18 +05:30
Geeth
23d5505f80 Merge pull request #279 from lakshani/master
Updated pom xmls accordding to rest connector
2017-01-30 19:50:18 +05:30
lakshani
458a92e9c9 updated carbon device mgt version 2017-01-30 19:46:18 +05:30
lakshani
d555f95781 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-30 19:41:30 +05:30
Ayyoob Hamza
d83f7112d9 Merge pull request #278 from menakaj/master
Fixed Android Operations Integration Tests.
2017-01-30 17:26:11 +05:30
Susinda Perera
47e337532e Merge pull request #277 from susinda/mobile-qsg
device operation permissions changed, removed 'any-device', added 'disenrole'
2017-01-30 16:19:04 +05:30
susinda
35963a07e4 device operation permisions changed, removed 'any-device', added 'disenrole' and 'owning-device' 2017-01-30 16:14:28 +05:30
Menaka Jayawardena
5dbfa7d187 Fixed Android Operations Integration Tests. 2017-01-30 16:00:02 +05:30
Susinda Perera
594533cfe0 Merge pull request #275 from susinda/mobile-qsg
Mobile qsg - Adding QSG scripts
2017-01-30 10:17:08 +05:30
susinda
84b163c85c binaries and images removed, added all (script + jars) in the script_and_resources.zip file 2017-01-30 10:10:49 +05:30
susinda
4049b59819 ios policy addition moved to bottom, passwords changed 2017-01-30 10:05:26 +05:30
lakshani
9fd6f5b99a Updated pom 2017-01-30 09:43:56 +05:30
lakshani
9f1637bc9f Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-30 00:23:15 +05:30
lakshani
6cd3950b05 Updated pom xmls accordding to rest connector 2017-01-30 00:07:01 +05:30
Rasika Perera
903045f5d2 Merge pull request #273 from GPrathap/master
fixing a csrf property issue
2017-01-29 19:32:49 +05:30
GPrathap
caec1677f6 fixing a csrf property issue 2017-01-29 17:09:35 +05:30
Ayyoob Hamza
83f4b392a8 Merge pull request #272 from menakaj/master
Integration Tests : Fixed Android Enrollment flow.
2017-01-27 17:31:41 +05:30
Menaka Jayawardena
237bd3dc2c Fixed released cdmf and cdmf-plugins versions. 2017-01-27 17:22:56 +05:30
susinda
6c9947b615 adding modified jars 2017-01-27 16:45:39 +05:30
susinda
82dff4f83f Some issues fixed for ios app upload and logs added, readme modified with new usernames 2017-01-27 16:16:27 +05:30
Menaka Jayawardena
cc5a474ea9 Removed Thread.sleep usages. 2017-01-26 22:44:44 +05:30
Menaka Jayawardena
e595b24920 Fixed Mobile device management and Android Enrollment test flows. 2017-01-26 15:48:41 +05:30
susinda
1c1ac5f052 Adding required files (apk, ipa, images and other) 2017-01-26 14:25:07 +05:30
susinda
f357b7dd62 emm renamed to IoTs, some permisiosn issues fixed, names changed to ryan and milan 2017-01-26 13:47:08 +05:30
Ayyoob Hamza
26197ef770 Merge pull request #271 from ayyoob/3.0.0
removed apim dependencies and solved sso tenant login issues.
2017-01-26 12:18:33 +05:30
Chatura Dilan
f04ece804e Merge pull request #269 from menakaj/master
Integration tests modifications
2017-01-26 10:23:22 +05:30
ayyoob
ca53efdab0 fixed sso login issue in portal in multi tenant 2017-01-26 00:30:03 +05:30
Menaka Jayawardena
a6519d1e04 Restored data sources change. 2017-01-25 17:14:03 +05:30
Menaka Jayawardena
3f010951af POM versions updated for next release. 2017-01-25 17:10:47 +05:30