Nirothipan
|
55981d03d2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
7 years ago |
Kamidu Sachith Punchihewa
|
8d880c50bd
|
Merge pull request #939 from harshanL/master
Fixes for product-iots#1367 and product-iots#1285
|
7 years ago |
sinthuja
|
ccda9b009c
|
Merge pull request #938 from sinthuja/master
Fixing https://github.com/wso2/product-iots/issues/353.
|
7 years ago |
Harshan Liyanage
|
b87d3898f6
|
Fixes for wso2/product-iots#1285
|
7 years ago |
Nirothipan
|
11f9399872
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
7 years ago |
Harshan Liyanage
|
5996e6841b
|
Added null check to resolve wso2/product-iots#1367
|
7 years ago |
sinthuja
|
ddb8f4e9b3
|
Fixing https://github.com/wso2/product-iots/issues/353.
|
7 years ago |
WSO2 Builder
|
cd0195b7e7
|
[WSO2 Release] [Jenkins #2619] [Release 3.0.96] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
565fa83984
|
[WSO2 Release] [Jenkins #2619] [Release 3.0.96] prepare release v3.0.96
|
7 years ago |
WSO2 Builder
|
afaee46693
|
Merge commit '3308898268f59b076e8baeec34fcb2766f4d9b81' into 5fe78a3a-1bdc-490d-a4ee-fefb5b48e31b
|
7 years ago |
sameeragunarathne
|
129ec717b0
|
Merge pull request #936 from sinthuja/master
Fixing https://github.com/wso2/product-iots/issues/1356
|
7 years ago |
WSO2 Builder
|
3308898268
|
[WSO2 Release] [Jenkins #2618] [Release 3.0.95] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
bedac61574
|
[WSO2 Release] [Jenkins #2618] [Release 3.0.95] prepare release v3.0.95
|
7 years ago |
sinthuja
|
e6ff84918e
|
Merge branch 'wso2-master'
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/IntegrationClientServiceImpl.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/CredentialManagementResponseBuilder.java
|
7 years ago |
sinthuja
|
465d801f42
|
Fixing https://github.com/wso2/product-iots/issues/1356.
|
7 years ago |
Harshan Liyanage
|
09d150e773
|
Merge pull request #935 from amalhub/master
Resolves: https://github.com/wso2/product-iots/issues/1161
|
7 years ago |
amalhub
|
308a2809ef
|
Resolves: https://github.com/wso2/product-iots/issues/1161
|
7 years ago |
WSO2 Builder
|
04eeb40649
|
[WSO2 Release] [Jenkins #2616] [Release 3.0.94] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
9ee9b39fda
|
[WSO2 Release] [Jenkins #2616] [Release 3.0.94] prepare release v3.0.94
|
7 years ago |
WSO2 Builder
|
be3c7fc065
|
Merge commit 'ef63b2858c32817010a4f359b61cf861444f2ff3' into 2415c4fb-5619-4064-8917-b37679ac65e8
|
7 years ago |
Charitha Goonetilleke
|
0f7e488d2b
|
Merge pull request #934 from ruwany/master
Adding fix for https://github.com/wso2/product-iots/issues/667
|
7 years ago |
WSO2 Builder
|
ef63b2858c
|
[WSO2 Release] [Jenkins #2615] [Release 3.0.93] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
23f72681b0
|
[WSO2 Release] [Jenkins #2615] [Release 3.0.93] prepare release v3.0.93
|
7 years ago |
Ace
|
77152ca0a5
|
Adding fix for https://github.com/wso2/product-iots/issues/667
|
7 years ago |
Harshan Liyanage
|
cb8edc7b3c
|
Merge pull request #933 from menakaj/master
UI improvements for Policy and User views.
|
7 years ago |
Menaka Jayawardena
|
8cac8a3bdc
|
Added edit buttons for User and policy views.
|
7 years ago |
Menaka Jayawardena
|
29086834eb
|
Added tooltips for policy listing page.
|
7 years ago |
Nirothipan
|
1927a58c41
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
7 years ago |
WSO2 Builder
|
9324cc0668
|
[WSO2 Release] [Jenkins #2612] [Release 3.0.92] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
98302eea71
|
[WSO2 Release] [Jenkins #2612] [Release 3.0.92] prepare release v3.0.92
|
7 years ago |
WSO2 Builder
|
e03cd7650e
|
Merge commit '04c4c961677ca7942aab73065376db57bf63d61d' into 6f2f9911-e57e-4379-83c0-4c6f6fb151ab
|
7 years ago |
Geeth
|
00bebe5049
|
Merge pull request #932 from harshanL/master
Resolved wso2/product-iots#1358
|
7 years ago |
WSO2 Builder
|
04c4c96167
|
[WSO2 Release] [Jenkins #2611] [Release 3.0.91] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
585a4bf9a7
|
[WSO2 Release] [Jenkins #2611] [Release 3.0.91] prepare release v3.0.91
|
7 years ago |
Madawa Soysa
|
7d177189b6
|
Merge pull request #930 from menakaj/master
Bring the roles select list in-front of the modal and set visible colors for selected roles.
|
7 years ago |
Menaka Jayawardena
|
9f2603a126
|
Bring the roles select list in-front of the modal and set colors of selected roles.
|
7 years ago |
sinthuja
|
749f1ccdcf
|
Merge pull request #931 from Nirothipan/master
Fixes for [MDM-367] Proper "Error" message is not given when trying to invite a user without having the email transport properly configured. #504
|
7 years ago |
Nirothipan
|
e668d3791f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
7 years ago |
Harshan Liyanage
|
2786145fdc
|
Merge branch 'master' of https://github.com/harshanL/carbon-device-mgt
|
7 years ago |
Harshan Liyanage
|
00c7dd0c63
|
Resolved wso2/product-iots#1358
|
7 years ago |
Nirothipan
|
46921ac277
|
Resolving conflicts
|
7 years ago |
Harshan Liyanage
|
21692f1ab6
|
Fixes for wso2/product-iots#1358
|
7 years ago |
Harshan Liyanage
|
88303f7f94
|
Resolved wso2/product-iots#1358
|
7 years ago |
WSO2 Builder
|
10d2388e8a
|
[WSO2 Release] [Jenkins #2609] [Release 3.0.90] prepare for next development iteration
|
7 years ago |
WSO2 Builder
|
3b920b82a9
|
[WSO2 Release] [Jenkins #2609] [Release 3.0.90] prepare release v3.0.90
|
7 years ago |
Nirothipan
|
955fe4b4b5
|
checking message
|
7 years ago |
Harshan Liyanage
|
ec78ba09f2
|
Merge pull request #924 from GDLMadushanka/master
Logging errors in devmgt and groupmgt services
|
7 years ago |
GDLMadushanka
|
10a80fecf8
|
Refactoring
|
7 years ago |
Nirothipan
|
9d3b2ebf42
|
fixes for product-iots #504
|
7 years ago |
Pasindu
|
922f8f3cc5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
7 years ago |