Susinda Perera
|
f7fa4da7d2
|
Merge pull request #311 from susinda/master
Merge 3.1.0-test into master
|
8 years ago |
|
Susinda
|
6a48378b18
|
Merge branch 'master' into 3.1.0-test
|
8 years ago |
Menaka Jayawardena
|
07d9c8d409
|
Test skip added
|
8 years ago |
|
Susinda Perera
|
995e1c7ef5
|
Merge pull request #310 from susinda/3.1.0-test
Making portal app styles for both cloud and general setup
|
8 years ago |
|
Susinda Perera
|
45d5b0d061
|
Making portal app styles for both cloud and general setup, added isCloud flag in portal/configs/designer.json
|
8 years ago |
Ayyoob Hamza
|
ed24ce9d21
|
Merge pull request #306 from menakaj/master
Test skip added
|
8 years ago |
|
Menaka Jayawardena
|
573baa7af4
|
Test skip added
|
8 years ago |
|
Susinda Perera
|
3d213cf4c7
|
Merge pull request #305 from Megala21/3.1.0-test
Updating apimgt version to solve the sso issue in tenant mode
|
8 years ago |
Megala
|
50cda32a42
|
Updating apimgt version to solve the sso issue in tenant mode
|
8 years ago |
|
Susinda Perera
|
80f99545d1
|
Merge pull request #303 from susinda/3.1.0-test
mobile-qsg refactored and dependencies copied from maven
|
8 years ago |
|
Susinda
|
06c8e7ae36
|
mobile-qsg refactored and dependencies copied from maven
|
8 years ago |
|
Susinda Perera
|
e63b1fcf5b
|
Merge pull request #302 from susinda/master
Reverting mobile-qsg refactoring commit
|
8 years ago |
|
Susinda
|
a019cf66c7
|
Reverting mobile-qsg refactoring commit
|
8 years ago |
|
Susinda Perera
|
4c51fc5246
|
Merge pull request #300 from susinda/master
mobile-qsg is packed with iot-core
|
8 years ago |
|
Susinda
|
e20eb4aa4f
|
mobile-qsg is packed with iot-core
|
8 years ago |
|
Susinda Perera
|
b2dd551301
|
Merge pull request #299 from susinda/3.1.0-test
Using the carbon.api.mgt.version 6.1.69, hence removing api#am#store.war
|
8 years ago |
|
Susinda
|
89357d0f0d
|
Using the carbon.api.mgt.version 6.1.69, hence removing api#am#store.war
|
8 years ago |
|
Susinda Perera
|
aa860f5344
|
Merge pull request #298 from wso2/cloud-3.1.0
Merging from cloud 3.1.0 Ayyoobs fix + carbon.api,mgt version update
|
8 years ago |
|
Ayyoob Hamza
|
643628656c
|
Merge pull request #297 from hasuniea/cloud-3.1.0
upgrading carbon.api.mgt.version
|
8 years ago |
Hasunie
|
65289741a1
|
upgrading carbon.api.mgt.version
|
8 years ago |
|
Susinda Perera
|
2488df7b9a
|
Merge pull request #294 from amalhub/3.1.0-test
Fixing issue: IOTS-492, Replace default api#am#store.war with the pat…
|
8 years ago |
amalhub
|
1a79017ac1
|
Fixing issue: IOTS-492, Replace default api#am#store.war with the patched war
|
8 years ago |
Rasika Perera
|
4383fbeb8b
|
Merge pull request #293 from rasika/3.1.0-test
Fixing carbon apps copy path
|
8 years ago |
Rasika Perera
|
088d1a802e
|
Fixing carbon apps copy path
|
8 years ago |
|
Susinda Perera
|
47e6b88d53
|
Merge pull request #292 from madhawap/3.1.0-test
resolving conflicts when merging cloud and master brnaches
|
8 years ago |
madhawap
|
00ab274d9e
|
resolving conflicts when merging cloud and master brnaches
|
8 years ago |
Milan Perera
|
920857515c
|
Merge pull request #291 from ayyoob/210releasepatch
removed mutualssl feature and the updated apim version
|
8 years ago |
|
Susinda Perera
|
d35fe57dd5
|
Merge pull request #290 from madhawap/3.1.0-test
minor fix
|
8 years ago |
|
madhawap
|
74edd97322
|
minor fix
|
8 years ago |
|
Susinda Perera
|
905a7d8c50
|
Merge pull request #289 from ayyoob/210releasepatch
merging from Ayyoob - removed mutualssl feature and the updated apim version
|
8 years ago |
lakshani
|
d0926571dc
|
added test cases for chage device status
|
8 years ago |
|
Rasika Perera
|
b697618b42
|
Update pom.xml
|
8 years ago |
|
Menaka Jayawardena
|
f4c26edb74
|
Enabled backend integration tests in the build
|
8 years ago |
|
Menaka Jayawardena
|
9535f4f8c0
|
Removed unwanted dependency
|
8 years ago |
|
susinda
|
5de566ca0c
|
device operation permisions changed, removed 'any-device', added 'disenrole' and 'owning-device'
|
8 years ago |
|
Menaka Jayawardena
|
e70306ac17
|
Fixed Android Operations Integration Tests.
|
8 years ago |
|
susinda
|
84adbc45ae
|
binaries and images removed, added all (script + jars) in the script_and_resources.zip file
|
8 years ago |
|
susinda
|
cb1a3d462d
|
ios policy addition moved to bottom, passwords changed
|
8 years ago |
|
lakshani
|
9615c2fe5e
|
merging lakshani's changes
|
8 years ago |
|
lakshani
|
14645232b8
|
merging lakshani's changes on app-manager
|
8 years ago |
GPrathap
|
f3f1fc40cb
|
fixing a csrf property issue
|
8 years ago |
|
Menaka Jayawardena
|
4d485c39c1
|
Merge PR #272 from menakaj
|
8 years ago |
|
Menaka Jayawardena
|
134200375a
|
merging menaka's commit
|
8 years ago |
|
Menaka Jayawardena
|
2c17bafdf1
|
merging menaka's commit 'Fixed released cdmf and cdmf-plugins versions.'
|
8 years ago |
|
susinda
|
16c8948dea
|
adding modified jars
|
8 years ago |
|
susinda
|
ba7a9c2f45
|
Some issues fixed for ios app upload and logs added, readme modified with new usernames
|
8 years ago |
|
Menaka Jayawardena
|
816657a117
|
Removed Thread.sleep usages.
|
8 years ago |
|
Menaka Jayawardena
|
962623f257
|
Fixed Mobile device management and Android Enrollment test flows.
|
8 years ago |
|
susinda
|
cffb96bc93
|
Adding required files (apk, ipa, images and other)
|
8 years ago |
|
susinda
|
c2891c76e0
|
emm renamed to IoTs, some permisiosn issues fixed, names changed to ryan and milan
|
8 years ago |
