Commit Graph

4135 Commits

Author SHA1 Message Date
WSO2 Builder
08578abb1e [WSO2 Release] [Jenkins #2657] [Release 3.0.112] prepare for next development iteration 2017-09-21 15:23:32 +05:30
WSO2 Builder
dfa0ca3073 [WSO2 Release] [Jenkins #2657] [Release 3.0.112] prepare release v3.0.112 2017-09-21 15:23:18 +05:30
Ace
d74aadae20 Tidying up the topic browser view 2017-09-21 14:42:00 +05:30
Ace
7601decaaf removing un-necessary new line 2017-09-21 11:13:57 +05:30
WSO2 Builder
ff7eaa75e2 [WSO2 Release] [Jenkins #2655] [Release 3.0.111] prepare for next development iteration 2017-09-19 07:55:23 +05:30
WSO2 Builder
f1b3e82b79 [WSO2 Release] [Jenkins #2655] [Release 3.0.111] prepare release v3.0.111 2017-09-19 07:55:11 +05:30
WSO2 Builder
0a5a66b8b6 [WSO2 Release] [Jenkins #2653] [Release 3.0.110] prepare for next development iteration 2017-09-18 13:26:54 +00:00
WSO2 Builder
dba13d3e7a [WSO2 Release] [Jenkins #2653] [Release 3.0.110] prepare release v3.0.110 2017-09-18 13:26:40 +00:00
Harshan Liyanage
455f56405b Merge pull request #968 from sameeragunarathne/master
fixes https://github.com/wso2/product-iots/issues/1417
2017-09-18 18:38:08 +05:30
WSO2 Builder
4bd92624b0 [WSO2 Release] [Jenkins #2651] [Release 3.0.109] prepare for next development iteration 2017-09-18 09:59:34 +00:00
WSO2 Builder
d7c5ff79c7 [WSO2 Release] [Jenkins #2651] [Release 3.0.109] prepare release v3.0.109 2017-09-18 09:59:21 +00:00
sameera910409
2938eaf93d fixes https://github.com/wso2/product-iots/issues/1417 2017-09-18 14:15:05 +05:30
geethkokila
a7e41faa19 Adding descriptive error message 2017-09-17 17:55:34 +05:30
geethkokila
fe30a05b81 Adding the API to retrieve device information 2017-09-16 21:19:35 +05:30
WSO2 Builder
f537b1bbad [WSO2 Release] [Jenkins #2649] [Release 3.0.108] prepare for next development iteration 2017-09-15 11:47:39 +00:00
WSO2 Builder
37215a8816 [WSO2 Release] [Jenkins #2649] [Release 3.0.108] prepare release v3.0.108 2017-09-15 11:47:26 +00:00
Sameera Wickramasekara
fcd322cb21 Update operation status header on click 2017-09-15 15:38:36 +05:30
WSO2 Builder
6f9aaa20ac [WSO2 Release] [Jenkins #2647] [Release 3.0.107] prepare for next development iteration 2017-09-14 07:16:19 +00:00
WSO2 Builder
1b4c21bbd0 [WSO2 Release] [Jenkins #2647] [Release 3.0.107] prepare release v3.0.107 2017-09-14 07:16:04 +00:00
Harshan Liyanage
46761ed76d Resolved wso2/product-iots#1348 2017-09-13 14:23:08 +05:30
WSO2 Builder
6b4d11c1e4 [WSO2 Release] [Jenkins #2641] [Release 3.0.106] prepare for next development iteration 2017-09-04 07:28:36 +00:00
WSO2 Builder
a08b7e829e [WSO2 Release] [Jenkins #2641] [Release 3.0.106] prepare release v3.0.106 2017-09-04 07:27:12 +00:00
WSO2 Builder
ecf839f51c Merge commit 'ce84e9dde5066267f3d2b28e6acb3ab0e10e144d' into d4480bc7-b9fb-4da0-9ebe-c0ec82cf1b48 2017-09-04 07:06:20 +00:00
Ruwan
cb14a39e78 Merge pull request #947 from harshanL/master
Fix for wso2/product-iots#1035
2017-09-04 12:37:37 +05:30
Harshan Liyanage
fbc72a3c63 Minor refactoring related to wso2/product-iots#1035 2017-09-04 12:31:41 +05:30
WSO2 Builder
ce84e9dde5 [WSO2 Release] [Jenkins #2640] [Release 3.0.105] prepare for next development iteration 2017-09-04 06:55:18 +00:00
WSO2 Builder
15ac007fb6 [WSO2 Release] [Jenkins #2640] [Release 3.0.105] prepare release v3.0.105 2017-09-04 06:53:54 +00:00
Harshan Liyanage
e7b65b0136 Minor refactoring related to wso2/product-iots#1035 2017-09-04 12:07:05 +05:30
geethkokila
7e5501def1 Adding the certificate caching to improve performance 2017-09-04 11:57:38 +05:30
Harshan Liyanage
5906546dfb Minor refactoring related to wso2/product-iots#1035 2017-09-04 11:56:56 +05:30
Harshan Liyanage
a3aa259437 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-04 10:06:40 +05:30
WSO2 Builder
a4c29e496b [WSO2 Release] [Jenkins #2635] [Release 3.0.104] prepare for next development iteration 2017-09-01 15:27:10 +00:00
WSO2 Builder
074d2f95e7 [WSO2 Release] [Jenkins #2635] [Release 3.0.104] prepare release v3.0.104 2017-09-01 15:25:46 +00:00
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
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
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