Commit Graph

4856 Commits

Author SHA1 Message Date
Rasika Perera
822adb7fca Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-10 12:52:41 +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
Rasika Perera
ef41e141b5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-09 08:00:23 +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
sumedharubasinghe
27f0707715 Merge pull request #837 from rasika/geo-fencing
Fixing geo map not loaded
2017-07-09 07:57:32 +05:30
Rasika Perera
40bc903ef2 Merge branch 'operation-bar' 2017-07-08 21:18:33 +05:30
Rasika Perera
250ec40953 Merge branch 'geo-fencing' 2017-07-08 21:18:17 +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
Rasika Perera
0a365eb849 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-08 08:37:33 +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
a84062417d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-07 18:40:48 +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
Rasika Perera
a8e9bd81c1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-07 18:37:24 +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
Madhawa Perera
2bd79e2dc3 Merge pull request #835 from geethkokila/master
Fixing the null pointer
2017-07-07 18:08:39 +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
Geeth
c4727d3859 Merge pull request #833 from DimalChandrasiri/master
Fixes wso2/product-iots#1118
2017-07-07 13:58:15 +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
Rasika Perera
8df83cf3e5 Merge pull request #831 from lasanthaDLPDS/master
Fixing operation label centering issue
2017-07-06 23:49:18 +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
Geeth
239a27f5b0 Merge pull request #830 from DimalChandrasiri/master
Fixes Both #1113 and #1083 issues
2017-07-06 14:22:32 +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
Madhawa Perera
262f761965 Merge pull request #828 from geethkokila/master
Fixing the #460 issue
2017-07-06 12:00:16 +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