Commit Graph

4846 Commits

Author SHA1 Message Date
Madhawa Perera
766300d24c Merge pull request #847 from DimalChandrasiri/master
fixes wso2/product-iots#1152
2017-07-14 12:31:14 +05:30
Imesh Chandrasiri
f26f9bf647 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-14 12:25:26 +05:30
Imesh Chandrasiri
46b22e438d fixes wso2/product-iots#1152 2017-07-14 12:25:17 +05:30
Madhawa Perera
e73eef9490 Merge pull request #846 from DimalChandrasiri/master
fixes wso2/product-iots#1141
2017-07-14 11:40:21 +05:30
Rasika Perera
5efe28207c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-14 11:22:06 +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
Madhawa Perera
c3cce3de09 Merge pull request #844 from DimalChandrasiri/master
Fixes #1164
2017-07-13 15:20:03 +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
Madhawa Perera
94d7401748 Merge pull request #843 from DimalChandrasiri/master
Fixes #1168, #1170, #1166
2017-07-13 12:00:12 +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
Rasika Perera
3d3b7af168 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-12 19:03:08 +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
Kamidu Sachith Punchihewa
474c656249 Merge pull request #841 from Jasintha/weekTrustManager
Fixing File stream closing issue and few formatting errors
2017-07-11 13:46:44 +05:30
Jasintha
4bae413f72 Fixing Filstream closing issue and few formatting errors 2017-07-11 13:01:09 +05:30
Kamidu Sachith Punchihewa
99b74e12bd Merge pull request #840 from Jasintha/weekTrustManager
Fixing weekTrustManger Imple issue
2017-07-11 10:51:29 +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
Madhawa Perera
55e3cf56c2 Merge pull request #839 from Kamidu/master
UI enhancement : policy creation
2017-07-10 17:31:30 +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
Rasika Perera
6f3cb265fe Merge pull request #838 from DimalChandrasiri/master
Fixes Datatable issue with bootstrap tabs
2017-07-10 14:28:29 +05:30
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