Commit Graph

3432 Commits

Author SHA1 Message Date
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
ayyoob
a3910908f8 fixed an issue in the logging 2017-04-26 14:48:20 +05:30
ayyoob
018d875a84 removed temporary logs
(cherry picked from commit 615e44e)
2017-04-26 14:26:23 +05:30
kamidu
845a8cb8f7 enable statics url 2017-04-26 12:34:21 +05:30
WSO2 Builder
52b0165275 [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare for next development iteration 2017-04-26 11:16:14 +05:30
WSO2 Builder
ada2669ecf [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare release v2.0.50 2017-04-26 11:15:58 +05:30
ayyoob
9967d6e7da few fixes after testing mqtt authorisation flow
(cherry picked from commit 4aba08b)
2017-04-26 10:20:03 +05:30
ayyoob
1e2ca17275 fixed few issues after testing
(cherry picked from commit 5b6d8d3)
2017-04-26 10:19:55 +05:30
warunalakshitha
97a53a7387 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-25 19:08:36 +05:30
warunalakshitha
9fa4eedca5 Add Scheduled for push notification sending 2017-04-25 19:07:37 +05:30
warunalakshitha
65667119f9 Add push notification configurations for push notification stratagies 2017-04-25 19:01:48 +05:30
warunalakshitha
3c1e4ba205 Add new classes for improve Performance of push notifications 2017-04-25 18:55:31 +05:30
Rasika Perera
636f0cbe98 #706 : Policy view and policy edit doesn't honor isCloud enabled parameter 2017-04-25 14:46:22 +05:30
WSO2 Builder
543e603298 [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare for next development iteration 2017-04-25 10:14:34 +05:30
WSO2 Builder
5010a3eebf [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare release v2.0.49 2017-04-25 10:14:21 +05:30
WSO2 Builder
eb8ba53092 [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare for next development iteration 2017-04-25 08:58:47 +05:30
WSO2 Builder
4764bff47e [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare release v2.0.48 2017-04-25 08:58:32 +05:30
Rasika Perera
a107a0392e Fixing #703 : missing ContentType header on datatable invoker api 2017-04-25 08:27:41 +05:30
Rasika Perera
7660bf8569 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-25 08:26:51 +05:30
WSO2 Builder
c1b5a649f6 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare for next development iteration 2017-04-21 16:06:53 +05:30
WSO2 Builder
6ccccb67b4 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare release v2.0.47 2017-04-21 16:06:39 +05:30
Harshan Liyanage
0dc15324ad Merge pull request #701 from amalhub/master
Merging Cloud updates to master
2017-04-21 15:59:00 +05:30
Jasintha
e6b38fbdb4 Implemeting dynamic recivers and streams deployment into DAS 2017-04-21 15:51:24 +05:30
Harshan Liyanage
273be79ca2 Resolving #695:Fix for Policy Delegation task is not starting for tenants in distributed setup 2017-04-21 15:49:40 +05:30
Madawa Soysa
0eeef0a568 Refactoring to use APIManager DCR
This commit is done to refactor the Auth application creation process to use the APIManager Key manager client registration endpoint instead of IOT DCR endpoint.
2017-04-21 15:46:18 +05:30
kamidu
a9888b5cf7 adding device cloud header 2017-04-21 15:43:39 +05:30
WSO2 Builder
1ecb4edbd7 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare for next development iteration 2017-04-21 15:31:09 +05:30
WSO2 Builder
48a8f43cb3 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare release v2.0.46 2017-04-21 15:30:57 +05:30
megala21
32ea2e52c4 Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370 2017-04-21 15:18:20 +05:30
WSO2 Builder
16d97d62be [WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare for next development iteration 2017-04-20 14:41:55 +05:30
WSO2 Builder
8891784b99 [WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare release v2.0.45 2017-04-20 14:41:41 +05:30
sinthuja
97ff0750ee Merge pull request #694 from amalhub/master
Fixing security issue: Password Autocomplete in Firefox Browser
2017-04-20 14:35:48 +05:30
Amal Gunatilake
56cb6a3a1e Fixing security issue: Password Autocomplete in Firefox Browser
https://github.com/wso2/product-iots/issues/372
2017-04-20 14:31:20 +05:30
WSO2 Builder
f7d1a7cf99 [WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare for next development iteration 2017-04-18 10:40:31 +05:30
WSO2 Builder
4b85af950c [WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare release v2.0.44 2017-04-18 10:40:22 +05:30
ayyoob
0444f63a07 renamed method name 2017-04-18 10:13:58 +05:30
ayyoob
d121e557b8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-17 17:44:48 +05:30
ayyoob
8a842e8f8e restricted basic auth support 2017-04-17 17:37:46 +05:30
WSO2 Builder
b9e614e383 [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration 2017-04-17 16:39:50 +05:30
WSO2 Builder
d37951ef3f [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare release v2.0.43 2017-04-17 16:39:37 +05:30
megala21
2360b338d8 Fixing the role creation problem 2017-04-17 13:14:14 +05:30
Rasika Perera
1a4f195a74 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-10 09:16:57 +05:30
WSO2 Builder
fc15f43b31 [WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare for next development iteration 2017-04-07 14:07:15 +05:30
WSO2 Builder
27b84bfc22 [WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare release v2.0.42 2017-04-07 14:07:01 +05:30
kamidu
8bc7362bc0 disableing advanced search 2017-04-07 13:47:22 +05:30
kamidu
a5a222ead6 fixing device status 2017-04-07 13:47:12 +05:30
Harshan Liyanage
46f418bafb Api publishing timeout fixes for cloud. 2017-04-07 13:46:52 +05:30
kamidu
06366bff24 css changes for loading icon 2017-04-07 13:46:09 +05:30
kamidu
2c20070720 fixing icon issue in operation bar 2017-04-07 13:45:12 +05:30
kamidu
16b67bebda hiding the advanced search 2017-04-07 13:44:57 +05:30
kamidu
9826a97d60 removing cope policies from cloud 2017-04-07 13:44:41 +05:30
Ace
903ab9abe3 Adding logic to acknowledge 404 response when tiers not available 2017-04-07 13:44:23 +05:30
kamidu
4cb816cb7f policy filtering or cloud 2017-04-07 13:44:05 +05:30
Harshan Liyanage
6ad4a2634b Fixed policy monitoring issue. 2017-04-07 13:43:49 +05:30
kamidu
57787a29c4 adding the new toplink json 2017-04-07 13:43:19 +05:30
WSO2 Builder
5496159f9d [WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare for next development iteration 2017-04-05 11:58:36 +05:30
WSO2 Builder
ef94e90366 [WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare release v2.0.41 2017-04-05 11:58:23 +05:30
megala21
2b92676191 Fixes https://github.com/wso2/product-iots/issues/346 2017-04-05 11:02:58 +05:30
WSO2 Builder
a826370019 [WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare for next development iteration 2017-04-05 09:37:06 +05:30
WSO2 Builder
4654a4db45 [WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare release v2.0.40 2017-04-05 09:36:53 +05:30
Amal Gunatilake
980a90900d Merge pull request #679 from Megala21/fix_group_share_ui
Fixes https://github.com/wso2/product-iots/issues/335
2017-04-05 09:21:45 +05:30
WSO2 Builder
8b7e458592 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration 2017-04-04 18:08:44 +05:30
WSO2 Builder
6297993560 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39 2017-04-04 18:08:31 +05:30
lakshani
0f1b17a25e Fixed the issue in application restriction for iOS 2017-04-04 18:00:24 +05:30
megala21
5cd58d7454 Fixes https://github.com/wso2/product-iots/issues/335 2017-04-04 14:18:24 +05:30
warunalakshitha
7517c58799 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-03-31 17:57:32 +05:30
WSO2 Builder
802c83de39 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration 2017-03-29 23:16:15 +05:30
WSO2 Builder
98dda03784 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38 2017-03-29 23:16:04 +05:30
sinthuja
18583af6b4 Fixing the case where multiple tags were passed for searching the APIs. 2017-03-29 23:07:18 +05:30
WSO2 Builder
f3e119cd78 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration 2017-03-28 12:48:31 +05:30
WSO2 Builder
a8f8a49a80 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37 2017-03-28 12:48:20 +05:30
Harshan Liyanage
9e4d84dfb2 Fix for Advanced Search Issue #670 2017-03-28 12:37:28 +05:30
warunalakshitha
5831d277da Fixing https://github.com/wso2/carbon-device-mgt-plugins/issues/613 2017-03-27 11:48:30 +05:30
Rasika Perera
6a623f5657 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-03-27 10:03:15 +05:30
lakshani
5c7cfda487 Fixed jira IOTS-438 2017-03-24 15:42:54 +05:30
WSO2 Builder
0e5895ec78 [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration 2017-03-24 12:06:23 +05:30
WSO2 Builder
d6080159cb [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36 2017-03-24 12:06:12 +05:30
Amal Gunatilake
e9c2f3e72d Merge branch 'master' into cloud-3.1.0 2017-03-24 11:55:35 +05:30
WSO2 Builder
3f8f8b3ab9 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration 2017-03-23 18:59:18 +05:30
WSO2 Builder
6a9a5ba9c8 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35 2017-03-23 18:59:07 +05:30
amalhub
c65f9c6dcb Fixing issue: https://github.com/wso2/product-iots/issues/314 2017-03-23 15:51:46 +05:30
kamidu
3b9ae200e7 fixing posible null pointer excep 2017-03-23 14:12:12 +05:30
kamidu
a85b5688a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-23 12:23:39 +05:30
kamidu
0b94a284ad new role filtering related fixes 2017-03-23 12:23:21 +05:30
kamidu
8c17418198 fixing the null pointer exception 2017-03-23 12:23:02 +05:30
kamidu
530e603fb5 enable role filtering and role count in device cloud 2017-03-23 12:22:27 +05:30
kamidu
cda0dd417f fixing the role filtering api issues 2017-03-23 12:21:41 +05:30
Harshan Liyanage
d468ac07d0 Revert "Allowing configuration management in cloud environment" 2017-03-23 11:12:15 +05:30
Madawa Soysa
da69bc9fe5 Allowing configuration management in cloud environment 2017-03-23 11:06:52 +05:30
charitha
6656f9e6f0 Add support for hybrid device types which has emulation/virtual capabilities
(cherry picked from commit 78b7037)
2017-03-23 01:07:28 +05:30
kamidu
e205fd97cd fix the user view related issues and device location out dated issue 2017-03-22 20:14:50 +05:30
kamidu
1f572998f8 enable role filtering in device cloud 2017-03-22 20:13:59 +05:30
kamidu
73ab0a38bf adding get location api witch was missing from previous emm versions 2017-03-22 20:13:08 +05:30
kamidu
a6f5c002a9 adding get location api witch was missing from previous emm versions 2017-03-22 20:12:50 +05:30
kamidu
a77794f81a adding role filtering for device cloud via api 2017-03-22 20:12:30 +05:30
kamidu
fc6c8e0290 adding get location api witch was missing from previous emm versions 2017-03-22 20:11:41 +05:30