Commit Graph

4025 Commits

Author SHA1 Message Date
Pasindu
8000124f8c Fixes validation of role when creating new user 2017-09-01 16:48:30 +05:30
Pasindu
f8f82e66db Fix validate error display issue 2017-09-01 15:51:57 +05:30
Pasindu
1581775aa6 Fixes validation issue in create group 2017-09-01 15:38:28 +05:30
WSO2 Builder
0107012262 [WSO2 Release] [Jenkins #2628] [Release 3.0.100] prepare for next development iteration 2017-09-01 08:30:33 +00:00
WSO2 Builder
26e87c1865 [WSO2 Release] [Jenkins #2628] [Release 3.0.100] prepare release v3.0.100 2017-09-01 08:29:09 +00:00
sameeragunarathne
6cbedc2ed5 Merge pull request #941 from sinthuja/master
Fixing https://github.com/wso2/product-iots/issues/1374.
2017-09-01 13:55:29 +05:30
sinthuja
c53e027701 Fixing https://github.com/wso2/product-iots/issues/1374. 2017-09-01 13:02:13 +05:30
WSO2 Builder
5d6fb21dd5 [WSO2 Release] [Jenkins #2625] [Release 3.0.99] prepare for next development iteration 2017-08-31 14:38:28 +00:00
WSO2 Builder
65725501b8 [WSO2 Release] [Jenkins #2625] [Release 3.0.99] prepare release v3.0.99 2017-08-31 14:37:04 +00:00
Menaka Jayawardena
54b616985e Added check for updating admin user by typing the url + code formatting. 2017-08-31 19:30:40 +05:30
Menaka Jayawardena
21b0ed284b Removed hardcoded admin user name. 2017-08-31 19:30:40 +05:30
Menaka Jayawardena
b04bb5f1f1 Disabled edit button for admin role. 2017-08-31 19:30:40 +05:30
WSO2 Builder
7cf67b4be5 [WSO2 Release] [Jenkins #2623] [Release 3.0.98] prepare for next development iteration 2017-08-31 13:27:02 +00:00
WSO2 Builder
1d894b5d7d [WSO2 Release] [Jenkins #2623] [Release 3.0.98] prepare release v3.0.98 2017-08-31 13:26:49 +00:00
sameeragunarathne
57db0fffbf Merge pull request #940 from sinthuja/master
Fixing https://github.com/wso2/product-iots/issues/354.
2017-08-31 18:22:24 +05:30
sinthuja
c308147357 Fixing https://github.com/wso2/product-iots/issues/354. 2017-08-31 18:13:42 +05:30
WSO2 Builder
0a1197f4b1 [WSO2 Release] [Jenkins #2621] [Release 3.0.97] prepare for next development iteration 2017-08-31 12:16:54 +00:00
WSO2 Builder
1184da01eb [WSO2 Release] [Jenkins #2621] [Release 3.0.97] prepare release v3.0.97 2017-08-31 12:16:40 +00:00
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
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
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
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
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
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
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
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