Commit Graph

5153 Commits

Author SHA1 Message Date
Harshan Liyanage
66d237cf61 Fixed merge conflicts. 2017-09-01 20:44:08 +05:30
Harshan Liyanage
79abb6ef86 Fixed merge conflicts. 2017-09-01 20:40:42 +05:30
Harshan Liyanage
bbbd199cf7 Resolved wso2/product-iots#1035 2017-09-01 20:30:37 +05:30
Pasindu
3ce0e36e21 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-01 17:58:10 +05:30
Pasindu
54b69747ce Fixes issue in modal displaying group name 2017-09-01 17:57:11 +05:30
WSO2 Builder
f310f42856 [WSO2 Release] [Jenkins #2633] [Release 3.0.103] prepare for next development iteration 2017-09-01 11:41:26 +00:00
WSO2 Builder
9b85bc5e1b [WSO2 Release] [Jenkins #2633] [Release 3.0.103] prepare release v3.0.103 2017-09-01 11:40:02 +00:00
Pasindu
0684257a6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-01 17:01:28 +05:30
Harshan Liyanage
58cad70184 Merge pull request #944 from sinthuja/master
Fixing https://github.com/wso2/product-iots/issues/1376
2017-09-01 16:53:42 +05:30
sinthuja
a9c5188e0d Adding the specific imports. 2017-09-01 16:51:28 +05:30
WSO2 Builder
0e71daac2d Merge commit '88823569479ecd1dcbb00a4603c4ce878f29aa95' into c7e7e55b-2abf-4888-be5c-8aced62d2a18 2017-09-01 11:20:46 +00:00
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
2363da7767 Formatting issue 2017-09-01 16:02:58 +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
Harshan Liyanage
ddb68c00e6 Merge pull request #942 from amalhub/master
Resolves: https://github.com/wso2/product-iots/issues/1302
2017-09-01 15:30:31 +05:30
Pasindu
ab15813824 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-01 15:27:23 +05:30
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
Nirothipan
cca8779521 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-01 13:05:19 +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
Kamidu Sachith Punchihewa
286634085b Merge pull request #937 from menakaj/master
Disabled edit button of admin role in role listing page.
2017-08-31 20:05:48 +05:30
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
Nirothipan
c32d12e0cc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-31 18:50:26 +05:30
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
Nirothipan
a908ced8d4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-31 18:19:55 +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
Nirothipan
55981d03d2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-31 17:36:00 +05:30