Commit Graph

2057 Commits

Author SHA1 Message Date
sinthuja
3326165513 Fixing the JVM startup issue in the analytics profile. 2017-03-10 11:06:04 +05:30
sinthuja
08bc742c4d Fixing the startup issues in the core profile. 2017-03-09 17:55:37 +05:30
Susinda
209a5fbae3 carbon.devicemgt.version dependency version changed to 2.0.22-SNAPSHOT 2017-03-09 15:25:57 +05:30
Susinda Perera
298fc5104e Merge pull request #312 from susinda/master
Merging from cloud-3.1.0
2017-03-09 14:03:19 +05:30
Susinda Perera
d5dcc13501 Merge pull request #1 from susinda/cloud-3.1.0
merging from Cloud 3.1.0
2017-03-09 12:47:28 +05:30
Susinda Perera
f7fa4da7d2 Merge pull request #311 from susinda/master
Merge 3.1.0-test into master
2017-03-09 12:24:10 +05:30
Susinda
6a48378b18 Merge branch 'master' into 3.1.0-test 2017-03-09 11:36:16 +05:30
Menaka Jayawardena
07d9c8d409 Test skip added 2017-03-09 11:34:01 +05:30
sinthuja
6501ba46cf adding analytics profile to distribution. 2017-03-08 14:48:22 +05:30
Susinda Perera
995e1c7ef5 Merge pull request #310 from susinda/3.1.0-test
Making portal app styles for both cloud and general setup
2017-03-08 13:24:27 +05:30
Susinda Perera
45d5b0d061 Making portal app styles for both cloud and general setup, added isCloud flag in portal/configs/designer.json 2017-03-08 13:18:11 +05:30
sinthuja
13e8764f23 Removing unnecessary configuration elements. 2017-03-07 16:50:21 +05:30
sinthuja
546fc02ac4 fixing the build failure. 2017-03-07 16:46:35 +05:30
sinthuja
2f3eb595a2 Adding iot distribution with restructure components. 2017-03-07 16:42:46 +05:30
Harshan Liyanage
31c8d9830e Merge pull request #308 from ayyoob/cloud-3.1.0
added log property
2017-03-07 10:03:47 +05:30
ayyoob
4ae5ac5224 added log property 2017-03-07 01:57:38 +05:30
Ayyoob Hamza
ed24ce9d21 Merge pull request #306 from menakaj/master
Test skip added
2017-03-06 17:57:44 +05:30
Menaka Jayawardena
573baa7af4 Test skip added 2017-03-06 17:47:23 +05:30
sinthuja
2a9f940b48 Adding analytics, broker profiles. 2017-03-06 16:32:40 +05:30
sinthuja
39e781c492 Making the core with default profile. 2017-03-06 16:09:20 +05:30
Susinda Perera
3d213cf4c7 Merge pull request #305 from Megala21/3.1.0-test
Updating apimgt version to solve the sso issue in tenant mode
2017-03-06 09:58:00 +05:30
Megala
50cda32a42 Updating apimgt version to solve the sso issue in tenant mode 2017-03-05 00:01:51 +05:30
Ayyoob Hamza
aecabe4ca6 Merge pull request #304 from ayyoob/cloud-3.1.0
Cloud 3.1.0
2017-03-03 17:09:50 +05:30
Susinda Perera
80f99545d1 Merge pull request #303 from susinda/3.1.0-test
mobile-qsg refactored and dependencies copied from maven
2017-03-03 14:03:14 +05:30
Susinda
06c8e7ae36 mobile-qsg refactored and dependencies copied from maven 2017-03-02 22:53:01 +05:30
ayyoob
b933879937 removed ip bind on localhost 2017-03-02 20:29:49 +05:30
Susinda Perera
e63b1fcf5b Merge pull request #302 from susinda/master
Reverting mobile-qsg refactoring commit
2017-03-02 16:37:12 +05:30
Susinda
a019cf66c7 Reverting mobile-qsg refactoring commit 2017-03-02 16:32:53 +05:30
Milan Perera
5c9f47cb6e Merge pull request #301 from ayyoob/cloud-3.1.0
added apim integration client to log properties and removed sso bind from localhost
2017-03-02 14:41:04 +05:30
ayyoob
3d8f4a18b0 Merge branch 'cloud-3.1.0' of https://github.com/wso2/product-iots into cloud-3.1.0 2017-03-02 01:03:57 +05:30
ayyoob
5990221a50 added apim integration client log properties 2017-03-02 00:57:03 +05:30
ayyoob
6964852a97 fixed sso bind to localhost 2017-03-02 00:56:41 +05:30
Susinda Perera
4c51fc5246 Merge pull request #300 from susinda/master
mobile-qsg is packed with iot-core
2017-03-01 14:57:14 +05:30
Susinda
e20eb4aa4f mobile-qsg is packed with iot-core 2017-03-01 14:49:27 +05:30
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
2017-02-28 20:03:45 +05:30
Susinda
89357d0f0d Using the carbon.api.mgt.version 6.1.69, hence removing api#am#store.war 2017-02-28 20:02:59 +05:30
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
2017-02-28 19:58:06 +05:30
Ayyoob Hamza
643628656c Merge pull request #297 from hasuniea/cloud-3.1.0
upgrading carbon.api.mgt.version
2017-02-28 19:55:21 +05:30
Hasunie
65289741a1 upgrading carbon.api.mgt.version 2017-02-28 15:33:26 +05:30
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…
2017-02-27 21:33:40 +05:30
amalhub
1a79017ac1 Fixing issue: IOTS-492, Replace default api#am#store.war with the patched war 2017-02-27 17:35:44 +05:30
Rasika Perera
4383fbeb8b Merge pull request #293 from rasika/3.1.0-test
Fixing carbon apps copy path
2017-02-23 15:23:23 +05:30
Rasika Perera
088d1a802e Fixing carbon apps copy path 2017-02-23 15:10:30 +05:30
Susinda Perera
47e6b88d53 Merge pull request #292 from madhawap/3.1.0-test
resolving conflicts when merging cloud and master brnaches
2017-02-14 17:00:05 +05:30
madhawap
00ab274d9e resolving conflicts when merging cloud and master brnaches 2017-02-14 16:56:55 +05:30
Milan Perera
920857515c Merge pull request #291 from ayyoob/210releasepatch
removed mutualssl feature and the updated apim version
2017-02-14 15:54:31 +05:30
Susinda Perera
d35fe57dd5 Merge pull request #290 from madhawap/3.1.0-test
minor fix
2017-02-14 13:01:54 +05:30
madhawap
74edd97322 minor fix 2017-02-14 12:56:41 +05:30
Susinda Perera
905a7d8c50 Merge pull request #289 from ayyoob/210releasepatch
merging from Ayyoob - removed mutualssl feature and the updated apim version
2017-02-13 17:13:58 +05:30
lakshani
d0926571dc added test cases for chage device status 2017-02-13 15:04:02 +05:30