Commit Graph

3860 Commits

Author SHA1 Message Date
WSO2 Builder
91456df809 [WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare for next development iteration 2017-07-16 21:54:30 +05:30
WSO2 Builder
25598c12d4 [WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare release v3.0.36 2017-07-16 21:54:16 +05:30
Madhawa Perera
efde7df025 Merge pull request #851 from rasika/geo-fence-issues
Fixing geofence issues
2017-07-16 21:36:56 +05:30
Madhawa Perera
731d88d96e Merge pull request #850 from rasika/temp-fix-api-subscribe
Temporary fixing download issue with adding /admin/manage/api/subscribe permission
2017-07-16 21:36:30 +05:30
Madhawa Perera
f45b0bf863 Merge pull request #849 from rasika/logo-fix
Changing IoT Server logo into sharp .svg format
2017-07-16 21:36:04 +05:30
Madhawa Perera
357a78215f Merge pull request #842 from warunalakshitha/master
Add new config to sample.xml
2017-07-16 21:35:22 +05:30
Rasika Perera
c31461d278 Fixes https://github.com/wso2/product-iots/issues/1096 2017-07-16 19:01:06 +05:30
Rasika Perera
f3eaac15c7 Fixes https://github.com/wso2/product-iots/issues/1096 2017-07-16 18:53:05 +05:30
Rasika Perera
661925ca54 Fixes https://github.com/wso2/product-iots/issues/1134 : Temporary fixing issue with adding /admin/manage/api/subscribe permission 2017-07-16 18:20:16 +05:30
WSO2 Builder
94c1fd0ad6 [WSO2 Release] [Jenkins #2461] [Release 3.0.35] prepare for next development iteration 2017-07-16 18:05:31 +05:30
WSO2 Builder
ce87e69859 [WSO2 Release] [Jenkins #2461] [Release 3.0.35] prepare release v3.0.35 2017-07-16 18:05:17 +05:30
Geeth
ed3327834b Merge pull request #848 from rasika/location-column-fix
Location column fix
2017-07-16 17:42:21 +05:30
Rasika Perera
f15713ae85 Changing IoT Server logo into sharp .svg format 2017-07-16 16:11:39 +05:30
Rasika Perera
78187c4ec1 Increasing location street column size 2017-07-16 16:00:19 +05:30
WSO2 Builder
2894d9ed00 Merge commit '5f8dab6916d6136102f0320464c1092369f7697d' into 43d6a75e-06b6-4777-86d7-21aee6dc4b99 2017-07-14 13:16:08 +05:30
WSO2 Builder
5f8dab6916 [WSO2 Release] [Jenkins #2457] [Release 3.0.34] prepare for next development iteration 2017-07-14 12:53:35 +05:30
WSO2 Builder
7c5fc0bf5d [WSO2 Release] [Jenkins #2457] [Release 3.0.34] prepare release v3.0.34 2017-07-14 12:53:19 +05:30
Imesh Chandrasiri
46b22e438d fixes wso2/product-iots#1152 2017-07-14 12:25:17 +05:30
Rasika Perera
9683b066dd Cloud fixes 2017-07-14 11:08:18 +05:30
Imesh Chandrasiri
4b87209e04 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-14 11:08:01 +05:30
Imesh Chandrasiri
f7c8578758 fixes wso2/product-iots#1141 2017-07-14 11:07:49 +05:30
WSO2 Builder
2673a7ae3c [WSO2 Release] [Jenkins #2454] [Release 3.0.33] prepare for next development iteration 2017-07-13 15:38:51 +05:30
WSO2 Builder
14f8bacb65 [WSO2 Release] [Jenkins #2454] [Release 3.0.33] prepare release v3.0.33 2017-07-13 15:38:38 +05:30
Imesh Chandrasiri
6d62f3b425 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-13 15:14:51 +05:30
Imesh Chandrasiri
7547599b09 fixes wso2/product-iots#1164 2017-07-13 15:14:40 +05:30
WSO2 Builder
2a6d35bdf5 [WSO2 Release] [Jenkins #2452] [Release 3.0.32] prepare for next development iteration 2017-07-13 12:25:52 +05:30
WSO2 Builder
a1a6649213 [WSO2 Release] [Jenkins #2452] [Release 3.0.32] prepare release v3.0.32 2017-07-13 12:25:38 +05:30
Imesh Chandrasiri
eabeb71a9c fixes wso2/product-iots#1166 2017-07-13 11:57:24 +05:30
Imesh Chandrasiri
a753ce1648 fixes wso2/product-iots#1170 2017-07-13 11:39:32 +05:30
Imesh Chandrasiri
c46cbb34ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-13 11:20:01 +05:30
Imesh Chandrasiri
a014cb0f60 fixes wso2/product-iots#1168 2017-07-13 11:17:41 +05:30
Waruna Lakshitha
222e1f6e7f add configuration change 2017-07-12 13:48:43 +05:30
warunalakshitha
61f6fdeca9 Revert "Add multiple push notification support and transport config for features"
This reverts commit ad9ec1f994.
2017-07-12 12:33:16 +05:30
warunalakshitha
a3c5118d5e Merge branch 'master' of https://github.com/warunalakshitha/carbon-device-mgt 2017-07-12 12:23:04 +05:30
WSO2 Builder
f398de79c4 [WSO2 Release] [Jenkins #2449] [Release 3.0.31] prepare for next development iteration 2017-07-11 15:35:38 +05:30
WSO2 Builder
757e93c301 [WSO2 Release] [Jenkins #2449] [Release 3.0.31] prepare release v3.0.31 2017-07-11 15:35:22 +05:30
WSO2 Builder
8d0e7a2086 [WSO2 Release] [Jenkins #2448] [Release 3.0.30] prepare for next development iteration 2017-07-11 14:16:42 +05:30
WSO2 Builder
6b30b11de9 [WSO2 Release] [Jenkins #2448] [Release 3.0.30] prepare release v3.0.30 2017-07-11 14:16:25 +05:30
Jasintha
4bae413f72 Fixing Filstream closing issue and few formatting errors 2017-07-11 13:01:09 +05:30
Jasintha
b1d5a58d6b Fixing weekTrustManger Imple issue 2017-07-11 10:12:07 +05:30
WSO2 Builder
3a991b8bf7 [WSO2 Release] [Jenkins #2446] [Release 3.0.29] prepare for next development iteration 2017-07-10 17:50:16 +05:30
WSO2 Builder
9ecc6f7281 [WSO2 Release] [Jenkins #2446] [Release 3.0.29] prepare release v3.0.29 2017-07-10 17:50:02 +05:30
kamidu
19dc0a08c7 merge the css changes 2017-07-10 17:23:49 +05:30
kamidu
ee4e3df66d enable device owner flag in policy 2017-07-10 17:21:18 +05:30
WSO2 Builder
71e3cdffdd [WSO2 Release] [Jenkins #2444] [Release 3.0.28] prepare for next development iteration 2017-07-10 14:54:49 +05:30
WSO2 Builder
2519d86874 [WSO2 Release] [Jenkins #2444] [Release 3.0.28] prepare release v3.0.28 2017-07-10 14:54:40 +05:30
Imesh Chandrasiri
ca760581a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-10 12:40:20 +05:30
Imesh Chandrasiri
66a7fe454c Fixes datatable miss rendering in device detail view. 2017-07-10 12:25:58 +05:30
WSO2 Builder
c63c04f5a6 [WSO2 Release] [Jenkins #2441] [Release 3.0.27] prepare for next development iteration 2017-07-09 09:50:34 +05:30
WSO2 Builder
9d2fd5273e [WSO2 Release] [Jenkins #2441] [Release 3.0.27] prepare release v3.0.27 2017-07-09 09:50:19 +05:30
sumedharubasinghe
77eadc7b5a Merge pull request #836 from rasika/operation-bar
Changes for the operation bar
2017-07-09 07:58:45 +05:30
Rasika Perera
6e748ae799 Hiding geo-fencing related buttons when geoservices disabled 2017-07-08 21:10:04 +05:30
Rasika Perera
389173f505 Fixes https://github.com/wso2/product-iots/issues/1084 2017-07-08 19:17:52 +05:30
Rasika Perera
394d97e1c8 Fixed operations not loaded correctly 2017-07-08 18:47:00 +05:30
WSO2 Builder
5d27e40e76 [WSO2 Release] [Jenkins #2438] [Release 3.0.26] prepare for next development iteration 2017-07-07 19:11:59 +05:30
WSO2 Builder
3930a7cfb1 [WSO2 Release] [Jenkins #2438] [Release 3.0.26] prepare release v3.0.26 2017-07-07 19:11:44 +05:30
WSO2 Builder
2cc05f5b74 Merge commit 'b429d8b902afeac2ee9bb8437453823f22d7558f' into 58d25041-0381-457c-88f6-091b7d94faa6 2017-07-07 18:51:02 +05:30
Rasika Perera
9db4ddd4df Merge pull request #832 from rasika/geo-fencing
Hiding geo dashboard tools when GeoLocationConfiguration is Disabled
2017-07-07 18:39:02 +05:30
Rasika Perera
bd5276117a Merge pull request #834 from rasika/master
Fixes device status inconsistency issues
2017-07-07 18:38:00 +05:30
WSO2 Builder
b429d8b902 [WSO2 Release] [Jenkins #2437] [Release 3.0.25] prepare for next development iteration 2017-07-07 18:30:31 +05:30
WSO2 Builder
8ac3291551 [WSO2 Release] [Jenkins #2437] [Release 3.0.25] prepare release v3.0.25 2017-07-07 18:30:16 +05:30
geethkokila
38756ffe4e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-07 17:59:35 +05:30
geethkokila
3e42cf426f Fixing the null pointer 2017-07-07 17:59:28 +05:30
Rasika Perera
972465b61e Fixes https://github.com/wso2/product-iots/issues/1089, https://github.com/wso2/product-iots/issues/1120 2017-07-07 17:16:28 +05:30
WSO2 Builder
8287bfa6d5 [WSO2 Release] [Jenkins #2435] [Release 3.0.24] prepare for next development iteration 2017-07-07 16:24:55 +05:30
WSO2 Builder
f3c6548937 [WSO2 Release] [Jenkins #2435] [Release 3.0.24] prepare release v3.0.24 2017-07-07 16:24:39 +05:30
Imesh Chandrasiri
4a638836ca Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-07 12:42:28 +05:30
Imesh Chandrasiri
b43a2f72d9 Fixes wso2/product-iots#1118 2017-07-07 12:42:18 +05:30
Rasika Perera
83d0793a35 Hiding geo dashboard tools when GeoLocationConfiguration is Disabled 2017-07-07 06:58:58 +05:30
WSO2 Builder
ab606238d9 [WSO2 Release] [Jenkins #2432] [Release 3.0.23] prepare for next development iteration 2017-07-07 00:09:32 +05:30
WSO2 Builder
23cdc06244 [WSO2 Release] [Jenkins #2432] [Release 3.0.23] prepare release v3.0.23 2017-07-07 00:09:19 +05:30
lasantha
edc14aa46d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 23:40:06 +05:30
lasantha
f32f5e4fdc Fixed operation label centering issue 2017-07-06 21:49:22 +05:30
WSO2 Builder
407fdf66da [WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare for next development iteration 2017-07-06 15:02:03 +05:30
WSO2 Builder
ba0a0c4687 [WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare release v3.0.22 2017-07-06 15:01:52 +05:30
Imesh Chandrasiri
1893d035a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 14:17:27 +05:30
Imesh Chandrasiri
e1857099a7 Fixes wso2/product-iots#1083 2017-07-06 14:17:16 +05:30
Madhawa Perera
597b450cfb Merge pull request #829 from lasanthaDLPDS/master
Adding checkbox and radio options to device.operation-bar
2017-07-06 13:57:13 +05:30
lasantha
cb8208b8b7 Adding UI validation to check whether radio or checkbox options are selected or not. 2017-07-06 13:15:52 +05:30
geethkokila
fe67d251d5 Fixing the #460 issue 2017-07-06 11:57:04 +05:30
lasantha
e05eda5e18 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 09:42:22 +05:30
lasantha
c9e533dd2a adding ui params option to operations 2017-07-06 09:36:40 +05:30
WSO2 Builder
1950126459 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare for next development iteration 2017-07-05 23:45:39 +05:30
WSO2 Builder
2388bd5f05 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare release v3.0.21 2017-07-05 23:45:24 +05:30
Rasika Perera
3e118d8800 Fixing https://github.com/wso2/product-iots/issues/1063: Adding filter out features 2017-07-05 23:20:41 +05:30
WSO2 Builder
f106a914bb [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare for next development iteration 2017-07-05 14:59:52 +05:30
WSO2 Builder
0cc8f902ae [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare release v3.0.20 2017-07-05 14:59:38 +05:30
Imesh Chandrasiri
c17b2fbd98 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-05 12:10:26 +05:30
Imesh Chandrasiri
d38714b7e6 fixes wso2/product-iots#1113 2017-07-05 12:08:45 +05:30
Rasika Perera
5e87ce2d66 Merge pull request #824 from rasika/monetize-cloud
Fixing https://github.com/wso2/product-iots/issues/1119: monetization
2017-07-05 11:10:11 +05:30
Rasika Perera
f8fa314359 Fixing https://github.com/wso2/product-iots/issues/1096: Hiding table when no alerts avaialble 2017-07-05 10:49:55 +05:30
Rasika Perera
7bc3ab7bec Fixing https://github.com/wso2/product-iots/issues/1096: Stationery -> Stationary 2017-07-05 07:17:52 +05:30
Rasika Perera
fb12c3cb04 Fixing https://github.com/wso2/product-iots/issues/1096: i.e. colombo -> e.g. colombo 2017-07-05 07:17:26 +05:30
Rasika Perera
8223588e82 Fixing https://github.com/wso2/product-iots/issues/1119: monetization 2017-07-05 06:27:42 +05:30
WSO2 Builder
09bf240ff6 [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare for next development iteration 2017-07-04 19:13:38 +05:30
WSO2 Builder
3c63162f7a [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare release v3.0.19 2017-07-04 19:13:23 +05:30
Imesh Chandrasiri
73d4a213c6 fix for issue [#1112] 2017-07-04 17:13:52 +05:30
WSO2 Builder
e65f0b1afa [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare for next development iteration 2017-07-03 18:31:48 +05:30
WSO2 Builder
e1bbc9fe47 [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare release v3.0.18 2017-07-03 18:31:35 +05:30
Nirothipan
ce741c3993 Security policy updated, allowing to autofill password if users have saved it 2017-07-03 14:15:07 +05:30