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
Supun94
8d38f6490c
MQTT Dashboard UI code refactor
2017-06-30 16:31:43 +05:30
Janak Amarasena
7218174d46
Add tenant domain to username
2017-06-30 16:13:41 +05:30
Supun94
022e1eefe3
Adding MQTT Dashboard UI page
2017-06-30 15:55:56 +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
madhawap
a115cff4db
reformatting code
2017-06-16 13:16:29 +05:30
Rasika Perera
d3f24bb8ba
Making alert danger into alert info in stationary alerts
2017-06-16 12:48:03 +05:30
Rasika Perera
c8d41c7b3e
Few more improvements into geo-dashboard
2017-06-16 12:45:29 +05:30
Rasika Perera
3fd2c6b705
Adding deploy geo analytics button into platform configuration
2017-06-16 12:30:24 +05:30
sinthuja
1c13269fc8
Fixing https://github.com/wso2/product-iots/issues/495 .
2017-06-16 11:50:54 +05:30
WSO2 Builder
2b76317f40
[WSO2 Release] [Jenkins #2366 ] [Release 3.0.2] prepare for next development iteration
2017-06-16 11:00:40 +05:30
WSO2 Builder
02bc10e6d2
[WSO2 Release] [Jenkins #2366 ] [Release 3.0.2] prepare release v3.0.2
2017-06-16 11:00:26 +05:30
Supun94
df06953069
Adding MQTT pagination details
2017-06-16 10:50:47 +05:30
Supun94
8ca85f1177
Adding UI permissions for topics view
2017-06-16 10:50:47 +05:30
Rasika Perera
d0a1132060
Improving geo fence ui
2017-06-16 10:10:57 +05:30
Ayyoob Hamza
0551598988
Merge pull request #779 from janakamarasena/oauth-token-grant-refractor
...
Access token grant handler
2017-06-16 06:52:36 +05:30
ayyoob
f47d0deb1a
few changes after testing.
2017-06-16 03:48:08 +05:30
WSO2 Builder
1e58f762da
[WSO2 Release] [Jenkins #2365 ] [Release 3.0.1] prepare for next development iteration
2017-06-15 16:23:05 +05:30
WSO2 Builder
bae931f3c5
[WSO2 Release] [Jenkins #2365 ] [Release 3.0.1] prepare release v3.0.1
2017-06-15 16:22:51 +05:30
Ruwan
5d4c85b61e
Merge pull request #778 from harshanL/master
...
Code refactored.
2017-06-15 15:20:37 +05:30
Janak Amarasena
b2bdc0b6c8
Add token validation classes to the same bundle
2017-06-15 15:04:59 +05:30
Harshan Liyanage
de9beb1f5b
Code refatcored.
2017-06-15 14:49:40 +05:30
inoshperera
d63ef44e7b
Merge pull request #777 from harshanL/master
...
Fixed wso2/product-iots#473
2017-06-15 12:03:01 +05:30
Harshan Liyanage
3857be50b9
Fixed wso2/product-iots#473
2017-06-15 11:58:22 +05:30
Ruwan
477608613e
Merge pull request #776 from rasika/master
...
Fixing https://github.com/wso2/product-iots/issues/431
2017-06-15 11:31:19 +05:30
Rasika Perera
61c4db07a3
Fixing https://github.com/wso2/product-iots/issues/431
2017-06-15 11:27:37 +05:30
ayyoob
0d08c42f5e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-15 09:48:00 +05:30
WSO2 Builder
69d2cff7bd
[WSO2 Release] [Jenkins #2363 ] [Release 3.0.0] prepare for next development iteration
2017-06-14 18:08:46 +05:30
WSO2 Builder
3795011895
[WSO2 Release] [Jenkins #2363 ] [Release 3.0.0] prepare release v3.0.0
2017-06-14 18:08:31 +05:30
Harshan Liyanage
9e24338660
Added javadoc comments.
2017-06-14 14:55:25 +05:30
ayyoob
07bdd5cb6c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-14 13:19:07 +05:30
ayyoob
da68f8fac1
fixed on config operation flow
2017-06-14 12:38:56 +05:30
Chatura Dilan
38b7689e28
Merge pull request #773 from harshanL/master
...
Fixed java-doc comments issues and added comments to the configs.
2017-06-14 12:35:39 +05:30
Harshan Liyanage
b510a422b4
Fixed java-doc comments issues and added comments to the configs.
2017-06-14 12:28:16 +05:30
Geeth
115ccb739a
Merge pull request #765 from harshanL/master
...
Added comments to the device status configs.
2017-06-14 11:42:21 +05:30
Rasika Perera
798e551673
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-14 10:43:19 +05:30
Rasika Perera
68d9b2d310
Adding focus on geo map
2017-06-14 07:48:57 +05:30
Rasika Perera
10c8bf7f42
Capilizing notification title
2017-06-14 07:47:01 +05:30
WSO2 Builder
16420433b5
[WSO2 Release] [Jenkins #2352 ] [Release 2.0.75] prepare for next development iteration
2017-06-13 17:26:56 +05:30
WSO2 Builder
5c06b9dcb2
[WSO2 Release] [Jenkins #2352 ] [Release 2.0.75] prepare release v2.0.75
2017-06-13 17:26:42 +05:30
Harshan Liyanage
43ba1e1b43
Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005
2017-06-13 17:08:26 +05:30
Vishanth
7da1067d68
fixing sql queries to compare owner in lowercase
2017-06-13 17:08:01 +05:30
Rasika Perera
4796f5934f
Fixed geo alerts notifications
2017-06-13 00:44:20 +05:30
Rasika Perera
73ab6f28c1
Fixed sidebar notifications
2017-06-13 00:40:10 +05:30
Rasika Perera
6470e8e3d2
Fixed sidebar notifications
2017-06-13 00:39:58 +05:30
Rasika Perera
c970167299
UI fixes for geo fencing
2017-06-12 22:43:36 +05:30
Rasika Perera
ce6ab9b354
Refactoring "executionPlanType" -> "alertType"
2017-06-12 22:43:14 +05:30
Rasika Perera
e1c5c72b1b
Adding geo fence exit alerts ui
2017-06-12 15:40:38 +05:30
Rasika Perera
6d02075a99
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-12 15:11:14 +05:30
ayyoob
22a4716443
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-12 11:35:43 +05:30
ayyoob
c93410eb92
added few changes after review
2017-06-12 11:35:33 +05:30
Harshan Liyanage
951cd7b001
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-12 10:36:51 +05:30
WSO2 Builder
8927158086
[WSO2 Release] [Jenkins #2346 ] [Release 2.0.74] prepare for next development iteration
2017-06-09 12:57:29 +05:30
WSO2 Builder
28423c45bc
[WSO2 Release] [Jenkins #2346 ] [Release 2.0.74] prepare release v2.0.74
2017-06-09 12:57:15 +05:30
ayyoob
6c7f911cbc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
...
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
2017-06-08 14:39:51 +05:30
ayyoob
7ab52af66e
add http pushnotification
2017-06-08 14:24:33 +05:30
Harshan Liyanage
f215b5ee44
Added comments to the device status configs.
2017-06-07 17:34:06 +05:30
Chatura Dilan
f2db2609bd
Merge pull request #763 from janakamarasena/ouath-token-grant-v2
...
New OAuth grant type
2017-06-07 16:47:02 +05:30
Harshan Liyanage
a30982207b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-07 16:29:15 +05:30
Harshan Liyanage
3766ba0349
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
2017-06-07 16:29:05 +05:30
Janak Amarasena
bdaa4088a3
Resolve reference errors
2017-06-07 14:09:41 +05:30
Janak Amarasena
848c219efe
Add scope validator
2017-06-07 14:09:41 +05:30
Janak Amarasena
a9a246c2c4
Add new oauth grant type
2017-06-07 14:09:41 +05:30
WSO2 Builder
e3dfbdfdbd
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare for next development iteration
2017-06-07 13:44:29 +05:30
WSO2 Builder
598332b640
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare release v2.0.73
2017-06-07 13:44:15 +05:30
inoshperera
9f9208cebc
adding default values for timestamp
2017-06-07 09:25:16 +05:30
Rasika Perera
05b11a5099
Adding Exit Alerts feature
2017-06-06 14:55:04 +05:30
Rasika Perera
4f447305c9
Fixing minor issue in viewing geo fence
2017-06-06 14:50:52 +05:30
WSO2 Builder
73fa026eeb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare for next development iteration
2017-06-06 12:33:06 +05:30
WSO2 Builder
2415762ccb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare release v2.0.72
2017-06-06 12:32:53 +05:30
ayyoob
f3393080ba
fixed few issues after testing
2017-06-06 11:00:59 +05:30
GDLMadushanka
36bd1c5daf
Refactoring
2017-06-06 09:44:30 +05:30
Rasika Perera
8548e911aa
Added an error message when gpl siddhi extension is not configured
2017-06-06 06:18:27 +05:30
Rasika Perera
c7a751b1ef
Fixing location map height
2017-06-06 05:37:30 +05:30
Rasika Perera
ec343cef1a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-05 10:26:10 +05:30
Rasika Perera
dfb0e154c6
Added cdmf core dependency
2017-06-05 10:21:19 +05:30
Rasika Perera
6a2785cc8d
Multitenancy added to event publisher
2017-06-05 10:18:31 +05:30
Rasika Perera
fb368caae4
Removed unused gson initization
2017-06-05 10:16:03 +05:30
Rasika Perera
9865a260d4
Publishing location operation response into iot location event stream
2017-06-05 10:12:22 +05:30
Rasika Perera
886eaec271
Geo service alerts history method added
2017-06-05 10:11:14 +05:30
Rasika Perera
2733197edc
PublishLocationOperationResponse config element added to cdm-config.xml
2017-06-05 10:10:29 +05:30
Rasika Perera
76f4457462
Changes to geo dashboard ui in /devicemgt
2017-06-05 10:08:34 +05:30
GDLMadushanka
85d07dc9cb
Redirecting to respective analytics pages depending on the device type
2017-06-05 09:35:46 +05:30
ayyoob
194e4d99b5
added policy compliance support
2017-06-05 00:12:59 +05:30
ayyoob
5b46dc03a5
few fixes on event reciever definition
2017-06-04 18:18:06 +05:30
ayyoob
7cba43ccbb
few changes after testing HTTP and MQTT flow
2017-06-04 06:52:29 +05:30
ayyoob
a7ebc96cb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-03 18:06:32 +05:30
ayyoob
a1b20f1663
changed response payload definition for pull notification
2017-06-03 13:27:08 +05:30
WSO2 Builder
39a7037821
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare for next development iteration
2017-06-02 16:44:55 +05:30
WSO2 Builder
22782ec125
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare release v2.0.71
2017-06-02 16:44:41 +05:30
Harshan Liyanage
9871122c0a
Code refactoring of device-status-task which Resolves harshanl/product-iots#518
2017-06-02 15:36:56 +05:30
Harshan Liyanage
52bbdfcd78
Code refactoring of device-status-task which Resolves harshanl/product-iots#518
2017-06-02 15:23:51 +05:30
Harshan Liyanage
fda9410a2a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-02 15:07:48 +05:30
Harshan Liyanage
d3cb7ba70b
Changed the device-status-task to use optimized queries which Resolves harshanl/product-iots#518
2017-06-02 15:07:39 +05:30
ayyoob
c46cbfafe5
Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt into devicetype-3.1.0
2017-06-01 17:23:42 +05:30
ayyoob
4dc0f69e28
updated version
2017-06-01 17:23:18 +05:30
ayyoob
04b8b74e4f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-01 17:22:33 +05:30
ayyoob
a0d7518cbe
Implemented Pull Notification Support
2017-06-01 17:19:25 +05:30
ayyoob
8a56161a43
Implemented Pull Notification Support
2017-06-01 17:19:14 +05:30
WSO2 Builder
c7fd70145d
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare for next development iteration
2017-06-01 08:58:27 +05:30
WSO2 Builder
0c9d104401
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare release v2.0.70
2017-06-01 08:58:13 +05:30
Rasika Perera
aa0f9e0510
Merge pull request #744 from ayyoob/new-master
...
auto healing in case of app deletion and added device scope to handle to handle multiple session
2017-06-01 05:29:27 +05:30
Rasika Perera
5cb0f9bb94
Fixes to geo-fencing ui
2017-06-01 05:00:00 +05:30
Rasika Perera
ddfecba1a6
Added geo fencing unit
2017-05-31 10:58:51 +05:30
Malintha Fernando
07f2cb608b
Fix : Store device type names as it is
2017-05-31 10:16:24 +05:30
Harshan Liyanage
4ec139608e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-05-30 17:00:52 +05:30
Harshan Liyanage
35d1c9897e
Resolves harshanl/product-iots#518
2017-05-30 17:00:23 +05:30
Rasika Perera
0a8929c7ee
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-05-30 16:35:36 +05:30
WSO2 Builder
69a63baa43
[WSO2 Release] [Jenkins #2328 ] [Release 2.0.69] prepare for next development iteration
2017-05-30 11:24:51 +05:30
WSO2 Builder
713b948ea9
[WSO2 Release] [Jenkins #2328 ] [Release 2.0.69] prepare release v2.0.69
2017-05-30 11:24:37 +05:30
madhawap
c4d433a1a0
Fix for disabling reboot and upgrade-firmware operations on UI and Code formatting
...
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled. In addition change a c-style for loop to a foreach loop in PolicyManagementServiceImpl.java
2017-05-29 20:13:51 +05:30
Rasika Perera
f864506f62
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-05-29 13:09:21 +05:30
Rasika Perera
7b0295ff01
Added geo-fencing to the devicemgt app
2017-05-29 12:58:06 +05:30
Rasika Perera
ea3ed9c444
Added Geo Service into Device Mgt Core
2017-05-29 11:51:41 +05:30
ayyoob
f03155a702
fixed missing import package issue
2017-05-29 11:36:09 +05:30
ayyoob
dbdaa5a0e0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-05-29 05:44:36 +05:30
ayyoob
c3f23fa564
fixed multi tenant issues after testing custom device type impl
2017-05-29 01:00:16 +05:30
Amal Gunatilake
2ac5a56ad0
Merge pull request #749 from madawas/master
...
Fixing wso2/product-iots##467
2017-05-26 15:25:25 +05:30
warunalakshitha
1a26595472
Fix issue with using enrollment id for device id
2017-05-26 14:54:04 +05:30
ayyoob
56faa75861
fixed analytics issues
2017-05-25 03:07:19 +05:30
ayyoob
75d6813d8a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-05-24 00:43:02 +05:30
ayyoob
5acf5912e4
added comment
2017-05-24 00:41:21 +05:30
ayyoob
a037f91f56
removed task Config from template
2017-05-24 00:27:13 +05:30
ayyoob
4d22bc7064
fixed UI Issues
2017-05-24 00:26:02 +05:30
WSO2 Builder
7e83b53bb4
[WSO2 Release] [Jenkins #2314 ] [Release 2.0.68] prepare for next development iteration
2017-05-22 15:33:56 +05:30
WSO2 Builder
768073ea51
[WSO2 Release] [Jenkins #2314 ] [Release 2.0.68] prepare release v2.0.68
2017-05-22 15:33:42 +05:30
Amal Gunatilake
3f7543bee8
Merge pull request #742 from milanperera/iot-master
...
Removed unnecessary interace methods from Device Manager
2017-05-22 15:27:41 +05:30
ayyoob
dd1c2e4338
Added few fixes after testing and added default UI for device type management
2017-05-22 02:51:35 +05:30
ayyoob
6004ee7264
Adding back the sample definition file
2017-05-19 02:06:08 +05:30
ayyoob
f945da194d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-05-19 01:56:40 +05:30
ayyoob
abc9315f95
Added Pluggable Device Type
2017-05-19 01:49:10 +05:30
ayyoob
ed366867d1
Added Pluggable Device Type
2017-05-19 01:48:54 +05:30
ayyoob
6ab219c9dd
Added Pluggable Device Type
2017-05-19 01:48:36 +05:30
WSO2 Builder
88bab85750
[WSO2 Release] [Jenkins #2308 ] [Release 2.0.67] prepare for next development iteration
2017-05-18 17:33:39 +05:30
WSO2 Builder
4e506a547e
[WSO2 Release] [Jenkins #2308 ] [Release 2.0.67] prepare release v2.0.67
2017-05-18 17:33:25 +05:30
Megala Uthayakumar
47bdbc7c14
Merge pull request #751 from sinthuja/master
...
adding the if condition for only newRoles list iteration.
2017-05-18 16:03:06 +05:30
sinthuja
3340d94acf
adding the if condition for only newRoles list iteration.
2017-05-18 16:00:25 +05:30
megala21
f41a692bf3
Reformatting code
2017-05-18 14:21:24 +05:30
megala21
25e0b989d2
Fixing issues in group sharing
2017-05-18 14:17:03 +05:30
Madawa Soysa
20999f4cd5
Fixing wso2/product-iots##467
2017-05-18 10:54:54 +05:30
WSO2 Builder
3092423d4d
[WSO2 Release] [Jenkins #2305 ] [Release 2.0.66] prepare for next development iteration
2017-05-17 19:11:50 +05:30
WSO2 Builder
e21520392c
[WSO2 Release] [Jenkins #2305 ] [Release 2.0.66] prepare release v2.0.66
2017-05-17 19:11:36 +05:30
Megala Uthayakumar
39439c5c50
Merge pull request #748 from sinthuja/master
...
Fixing issues in editing policy
2017-05-17 18:38:31 +05:30
sinthuja
e7490dd278
Fixing https://github.com/wso2/product-iots/issues/443 .
2017-05-17 17:24:37 +05:30
Megala Uthayakumar
8830d627e9
Merge pull request #747 from sinthuja/master
...
Fixing some issues reported for product-iots.
2017-05-17 16:18:32 +05:30
sinthuja
9c110bb59c
Fixing https://github.com/wso2/product-iots/issues/444 .
2017-05-16 18:41:07 +05:30
WSO2 Builder
d4baa72328
[WSO2 Release] [Jenkins #2300 ] [Release 2.0.65] prepare for next development iteration
2017-05-16 18:34:27 +05:30
WSO2 Builder
7b549f623d
[WSO2 Release] [Jenkins #2300 ] [Release 2.0.65] prepare release v2.0.65
2017-05-16 18:34:13 +05:30
sinthuja
4df590caa1
Fixing https://github.com/wso2/product-iots/issues/447 .
2017-05-16 18:17:45 +05:30
Madawa Soysa
c7d002a6a9
Fix for https://github.com/wso2/product-iots/issues/449
2017-05-16 17:18:16 +05:30
ayyoob
1955b028d2
add tenancy to property table
2017-05-15 20:08:03 +05:30
ayyoob
fbb5f5ae88
merged with origin
2017-05-15 18:15:24 +05:30
ayyoob
42cb383804
auto healing in case of app deletion and added device scope to handle multiple session with same user
2017-05-11 21:21:53 +05:30
WSO2 Builder
84d305dcd4
[WSO2 Release] [Jenkins #2293 ] [Release 2.0.64] prepare for next development iteration
2017-05-11 09:15:49 +05:30
WSO2 Builder
3bf945fe95
[WSO2 Release] [Jenkins #2293 ] [Release 2.0.64] prepare release v2.0.64
2017-05-11 09:15:33 +05:30
ayyoob
d2d7be6fd6
fixed tenant related issue for mqtt push notification and stream artifact publishing
2017-05-10 13:50:06 +05:30
ayyoob
1c3a89f57c
fixed issues raised through comments - commits
2017-05-10 13:49:20 +05:30
ayyoob
035403495c
made default stat permission as constant
2017-05-09 16:45:47 +05:30
ayyoob
cb9db4dd1d
fixed null pointer in the initial operations
2017-05-09 16:16:14 +05:30
ayyoob
483d09ebf1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into new-master
2017-05-09 16:13:35 +05:30
ayyoob
ea48ee425c
added default configuration for tenant specific push notification provider
2017-05-09 16:09:24 +05:30
Milan Perera
64d656b5e7
Removed unnecessary interace methods from Device Manager
2017-05-09 15:09:21 +05:30
WSO2 Builder
f7300645a5
[WSO2 Release] [Jenkins #2289 ] [Release 2.0.63] prepare for next development iteration
2017-05-09 15:05:26 +05:30
WSO2 Builder
ca83609703
[WSO2 Release] [Jenkins #2289 ] [Release 2.0.63] prepare release v2.0.63
2017-05-09 15:05:11 +05:30
Milan Perera
53f2c555c4
Added method to test device manager
2017-05-09 14:44:01 +05:30
Milan Perera
17ecadb913
Added a feature to pick default platform configurations
2017-05-09 11:52:21 +05:30
ayyoob
b36ff4b874
added a authorisation resource for stat
2017-05-09 00:54:49 +05:30
ayyoob
3feb6c70dc
created per tenant push notification for each transport type
2017-05-09 00:54:34 +05:30
ayyoob
77ceed5368
renamed device type publisher service to DeviceAnalyticsArtifactUploaderAdminService
2017-05-09 00:54:01 +05:30
WSO2 Builder
964eae6f92
[WSO2 Release] [Jenkins #2285 ] [Release 2.0.62] prepare for next development iteration
2017-05-08 17:42:41 +05:30
WSO2 Builder
31f91f80b9
[WSO2 Release] [Jenkins #2285 ] [Release 2.0.62] prepare release v2.0.62
2017-05-08 17:42:28 +05:30
Hasunie
9947085d08
Merge pull request #739 from harshanL/master
...
#738:Fixed issue 738.
2017-05-08 17:36:03 +05:30
Harshan Liyanage
447e0561b9
#738:Fixed issue 738.
2017-05-08 17:33:45 +05:30
megala21
f14e2c2d6a
Removing cloud_type from config.json
2017-05-08 15:19:51 +05:30
megala21
8d0efd3289
Adding request new device type button for cloud
2017-05-08 13:58:59 +05:30
WSO2 Builder
639eeb225a
[WSO2 Release] [Jenkins #2280 ] [Release 2.0.61] prepare for next development iteration
2017-05-05 11:41:19 +05:30
WSO2 Builder
7d3025a25b
[WSO2 Release] [Jenkins #2280 ] [Release 2.0.61] prepare release v2.0.61
2017-05-05 11:41:03 +05:30
Amal Gunatilake
a4072615af
Merge pull request #733 from rasika/improvement_getuser
...
Fixing typo and getCarbonUser() replaced with context.user
2017-05-05 11:26:01 +05:30
Amal Gunatilake
d898a7dc8e
Merge pull request #732 from rasika/git_issue_731
...
Hide IoT Server version when isCloud is TRUE
2017-05-05 11:25:55 +05:30
ayyoob
cedb6cb798
fixed device stats loading page issue
2017-05-05 03:02:35 +05:30
WSO2 Builder
a546355cf3
[WSO2 Release] [Jenkins #2277 ] [Release 2.0.60] prepare for next development iteration
2017-05-04 15:42:27 +05:30
WSO2 Builder
eb6b1db3fe
[WSO2 Release] [Jenkins #2277 ] [Release 2.0.60] prepare release v2.0.60
2017-05-04 15:42:14 +05:30
Madawa Soysa
c4d0ca7134
Merge pull request #734 from madhawap/master
...
Removed commented lines
2017-05-04 15:36:00 +05:30
madhawap
c4ba14376e
Removed commented lines
2017-05-04 15:32:25 +05:30
Rasika Perera
776bafcd73
Fixing typo and getCarbonUser() replaced with context.user
2017-05-03 23:22:25 +05:30
Rasika Perera
d247b07b4a
#731 : Hide IoT Server version when isCloud is TRUE
2017-05-03 23:04:55 +05:30
WSO2 Builder
4797fc9600
[WSO2 Release] [Jenkins #2274 ] [Release 2.0.59] prepare for next development iteration
2017-05-03 20:29:05 +05:30
WSO2 Builder
896bc24f21
[WSO2 Release] [Jenkins #2274 ] [Release 2.0.59] prepare release v2.0.59
2017-05-03 20:28:51 +05:30
Rasika Perera
5dc9259fc0
Merge pull request #728 from rasika/git_issue_726
...
Resolving cannot log into devicemgt app when tenant is not loaded in API Manager
2017-05-03 20:23:07 +05:30
Rasika Perera
2831bfaf2c
#726 : Resolving cannot log into devicemgt app when tenant is not loaded in API Manager
2017-05-03 19:59:17 +05:30
WSO2 Builder
98991fe89b
[WSO2 Release] [Jenkins #2272 ] [Release 2.0.58] prepare for next development iteration
2017-05-03 15:28:16 +05:30
WSO2 Builder
8b31b93181
[WSO2 Release] [Jenkins #2272 ] [Release 2.0.58] prepare release v2.0.58
2017-05-03 15:28:02 +05:30
Amal Gunatilake
e736659204
Merge pull request #730 from janakamarasena/cert-mgt
...
Store cert by cert serial
2017-05-03 14:09:23 +05:30
Janak Amarasena
44940f3136
Store cert by cert serial
2017-05-03 13:58:06 +05:30
WSO2 Builder
6fddf9c8d0
[WSO2 Release] [Jenkins #2268 ] [Release 2.0.57] prepare for next development iteration
2017-05-03 08:28:19 +05:30
WSO2 Builder
2f4051019c
[WSO2 Release] [Jenkins #2268 ] [Release 2.0.57] prepare release v2.0.57
2017-05-03 08:28:05 +05:30
Ace
b54bf3000f
Adding fix for status 500 in device listing page
2017-05-03 07:13:06 +05:30
WSO2 Builder
80bf3c8fbd
[WSO2 Release] [Jenkins #2266 ] [Release 2.0.56] prepare for next development iteration
2017-05-02 18:01:00 +05:30
WSO2 Builder
2a7173c66d
[WSO2 Release] [Jenkins #2266 ] [Release 2.0.56] prepare release v2.0.56
2017-05-02 18:00:46 +05:30
WSO2 Builder
95a80301e9
[WSO2 Release] [Jenkins #2265 ] [Release 2.0.55] prepare for next development iteration
2017-05-02 17:15:09 +05:30
WSO2 Builder
236db75700
[WSO2 Release] [Jenkins #2265 ] [Release 2.0.55] prepare release v2.0.55
2017-05-02 17:14:54 +05:30
Chatura Dilan
309352df1e
Merge pull request #722 from janakamarasena/mutual-ssl-handler
...
Added mutual SSL authentication handling for android
2017-05-02 17:04:38 +05:30
Geeth
6798dea68a
Merge pull request #725 from warunalakshitha/master
...
Add Scheduler Task for Sending Push Notification
2017-05-02 17:04:03 +05:30
WSO2 Builder
43e76e4678
[WSO2 Release] [Jenkins #2263 ] [Release 2.0.54] prepare for next development iteration
2017-05-02 09:37:33 +05:30
WSO2 Builder
34865f0d25
[WSO2 Release] [Jenkins #2263 ] [Release 2.0.54] prepare release v2.0.54
2017-05-02 09:37:16 +05:30
warunalakshitha
e1e2b14b5f
Rename push status to push notification status and add configurable initial delay for scheduler task
2017-05-01 20:44:30 +05:30
lasantha
43f2f15c5f
#395 : Resolved current device owner incorrectly selecting and processing issue when the same device is enrolled to multiple users
2017-05-01 15:48:25 +05:30
warunalakshitha
3938064210
Add opeerations mapping map for tenants and fixes for code review
2017-04-30 14:29:30 +05:30
warunalakshitha
8df87b23bc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-30 13:56:12 +05:30
warunalakshitha
a5759f9818
Add tenant based operation mappings
2017-04-30 13:56:06 +05:30
Janak Amarasena
2b0800794d
Minor improvements to the code
2017-04-28 16:32:57 +05:30
Janak Amarasena
3ecb6da575
Remove unwanted code
2017-04-28 16:32:57 +05:30
Janak Amarasena
e5bd7566d3
Add Mutual SSL handling to AuthHandler
2017-04-28 16:32:57 +05:30
WSO2 Builder
3a9986d054
[WSO2 Release] [Jenkins #2257 ] [Release 2.0.53] prepare for next development iteration
2017-04-28 10:29:44 +05:30
WSO2 Builder
b53610ff8b
[WSO2 Release] [Jenkins #2257 ] [Release 2.0.53] prepare release v2.0.53
2017-04-28 10:29:35 +05:30
megala21
47ce861b49
Fixing basic authenticator issue
2017-04-28 10:01:54 +05:30
megala21
4560348697
Fixing isses in authentication
2017-04-27 23:21:29 +05:30
megala21
b5e4c22c31
Merge remote-tracking branch 'upstream/master'
2017-04-27 21:55:32 +05:30
megala21
121c289b39
Adding security filters to web.xml
2017-04-27 17:36:10 +05:30
Harshan Liyanage
7744ee2aea
Merge pull request #716 from rasika/analytics-url
...
Enabling Statics URL
2017-04-27 12:44:55 +05:30
Harshan Liyanage
b9691988a9
Merge pull request #710 from rasika/master
...
Fixing Policy view and policy edit doesn't honor isCloud param
2017-04-27 12:44:16 +05:30
warunalakshitha
003c9c5907
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-27 12:23:17 +05:30
warunalakshitha
76f8d963f7
Improve push notifications for request with device list less than batch size
2017-04-27 12:23:01 +05:30
WSO2 Builder
726422dc81
[WSO2 Release] [Jenkins #2250 ] [Release 2.0.52] prepare for next development iteration
2017-04-26 21:31:21 +05:30
WSO2 Builder
4bf6bf73cc
[WSO2 Release] [Jenkins #2250 ] [Release 2.0.52] prepare release v2.0.52
2017-04-26 21:31:08 +05:30
Ayyoob Hamza
3526e6425f
Merge pull request #709 from madawas/master
...
Fixing multitenant issue in certificate verification endpoint
2017-04-26 21:25:24 +05:30
Madawa Soysa
9ba509b512
Removing unnecessary variable.
...
These changes are suggested by a review.
2017-04-26 15:28:24 +05:30
WSO2 Builder
4429482a29
[WSO2 Release] [Jenkins #2248 ] [Release 2.0.51] prepare for next development iteration
2017-04-26 15:26:48 +05:30
WSO2 Builder
1bbd982e1f
[WSO2 Release] [Jenkins #2248 ] [Release 2.0.51] prepare release v2.0.51
2017-04-26 15:26:35 +05:30
Madawa Soysa
a7e61318b8
Fixing multitenant issue in certificate verification endpoint
2017-04-26 15:25:44 +05:30
