Dileesha Rajapakse
eadb7ea02a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-07-18 09:42:12 +05:30
sameera910409
9db742e95a
fixing https://github.com/wso2/product-iots/issues/1136 : DeviceDetailsRetrieverTask attempts to add operations to a device that has been removed
2017-07-18 00:17:26 +05:30
Dileesha Rajapakse
90099449d3
Fixing issue 1184 - Redirection not handled upon session expiration
2017-07-17 17:11:34 +05:30
Imesh Chandrasiri
4bfdec95f9
Temparory remove of device statistics
2017-07-17 15:12:29 +05:30
geethkokila
afe312152f
Fixing https://github.com/wso2/product-iots/issues/1007
2017-07-17 14:43:06 +05:30
WSO2 Builder
94d270863e
[WSO2 Release] [Jenkins #2466 ] [Release 3.0.38] prepare for next development iteration
2017-07-17 07:10:59 +00:00
WSO2 Builder
c29d83afeb
[WSO2 Release] [Jenkins #2466 ] [Release 3.0.38] prepare release v3.0.38
2017-07-17 07:10:46 +00:00
Rasika Perera
c6cce05b11
Merge pull request #845 from rasika/cloud-fixes
...
Cloud fixes
2017-07-17 11:14:55 +05:30
WSO2 Builder
47ce6f4271
[WSO2 Release] [Jenkins #2464 ] [Release 3.0.37] prepare for next development iteration
2017-07-16 22:21:47 +05:30
WSO2 Builder
5dc7dc5442
[WSO2 Release] [Jenkins #2464 ] [Release 3.0.37] prepare release v3.0.37
2017-07-16 22:21:33 +05:30
WSO2 Builder
5acea60aef
Merge commit '91456df809816dfecda50082aeafe1192ee09fc0' into 240ffbb1-c967-4109-b74d-1eb6335f277e
2017-07-16 22:02:13 +05:30
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
WSO2 Builder
7a02ecbe68
[WSO2 Release] [Jenkins #2415 ] [Release 3.0.17] prepare for next development iteration
2017-07-01 12:47:09 +05:30
WSO2 Builder
5b32f7813a
[WSO2 Release] [Jenkins #2415 ] [Release 3.0.17] prepare release v3.0.17
2017-07-01 12:46:54 +05:30
Madhawa Perera
96c650f699
Merge pull request #820 from janakamarasena/bug-fixes-2
...
Added tenant domain to username in AccessToken grant
2017-07-01 08:04:58 +05:30
Madhawa Perera
031c648a2e
Merge pull request #816 from dunithd/master
...
Checking whether the geo location service has been enabled before reading stats from analytics server
2017-07-01 08:04:39 +05:30
WSO2 Builder
c376208943
[WSO2 Release] [Jenkins #2413 ] [Release 3.0.16] prepare for next development iteration
2017-06-30 17:44:28 +05:30
WSO2 Builder
5c013a3abd
[WSO2 Release] [Jenkins #2413 ] [Release 3.0.16] prepare release v3.0.16
2017-06-30 17:44:14 +05:30
Janak Amarasena
7218174d46
Add tenant domain to username
2017-06-30 16:13:41 +05:30
WSO2 Builder
4396704616
Merge commit 'cc13b1446e3465b67a1bf7aea681102cabb96412' into 5c4b0f95-b6c1-4250-9ab6-e420a526a091
2017-06-30 15:54:00 +05:30
Ayyoob Hamza
83fc26b722
Merge pull request #819 from lasanthaDLPDS/master
...
Fixing UI issues in device type API
2017-06-30 15:47:35 +05:30
WSO2 Builder
cc13b1446e
[WSO2 Release] [Jenkins #2412 ] [Release 3.0.15] prepare for next development iteration
2017-06-30 15:46:09 +05:30
WSO2 Builder
08831cb9f4
[WSO2 Release] [Jenkins #2412 ] [Release 3.0.15] prepare release v3.0.15
2017-06-30 15:45:56 +05:30
lasantha
8f225bc623
Fixing minor UI issues
2017-06-30 15:38:06 +05:30
Madhawa Perera
b503b531bd
Merge pull request #818 from rasika/master
...
When user removed, all associated devices are removed now
2017-06-30 15:15:10 +05:30
Rasika Perera
186b49395e
Fixing https://github.com/wso2/product-iots/issues/685 : When user removed, all associated devices removed
2017-06-30 14:59:24 +05:30
lasantha
d5fac0c569
Removing device type clicking option
2017-06-30 14:36:08 +05:30
Imesh Chandrasiri
eda30cbf3c
adding chevron arrow when clicking op.log
2017-06-30 14:24:25 +05:30
lasantha
70138c3c6e
removing select bar in device types page
2017-06-30 10:49:25 +05:30
dunithd
cffecfaf3a
Removing the warning message and changing the HTTP response status code to 400
2017-06-30 10:45:40 +05:30
dunithd
07c525667c
Removing an unused import
2017-06-29 18:27:04 +05:30
dunithd
0d3701be88
Checking whether the geo location service has been enabled before reading stats from analytics server
2017-06-29 18:25:28 +05:30
Imesh Chandrasiri
131bf2d3b4
Fix for long length device name
2017-06-29 15:22:24 +05:30
WSO2 Builder
6330164676
[WSO2 Release] [Jenkins #2409 ] [Release 3.0.14] prepare for next development iteration
2017-06-29 14:54:03 +05:30
WSO2 Builder
153fb3984e
[WSO2 Release] [Jenkins #2409 ] [Release 3.0.14] prepare release v3.0.14
2017-06-29 14:53:50 +05:30
Imesh Chandrasiri
f35fb92668
Fixes #437 issue where propper validation message is needed
2017-06-29 12:03:36 +05:30
Imesh Chandrasiri
b9cc3c73cd
Fix for github issue #1064
2017-06-29 11:32:36 +05:30
WSO2 Builder
fc41a165a8
[WSO2 Release] [Jenkins #2406 ] [Release 3.0.13] prepare for next development iteration
2017-06-28 19:26:16 +05:30
WSO2 Builder
7acd8e70c4
[WSO2 Release] [Jenkins #2406 ] [Release 3.0.13] prepare release v3.0.13
2017-06-28 19:26:02 +05:30
Geeth
63a7a2bb28
Merge pull request #813 from milanperera/iot-master
...
Fixed issue wso2/product-iots#427
2017-06-28 18:35:43 +05:30
Milan Perera
4994fddfd8
Fixed issue wso2/product-iots#427
2017-06-28 18:32:21 +05:30
WSO2 Builder
cb078fbb0f
[WSO2 Release] [Jenkins #2404 ] [Release 3.0.12] prepare for next development iteration
2017-06-28 18:26:18 +05:30
WSO2 Builder
8e874b2ef0
[WSO2 Release] [Jenkins #2404 ] [Release 3.0.12] prepare release v3.0.12
2017-06-28 18:26:05 +05:30
Milan Perera
c605ffbd58
Fixed issue wso2/product-iots#475
2017-06-28 17:56:50 +05:30
Milan Perera
a60566a417
Removed DCR dependancies
2017-06-28 12:19:09 +05:30
Milan Perera
72a19085ad
Removed DCR feature
2017-06-28 08:41:41 +05:30
Milan Perera
eb89aa4ff4
Removed DCR feature
2017-06-27 23:20:04 +05:30
WSO2 Builder
c03e1ec1d1
[WSO2 Release] [Jenkins #2401 ] [Release 3.0.11] prepare for next development iteration
2017-06-27 12:15:35 +05:30
WSO2 Builder
997affda65
[WSO2 Release] [Jenkins #2401 ] [Release 3.0.11] prepare release v3.0.11
2017-06-27 12:15:21 +05:30
Janak Amarasena
21a9df97bb
Add proper handling when invalid token is received
2017-06-26 18:37:01 +05:30
warunalakshitha
ad9ec1f994
Add multiple push notification support and transport config for features
2017-06-26 11:45:15 +05:30
WSO2 Builder
e23ef52e61
[maven-release-plugin]prepare for next development iteration
2017-06-23 20:27:17 +05:30
WSO2 Builder
c333f28461
[maven-release-plugin]prepare release v3.0.10
2017-06-23 20:27:03 +05:30
Madhawa Perera
25aaf92641
Merge pull request #810 from sinthuja/master
...
Updating source/target versions to jdk 1.8.
2017-06-23 18:12:45 +05:30
Madhawa Perera
6adc8e6aef
Merge pull request #809 from janakamarasena/high-priority-fixes-2
...
Fixes NPE when using Access Token grant handler
2017-06-23 18:00:42 +05:30
sinthuja
fce84b9942
Updating source/target versions to jdk 1.8.
2017-06-23 18:00:06 +05:30
Janak Amarasena
0f41dce394
Fixed spacing
2017-06-23 17:53:32 +05:30
Janak Amarasena
88bdad18b1
Fixes NPE
2017-06-23 17:50:42 +05:30
Harshan Liyanage
188c80f52a
Merge pull request #808 from hasuniea/master
...
Fixing issue wso2/product-iot#527
2017-06-23 17:49:23 +05:30
Hasunie
9206f74790
Fixing issue wso2/product-iot##527
2017-06-23 17:39:42 +05:30
Kamidu Sachith Punchihewa
e556193647
Merge pull request #807 from DimalChandrasiri/master
...
Fix for application listing app name clipping issue
2017-06-23 17:30:31 +05:30
WSO2 Builder
27e494f153
[WSO2 Release] [Jenkins #2393 ] [Release 3.0.9] prepare for next development iteration
2017-06-23 17:22:32 +05:30
WSO2 Builder
21ab65e6d5
[WSO2 Release] [Jenkins #2393 ] [Release 3.0.9] prepare release v3.0.9
2017-06-23 17:22:20 +05:30
Imesh Chandrasiri
930dccaa4d
fix for application listing app name clipping issue
2017-06-23 17:09:21 +05:30
Ayyoob Hamza
bd65b1d73b
Merge pull request #806 from rasika/master
...
Fixing android geo fencing ui
2017-06-23 16:48:52 +05:30
Rasika Perera
fcf41d6511
Reducing the map height
2017-06-23 16:43:13 +05:30
Rasika Perera
bfbaf00e34
Fixing android geo fencing ui
2017-06-23 16:37:22 +05:30
Rasika Perera
139bc99cc7
Adding error logs when unexpected error from gateway
2017-06-23 16:37:08 +05:30
lasantha
88328b6be3
Adding latest Font WSO2
2017-06-23 14:58:39 +05:30
WSO2 Builder
54d25522ba
[WSO2 Release] [Jenkins #2390 ] [Release 3.0.8] prepare for next development iteration
2017-06-22 20:09:55 +05:30
WSO2 Builder
69b168f3b2
[WSO2 Release] [Jenkins #2390 ] [Release 3.0.8] prepare release v3.0.8
2017-06-22 20:09:41 +05:30
Geeth
63c8e87d98
Merge pull request #803 from ayyoob/devicetype-3.1.0
...
Adding Device type API Implementation
2017-06-22 19:46:33 +05:30
ayyoob
d70cea2e46
fixed commit issues
2017-06-22 19:29:04 +05:30
ayyoob
536d100fd6
fixed comment issues
2017-06-22 17:44:54 +05:30
ayyoob
abacc0ce2a
fixed comment issues
2017-06-22 17:28:37 +05:30
Kamidu Sachith Punchihewa
f868fa2d35
Merge pull request #804 from DimalChandrasiri/master
...
Fix for removed device selection in Data Table
2017-06-22 17:13:59 +05:30
Imesh Chandrasiri
cba8f5243e
Fix for removed device selection in datatable
2017-06-22 17:07:59 +05:30
Kamidu Sachith Punchihewa
3c5e65c047
Merge pull request #802 from dunithd/master
...
Adding refresh button for the operations log tab
2017-06-22 17:00:22 +05:30
ayyoob
2dab109ad3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-22 16:56:34 +05:30
dunithd
b3642730ad
Adding refresh button for the operations log tab
2017-06-22 16:49:01 +05:30
inoshperera
ae8452adcb
Merge pull request #801 from geethkokila/master
...
Fixing the task for all the tenants
2017-06-22 15:56:08 +05:30
geethkokila
1655b512b0
Fixing formating issues
2017-06-22 15:55:22 +05:30
geethkokila
5f71313af1
Fixing formating issues
2017-06-22 15:53:11 +05:30
geethkokila
07357124b0
Fixing the task for all the tenants
2017-06-22 15:45:11 +05:30
Ace
ac01fef7be
Adding import enhancements
2017-06-22 15:34:03 +05:30
Ace
dcbffac198
Adding fixes for https://github.com/wso2/product-iots/issues/997
2017-06-22 15:12:40 +05:30
Hasunie
b2c6bc5453
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-22 10:50:51 +05:30
ayyoob
9f4037b7e1
few changes to ui
2017-06-22 06:50:20 +05:30
ayyoob
6c041c7b6a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-22 04:34:45 +05:30
Geeth
a47d2a6672
Merge pull request #797 from sinthuja/master
...
Fixing issues in IoT core with MSSQL.
2017-06-21 23:02:46 +05:30
Kamidu Sachith Punchihewa
a895c1f4dd
Merge pull request #795 from janakamarasena/high-priority-fixes-2
...
Added bottom margin to 'Show All Notifications' button
2017-06-21 19:34:50 +05:30
kamidu
525c0958d9
fixing the password reset issue
2017-06-21 18:53:56 +05:30
Janak Amarasena
db98663c78
Added bottom margin to Show All Notifications button
2017-06-21 18:04:11 +05:30
sinthuja
ee8f29503d
Merge branch 'wso2-master'
2017-06-21 16:31:06 +05:30
sinthuja
8197547383
Fixing MSSQL related issues, and dbscript issues.
2017-06-21 16:30:19 +05:30
Geeth
d6fcdf500b
Merge pull request #794 from milanperera/iot-master
...
Changing error logs to debug
2017-06-21 14:31:31 +05:30
Milan Perera
cda5a0b216
Changing error logs to debug
2017-06-21 13:10:24 +05:30
Imesh Chandrasiri
66d9ea4bde
Merge branch 'master' of https://github.com/DimalChandrasiri/carbon-device-mgt
2017-06-21 12:36:46 +05:30
Rasika Perera
fc4576082c
Changing artifact uploader admin service resource path
2017-06-21 10:57:50 +05:30
ayyoob
80cc690a42
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-21 04:11:40 +05:30
WSO2 Builder
68cb8d3f81
[WSO2 Release] [Jenkins #2380 ] [Release 3.0.7] prepare for next development iteration
2017-06-20 22:37:58 +05:30
WSO2 Builder
d0f52c48ef
[WSO2 Release] [Jenkins #2380 ] [Release 3.0.7] prepare release v3.0.7
2017-06-20 22:37:45 +05:30
Geeth
3deffa99dd
Merge pull request #790 from dunithd/master
...
Adding an API method to retrieve an activity by it's ID and a device ID
2017-06-20 22:27:42 +05:30
Imesh Chandrasiri
1546411814
Fixed Multiple ajax calls when filtering
2017-06-20 20:25:57 +05:30
dunithd
d0058b982c
Adding new UX styles CSS
2017-06-20 19:40:58 +05:30
dunithd
c832f1b5a9
Applying new UX design for device details default unit
2017-06-20 19:39:52 +05:30
ayyoob
3224f3a50c
few changes in dbscript
2017-06-20 19:33:24 +05:30
Megala Uthayakumar
7431ed4997
Merge pull request #791 from sinthuja/master
...
Fixing mssql related issue.
2017-06-20 19:03:44 +05:30
sinthuja
4bfd35cc74
Fixing issue in mssql database issue in processor.
2017-06-20 18:54:36 +05:30
sinthuja
5570349cd1
Reverting back the other databases to use the arrays.
2017-06-20 18:05:39 +05:30
WSO2 Builder
2896b55f5e
[WSO2 Release] [Jenkins #2378 ] [Release 3.0.6] prepare for next development iteration
2017-06-20 18:03:42 +05:30
WSO2 Builder
bdb57383b1
[WSO2 Release] [Jenkins #2378 ] [Release 3.0.6] prepare release v3.0.6
2017-06-20 18:03:28 +05:30
dunithd
4cf3e2d421
Adding an API method to retrieve an activity by it's ID and a device ID
2017-06-20 17:44:22 +05:30
Geeth
c7a8f83f54
Merge pull request #789 from harshanL/master
...
Updated title bar app name to IoT Server.
2017-06-20 17:37:56 +05:30
Harshan Liyanage
eebbcbb6fa
Merge pull request #782 from janakamarasena/high-priority-fixes
...
UI fixes
2017-06-20 17:04:03 +05:30
sinthuja
4018d582ed
Adding comments to the batch size config.
2017-06-20 16:17:07 +05:30
sinthuja
f2ea96efde
Reverting the changes done to GenericFeatureDAOImpl.
2017-06-20 16:16:10 +05:30
sinthuja
ce5ca09e51
Adding oracle server specific impl.
2017-06-20 16:15:12 +05:30
sinthuja
f59202c0c3
Reverting back to the debug logs.
2017-06-20 13:46:39 +05:30
sinthuja
ade596d3c4
Merging the AS clause removal queries with generic DAO from oracle.
2017-06-20 13:17:03 +05:30
sinthuja
9398e7ee0b
Merge branch 'wso2-master'
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationMappingDAOImpl.java
2017-06-19 23:10:15 +05:30
sinthuja
124c0b4cf8
Fixing issues related to oracle database.
2017-06-19 23:05:05 +05:30
Hasunie
19495321d2
removing unnecessary lines
2017-06-19 19:23:01 +05:30
Hasunie
3333ed0381
Fixing permission issue which resolves wso2/product-iots#430
2017-06-19 19:18:34 +05:30
Harshan Liyanage
50e82eb80d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-19 17:34:45 +05:30
Harshan Liyanage
fecc5e1b72
Changed devicemgt app name to IoT Server.
2017-06-19 17:33:43 +05:30
WSO2 Builder
8badc2bc37
[WSO2 Release] [Jenkins #2375 ] [Release 3.0.5] prepare for next development iteration
2017-06-19 17:23:13 +05:30
WSO2 Builder
43182aede9
[WSO2 Release] [Jenkins #2375 ] [Release 3.0.5] prepare release v3.0.5
2017-06-19 17:22:58 +05:30
Harshan Liyanage
b8f085da20
Added null checks for device cache in-case cache is disabled.
2017-06-19 16:58:42 +05:30
WSO2 Builder
f70535ed20
[WSO2 Release] [Jenkins #2373 ] [Release 3.0.4] prepare for next development iteration
2017-06-19 16:22:55 +05:30
WSO2 Builder
c3d154ee65
[WSO2 Release] [Jenkins #2373 ] [Release 3.0.4] prepare release v3.0.4
2017-06-19 16:22:42 +05:30
Harshan Liyanage
a21c374b00
Code refactoring.
2017-06-19 12:52:31 +05:30
Harshan Liyanage
074ceeb0c7
Merged with master
2017-06-19 12:46:22 +05:30
Harshan Liyanage
967efa1fee
Fixed user enrolled device showing problem which resolves wso2/product-iots#406
2017-06-19 12:41:22 +05:30
inoshperera
88054f9075
removing non-compliance action.
2017-06-19 12:04:59 +05:30
geethkokila
0eca5a0152
Fixing the build failure
2017-06-19 11:44:47 +05:30
ayyoob
6dffac4191
fixes in ui
2017-06-18 16:41:38 +05:30
ayyoob
3b7d4d8966
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-17 19:17:42 +05:30
ayyoob
ca33f035df
merge ui fixes
2017-06-17 18:52:25 +05:30
Ayyoob Hamza
2875fb2ca0
Merge pull request #755 from rasika/geo-fencing
...
Added Geo Service into Device Mgt Core
2017-06-17 12:20:10 +05:30
WSO2 Builder
e924a86d73
[WSO2 Release] [Jenkins #2368 ] [Release 3.0.3] prepare for next development iteration
2017-06-16 17:40:41 +05:30
WSO2 Builder
b35aaab992
[WSO2 Release] [Jenkins #2368 ] [Release 3.0.3] prepare release v3.0.3
2017-06-16 17:40:27 +05:30
Janak Amarasena
3f17e66e8c
UI fixes
2017-06-16 16:51:49 +05:30
Harshan Liyanage
d8b756df3d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-16 16:48:30 +05:30
Harshan Liyanage
8b9420766f
Fixed SQL syntax issue in DeviceStatusMonitoring Task when running on PostgreSQL.
2017-06-16 16:47:34 +05:30
Harshan Liyanage
51c18d2108
Added pagination support for group-management for major db engines.
2017-06-16 16:46:30 +05:30
Rasika Perera
8da1f62cd9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-16 15:50:45 +05:30
Madawa Soysa
98e8dfea68
Merge pull request #781 from inoshperera/master
...
fixing the agent unable to enroll issue
2017-06-16 15:29:22 +05:30
inoshperera
58b2bf8b3c
fixing the agent unable to enroll issue
2017-06-16 15:23:41 +05:30
Rasika Perera
a5c18b3c26
Geo Fencing UI fixes
2017-06-16 14:42:05 +05:30
madhawap
648659a781
Sets values taken from system varibales to iot-api-config.xml
...
iot-api-config.xml consists with system varibales like iot.core.host, iot.keymanager.host etc. But values set to those varibales were not pass into these places. This commit fixes that
2017-06-16 13:16:29 +05:30
