community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,153 Commits 31 Branches 461 Tags 183 MiB
e0c255dbfa
Commit Graph

5153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kamidu Sachith Punchihewa
8d880c50bd Merge pull request #939 from harshanL/master 
Fixes for product-iots#1367 and product-iots#1285
 2017-08-31 17:13:41 +05:30
sinthuja
ccda9b009c Merge pull request #938 from sinthuja/master 
Fixing https://github.com/wso2/product-iots/issues/353.
 2017-08-31 17:01:30 +05:30
Harshan Liyanage
b87d3898f6 Fixes for wso2/product-iots#1285 2017-08-31 16:59:43 +05:30
Nirothipan
11f9399872 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-31 16:57:34 +05:30
Harshan Liyanage
5996e6841b Added null check to resolve wso2/product-iots#1367 2017-08-31 16:56:53 +05:30
sinthuja
ddb8f4e9b3 Fixing https://github.com/wso2/product-iots/issues/353. 2017-08-31 16:53:57 +05:30
WSO2 Builder
cd0195b7e7 [WSO2 Release] [Jenkins #2619] [Release 3.0.96] prepare for next development iteration 2017-08-31 11:03:33 +00:00
WSO2 Builder
565fa83984 [WSO2 Release] [Jenkins #2619] [Release 3.0.96] prepare release v3.0.96 2017-08-31 11:03:20 +00:00
WSO2 Builder
afaee46693 Merge commit '3308898268f59b076e8baeec34fcb2766f4d9b81' into 5fe78a3a-1bdc-490d-a4ee-fefb5b48e31b 2017-08-31 10:22:35 +00:00
sameeragunarathne
129ec717b0 Merge pull request #936 from sinthuja/master 
Fixing https://github.com/wso2/product-iots/issues/1356
 2017-08-31 15:59:01 +05:30
WSO2 Builder
3308898268 [WSO2 Release] [Jenkins #2618] [Release 3.0.95] prepare for next development iteration 2017-08-31 10:12:37 +00:00
WSO2 Builder
bedac61574 [WSO2 Release] [Jenkins #2618] [Release 3.0.95] prepare release v3.0.95 2017-08-31 10:11:13 +00:00
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
 2017-08-31 15:38:00 +05:30
sinthuja
465d801f42 Fixing https://github.com/wso2/product-iots/issues/1356. 2017-08-31 15:34:33 +05:30
Harshan Liyanage
09d150e773 Merge pull request #935 from amalhub/master 
Resolves: https://github.com/wso2/product-iots/issues/1161
 2017-08-31 15:28:23 +05:30
amalhub
308a2809ef Resolves: https://github.com/wso2/product-iots/issues/1161 2017-08-31 15:20:05 +05:30
WSO2 Builder
04eeb40649 [WSO2 Release] [Jenkins #2616] [Release 3.0.94] prepare for next development iteration 2017-08-31 08:45:03 +00:00
WSO2 Builder
9ee9b39fda [WSO2 Release] [Jenkins #2616] [Release 3.0.94] prepare release v3.0.94 2017-08-31 08:43:39 +00:00
WSO2 Builder
be3c7fc065 Merge commit 'ef63b2858c32817010a4f359b61cf861444f2ff3' into 2415c4fb-5619-4064-8917-b37679ac65e8 2017-08-31 08:19:55 +00:00
Charitha Goonetilleke
0f7e488d2b Merge pull request #934 from ruwany/master 
Adding fix for https://github.com/wso2/product-iots/issues/667
 2017-08-31 13:44:35 +05:30
WSO2 Builder
ef63b2858c [WSO2 Release] [Jenkins #2615] [Release 3.0.93] prepare for next development iteration 2017-08-31 08:04:50 +00:00
WSO2 Builder
23f72681b0 [WSO2 Release] [Jenkins #2615] [Release 3.0.93] prepare release v3.0.93 2017-08-31 08:03:26 +00:00
Ace
77152ca0a5 Adding fix for https://github.com/wso2/product-iots/issues/667 2017-08-31 12:49:57 +05:30
Harshan Liyanage
cb8edc7b3c Merge pull request #933 from menakaj/master 
UI improvements for Policy and User views.
 2017-08-31 12:44:51 +05:30
Menaka Jayawardena
8cac8a3bdc Added edit buttons for User and policy views. 2017-08-31 12:04:27 +05:30
Menaka Jayawardena
29086834eb Added tooltips for policy listing page. 2017-08-31 12:04:27 +05:30
Nirothipan
1927a58c41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-30 19:24:22 +05:30
WSO2 Builder
9324cc0668 [WSO2 Release] [Jenkins #2612] [Release 3.0.92] prepare for next development iteration 2017-08-30 13:15:18 +00:00
WSO2 Builder
98302eea71 [WSO2 Release] [Jenkins #2612] [Release 3.0.92] prepare release v3.0.92 2017-08-30 13:15:04 +00:00
WSO2 Builder
e03cd7650e Merge commit '04c4c961677ca7942aab73065376db57bf63d61d' into 6f2f9911-e57e-4379-83c0-4c6f6fb151ab 2017-08-30 18:19:30 +05:30
Geeth
00bebe5049 Merge pull request #932 from harshanL/master 
Resolved wso2/product-iots#1358
 2017-08-30 18:02:58 +05:30
WSO2 Builder
04c4c96167 [WSO2 Release] [Jenkins #2611] [Release 3.0.91] prepare for next development iteration 2017-08-30 17:58:44 +05:30
WSO2 Builder
585a4bf9a7 [WSO2 Release] [Jenkins #2611] [Release 3.0.91] prepare release v3.0.91 2017-08-30 17:58:30 +05:30
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.
 2017-08-30 17:51:02 +05:30
Menaka Jayawardena
9f2603a126 Bring the roles select list in-front of the modal and set colors of selected roles. 2017-08-30 17:47:13 +05:30
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
 2017-08-30 17:40:05 +05:30
Nirothipan
e668d3791f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-30 17:15:02 +05:30
Harshan Liyanage
2786145fdc Merge branch 'master' of https://github.com/harshanL/carbon-device-mgt 2017-08-30 17:11:34 +05:30
Harshan Liyanage
00c7dd0c63 Resolved wso2/product-iots#1358 2017-08-30 17:07:10 +05:30
Nirothipan
46921ac277 Resolving conflicts 2017-08-30 17:06:48 +05:30
Harshan Liyanage
21692f1ab6 Fixes for wso2/product-iots#1358 2017-08-30 17:03:13 +05:30
Harshan Liyanage
88303f7f94 Resolved wso2/product-iots#1358 2017-08-30 16:56:02 +05:30
WSO2 Builder
10d2388e8a [WSO2 Release] [Jenkins #2609] [Release 3.0.90] prepare for next development iteration 2017-08-30 11:24:43 +00:00
WSO2 Builder
3b920b82a9 [WSO2 Release] [Jenkins #2609] [Release 3.0.90] prepare release v3.0.90 2017-08-30 11:23:57 +00:00
Nirothipan
955fe4b4b5 checking message 2017-08-30 16:50:26 +05:30
Harshan Liyanage
ec78ba09f2 Merge pull request #924 from GDLMadushanka/master 
Logging errors in devmgt and groupmgt services
 2017-08-30 16:33:21 +05:30
GDLMadushanka
10a80fecf8 Refactoring 2017-08-30 16:29:08 +05:30
Nirothipan
9d3b2ebf42 fixes for product-iots #504 2017-08-30 16:20:32 +05:30
Pasindu
922f8f3cc5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-30 15:33:24 +05:30
WSO2 Builder
be565626c4 [WSO2 Release] [Jenkins #2607] [Release 3.0.89] prepare for next development iteration 2017-08-30 15:30:26 +05:30