Commit Graph

5423 Commits

Author SHA1 Message Date
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
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
Harshan Liyanage
aeb1f3a995 Merge pull request #927 from amalhub/master
Resolves: https://github.com/wso2/product-iots/issues/1339, https://g
2017-08-30 12:25:48 +05:30
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