Commit Graph

4092 Commits

Author SHA1 Message Date
sinthuja
e6b8af986b Adding the specific imports. 2017-09-01 16:48:50 +05:30
Pasindu
8000124f8c Fixes validation of role when creating new user 2017-09-01 16:48:30 +05:30
sinthuja
bb5afb07b7 Adding the class back which I mistaken deleted. 2017-09-01 16:47:33 +05:30
sinthuja
c4c30f5856 Fixing imports. 2017-09-01 16:45:23 +05:30
WSO2 Builder
8882356947 [WSO2 Release] [Jenkins #2632] [Release 3.0.102] prepare for next development iteration 2017-09-01 11:06:09 +00:00
WSO2 Builder
080cd54fef [WSO2 Release] [Jenkins #2632] [Release 3.0.102] prepare release v3.0.102 2017-09-01 11:04:45 +00:00
sinthuja
a1d6065c75 Sending email only when the mail transport is enabled. 2017-09-01 16:11:59 +05:30
sinthuja
3edc71f04d Merge branch 'wso2-master' 2017-09-01 16:08:51 +05:30
sinthuja
77c02fae46 Merge pull request #943 from Nirothipan/master
Fixing User create form error when creating a new user. #1360
2017-09-01 16:04:02 +05:30
Pasindu
f8f82e66db Fix validate error display issue 2017-09-01 15:51:57 +05:30
Nirothipan
dc9eac3ac8 fixing product-iots#1360 2017-09-01 15:51:54 +05:30
Pasindu
1581775aa6 Fixes validation issue in create group 2017-09-01 15:38:28 +05:30
sinthuja
61ac576d6c Fixing https://github.com/wso2/product-iots/issues/1376. 2017-09-01 15:34:34 +05:30
WSO2 Builder
4eec53f51c [WSO2 Release] [Jenkins #2630] [Release 3.0.101] prepare for next development iteration 2017-09-01 10:00:51 +00:00
WSO2 Builder
dbcc5c2935 [WSO2 Release] [Jenkins #2630] [Release 3.0.101] prepare release v3.0.101 2017-09-01 10:00:37 +00:00
amalhub
5fc833332a Resolves: https://github.com/wso2/product-iots/issues/1302 2017-09-01 15:27:06 +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
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
WSO2 Builder
be565626c4 [WSO2 Release] [Jenkins #2607] [Release 3.0.89] prepare for next development iteration 2017-08-30 15:30:26 +05:30
WSO2 Builder
8ee37f75e3 [WSO2 Release] [Jenkins #2607] [Release 3.0.89] prepare release v3.0.89 2017-08-30 15:30:12 +05:30
WSO2 Builder
34e8341c5e Merge commit '43cef091c593e47e67de0d80e958d970380a1dbc' into 35fc241c-ca48-4d6d-8da9-b9d2c41070d6 2017-08-30 15:05:11 +05:30
WSO2 Builder
43cef091c5 [WSO2 Release] [Jenkins #2606] [Release 3.0.88] prepare for next development iteration 2017-08-30 14:51:43 +05:30
WSO2 Builder
2f77cc99d8 [WSO2 Release] [Jenkins #2606] [Release 3.0.88] prepare release v3.0.88 2017-08-30 14:51:29 +05:30
Harshan Liyanage
28cc62b405 Merge pull request #929 from amalhub/master
Resolves: https://github.com/wso2/product-iots/issues/1008
2017-08-30 14:45:27 +05:30
amalhub
eed54aaf9f Resolves: https://github.com/wso2/product-iots/issues/1008 2017-08-30 14:32:21 +05:30
Ruwan
72956afd5a Merge pull request #928 from sinthuja/master
Fixing the issue in resetting the password for the email user
2017-08-30 14:32:07 +05:30
sinthuja
f08ade1a40 Fixing the issue in resetting the password for the email user - https://github.com/wso2/product-iots/issues/609. 2017-08-30 14:27:29 +05:30
WSO2 Builder
bad400f17f [WSO2 Release] [Jenkins #2604] [Release 3.0.87] prepare for next development iteration 2017-08-30 07:08:18 +00:00
WSO2 Builder
c8ce7837e4 [WSO2 Release] [Jenkins #2604] [Release 3.0.87] prepare release v3.0.87 2017-08-30 07:06:53 +00:00
amalhub
84ad02156b Resolves: https://github.com/wso2/product-iots/issues/1339, https://github.com/wso2/product-iots/issues/1300 2017-08-30 12:20:51 +05:30
GDLMadushanka
92d6624bbf refactoring error/debug logs 2017-08-30 11:33:39 +05:30
WSO2 Builder
721b059de7 [WSO2 Release] [Jenkins #2601] [Release 3.0.86] prepare for next development iteration 2017-08-29 13:04:12 +00:00
WSO2 Builder
a070585e89 [WSO2 Release] [Jenkins #2601] [Release 3.0.86] prepare release v3.0.86 2017-08-29 13:02:48 +00:00
Harshan Liyanage
4067a86ee9 Merge pull request #925 from menakaj/master
Fixes wso2/product-iots#755
2017-08-29 18:23:59 +05:30
Menaka Jayawardena
ba8e70320e Added tooltips for Role listing. 2017-08-29 18:18:43 +05:30
WSO2 Builder
c037770528 [WSO2 Release] [Jenkins #2599] [Release 3.0.85] prepare for next development iteration 2017-08-29 12:03:10 +00:00
WSO2 Builder
9ed6a6bb42 [WSO2 Release] [Jenkins #2599] [Release 3.0.85] prepare release v3.0.85 2017-08-29 12:02:57 +00:00
Madawa Soysa
62141db52e Merge pull request #922 from menakaj/master
Redirecting to listing pages after creating and editing Roles, Users, Policies and Groups.
2017-08-29 17:08:12 +05:30
Menaka Jayawardena
a32cf89757 Fixed formatting issues. 2017-08-29 17:06:12 +05:30
Menaka Jayawardena
adce200842 Typo fix in policy create js. 2017-08-29 15:39:36 +05:30
Menaka Jayawardena
85b437a0f0 Redirect to Policy Listing page after editing a policy. 2017-08-29 15:35:44 +05:30
Menaka Jayawardena
c754b64653 Redirect to Role Listing page after editing a Role. 2017-08-29 15:23:27 +05:30
Menaka Jayawardena
80a08a2744 Redirect to Group Listing page after creating a Group. 2017-08-29 15:17:36 +05:30
Menaka Jayawardena
d8a8f6adf7 Restructured the setTimeout function. 2017-08-29 15:13:39 +05:30
Menaka Jayawardena
e238cfd2f9 Redirect to user listing after editing the user. 2017-08-29 15:12:27 +05:30
Menaka Jayawardena
bf789b91f3 Added user creation success modal. 2017-08-29 14:58:24 +05:30
Menaka Jayawardena
9ee5056967 Redirect to Permission listing after creating permission. 2017-08-29 14:52:57 +05:30
WSO2 Builder
463b843b8b [WSO2 Release] [Jenkins #2597] [Release 3.0.84] prepare for next development iteration 2017-08-29 08:55:49 +00:00
WSO2 Builder
aed8496a2b [WSO2 Release] [Jenkins #2597] [Release 3.0.84] prepare release v3.0.84 2017-08-29 08:54:25 +00:00