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
Susinda Perera
643be65cf9
Merge pull request #662 from amalhub/master
...
Once the password is changed - Curent user should be immediately logout
2017-03-22 15:54:33 +05:30
amalhub
4c6781d6b6
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout
2017-03-22 15:37:16 +05:30
WSO2 Builder
e8ee33e7a4
[WSO2 Release] [Jenkins #2177 ] [Release 2.0.34] prepare for next development iteration
2017-03-22 15:24:27 +05:30
WSO2 Builder
6cc898d2ab
[WSO2 Release] [Jenkins #2177 ] [Release 2.0.34] prepare release v2.0.34
2017-03-22 15:24:16 +05:30
Geeth
c0a474f6fc
Merge pull request #661 from charithag/master
...
Fixes and improvments
2017-03-22 15:18:50 +05:30
charitha
78b7037aa9
Add support for hybrid device types which has emulation/virtual capabilities
2017-03-22 15:04:21 +05:30
WSO2 Builder
a26a4bb539
[WSO2 Release] [Jenkins #2175 ] [Release 2.0.33] prepare for next development iteration
2017-03-22 14:25:54 +05:30
WSO2 Builder
000601911f
[WSO2 Release] [Jenkins #2175 ] [Release 2.0.33] prepare release v2.0.33
2017-03-22 14:25:43 +05:30
amalhub
af4ab19132
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/647
2017-03-22 12:16:12 +05:30
WSO2 Builder
50c9eb9ba4
[WSO2 Release] [Jenkins #2172 ] [Release 2.0.32] prepare for next development iteration
2017-03-21 20:02:26 +05:30
WSO2 Builder
ca79804c5c
[WSO2 Release] [Jenkins #2172 ] [Release 2.0.32] prepare release v2.0.32
2017-03-21 20:02:14 +05:30
sinthuja
54888b6727
Adding back the webscoket credential method invocation, as it's needed by the pugins.
2017-03-21 19:44:02 +05:30
charitha
5ff3ba3fcc
Fix issue in showing dynamic icons
2017-03-21 11:14:27 +05:30
kamidu
bf1548c062
title app name changed
2017-03-21 10:52:12 +05:30
WSO2 Builder
a35205c480
[WSO2 Release] [Jenkins #2169 ] [Release 2.0.31] prepare for next development iteration
2017-03-20 16:49:31 +05:30
WSO2 Builder
ac379c9bf9
[WSO2 Release] [Jenkins #2169 ] [Release 2.0.31] prepare release v2.0.31
2017-03-20 16:49:20 +05:30
Harshan Liyanage
df6d8d4496
Merge pull request #656 from Kamidu/cloud-3.1.0
...
Fixing Git Issue : https://github.com/wso2/carbon-device-mgt/issues/643
2017-03-20 16:43:33 +05:30
kamidu
fef7a58ad4
title app name changed
2017-03-20 14:29:27 +05:30
Susinda
5d10575de8
Merge remote-tracking branch 'upstream/master'
2017-03-16 18:04:52 +05:30
Susinda
dc0606f207
Fixing typo in above commit
2017-03-16 17:24:19 +05:30
Susinda
96d45d006d
Fixing #645 , when password is changed redirect to logout
2017-03-16 17:21:48 +05:30
WSO2 Builder
de25f3afe3
[WSO2 Release] [Jenkins #2163 ] [Release 2.0.30] prepare for next development iteration
2017-03-16 16:59:42 +05:30
WSO2 Builder
55ecafe7f4
[WSO2 Release] [Jenkins #2163 ] [Release 2.0.30] prepare release v2.0.30
2017-03-16 16:59:28 +05:30
Amal Gunatilake
f93bac489f
Merge pull request #654 from susinda/master
...
Fixing #644
2017-03-16 15:37:56 +05:30
Susinda
226db9a230
Fixing #644
2017-03-16 15:28:45 +05:30
Amal Gunatilake
5ef2d9d121
Merge pull request #653 from susinda/master
...
Typo Fxed
2017-03-16 15:06:52 +05:30
Susinda
b3295ca2ef
Typo Fxed
2017-03-16 15:03:48 +05:30
WSO2 Builder
15d57f71ad
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare for next development iteration
2017-03-16 11:10:29 +05:30
WSO2 Builder
3af9e1729a
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare release v2.0.29
2017-03-16 11:10:11 +05:30
Amal Gunatilake
dbf657fae8
Merge pull request #640 from susinda/master
...
Fixing: https://github.com/wso2/carbon-device-mgt/issues/639
2017-03-16 10:48:26 +05:30
WSO2 Builder
322f39596e
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare for next development iteration
2017-03-15 18:46:16 +05:30
WSO2 Builder
18244d6c96
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare release v2.0.28
2017-03-15 18:46:03 +05:30
WSO2 Builder
12f21868dc
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare for next development iteration
2017-03-15 18:04:26 +05:30
WSO2 Builder
4328c3c39d
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare release v2.0.27
2017-03-15 18:04:12 +05:30
Kamidu Sachith Punchihewa
14d517e89d
Merge pull request #641 from wso2/cloud-3.1.0
...
Cloud related fixes
2017-03-15 17:47:26 +05:30
kamidu
42f2691962
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-03-15 17:46:08 +05:30
kamidu
e30a5910f1
change the device cloud documentation link
2017-03-15 17:45:09 +05:30
kamidu
f3a61cb8f3
enhasing toplink
2017-03-15 17:43:20 +05:30
Susinda
cd4902f8ab
phoneNumber -> PhoneNumber
2017-03-15 16:04:06 +05:30
WSO2 Builder
c6bb8e0128
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare for next development iteration
2017-03-14 17:47:54 +05:30
WSO2 Builder
da9002ba9f
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare release v2.0.26
2017-03-14 17:47:43 +05:30
Susinda
a539775583
Fixing carbon-device-mgt/issues/639
2017-03-14 17:41:35 +05:30
amalhub
541f5440ab
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-03-14 17:09:57 +05:30
amalhub
2c0ac79dce
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/637
2017-03-14 17:07:16 +05:30
Hasunie
1ee313ea77
Merge pull request #636 from harshanL/cloud-3.1.0
...
Fixed Device renaming issue.
2017-03-14 16:49:21 +05:30
WSO2 Builder
6114f4b2d5
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare for next development iteration
2017-03-14 15:27:06 +05:30
WSO2 Builder
ea8f19f26d
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare release v2.0.25
2017-03-14 15:26:55 +05:30
Harshan Liyanage
1cbdb84cf1
Fixed merge conflicts with PR-623
2017-03-14 14:59:03 +05:30
Harshan Liyanage
e686b2af0e
Resolved merge conflicts
2017-03-14 14:54:48 +05:30
kamidu
6fe7470af5
re enabling device renaming
2017-03-14 14:29:36 +05:30
Harshan Liyanage
755786db8b
Merge branch 'master' of https://github.com/sameeragunarathne/carbon-device-mgt into sameeragunarathne-master
2017-03-14 14:26:40 +05:30
Harshan Liyanage
06ccbe28cc
Fixed Device renaming issue.
2017-03-14 14:13:21 +05:30
WSO2 Builder
d433525145
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare for next development iteration
2017-03-14 14:09:19 +05:30
WSO2 Builder
35ee3eca3a
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare release v2.0.24
2017-03-14 14:09:08 +05:30
kamidu
3ff2c9894f
role filtering for device cloud is enabled
2017-03-14 14:06:22 +05:30
Harshan Liyanage
75486b3bb8
Fixed Device renaming issue.
2017-03-14 13:42:32 +05:30
sameera910409
33132b1f8e
refactor code for firebase cloud messaging
2017-03-14 10:26:23 +05:30
WSO2 Builder
4e0afb7d39
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare for next development iteration
2017-03-13 18:09:06 +05:30
WSO2 Builder
33f1448c82
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare release v2.0.23
2017-03-13 18:08:55 +05:30
Harshan Liyanage
3ab025a6d8
Merge pull request #631 from ayyoob/cloud-3.1.0
...
added claimable property and fixed unsecured endpoint bug
2017-03-13 18:03:18 +05:30
ayyoob
b1b0b03ce1
changed license year
2017-03-13 18:01:41 +05:30
Kamidu Punchihewa
e063fd0da9
code cleanup results
2017-03-13 17:11:07 +05:30
Kamidu Punchihewa
e6333438b9
ading role filtering and ui fixes
2017-03-13 17:01:54 +05:30
WSO2 Builder
e95e96f06c
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare for next development iteration
2017-03-10 13:09:08 +05:30
WSO2 Builder
5d55413e02
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare release v2.0.22
2017-03-10 13:08:55 +05:30
Susinda
40469d0e4d
Adding maven.javadoc.skip to org.wso2.carbon.apimgt.integration.generated.client project
2017-03-10 12:57:47 +05:30
Susinda
e23aaa6647
Adding Hasunie's fix on initialOperations implementation
2017-03-10 11:54:43 +05:30
Susinda
7083c4ec9b
version corrected to 2.0.22-SNAPSHOT
2017-03-09 14:49:49 +05:30
Susinda Perera
bd7d6939e5
Merge pull request #628 from susinda/master
...
Merging from cloud-3.1.0
2017-03-09 13:58:59 +05:30
Susinda
e83fa8cb02
org.wso2.carbon.apimgt.integration.generated.client version increment
2017-03-09 13:50:15 +05:30
WSO2 Builder
ae3300afde
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare for next development iteration
2017-03-09 13:14:50 +05:30
WSO2 Builder
6646c0c56f
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare release v2.0.21
2017-03-09 13:14:38 +05:30
Susinda Perera
7c9659ed29
Merge pull request #1 from susinda/cloud-3.1.0
...
Cloud 3.1.0
2017-03-09 12:44:36 +05:30
WSO2 Builder
21cdcdd21a
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare for next development iteration
2017-03-09 12:38:02 +05:30
WSO2 Builder
23be60ebd0
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare release v2.0.20
2017-03-09 12:37:49 +05:30
kamidu
0fade6aa9f
remove the cloud related config from config.jason
2017-03-08 15:54:08 +05:30
kamidu
dd26f366df
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-03-08 12:50:07 +05:30
kamidu
f9a03133fa
device cloude related ui improvements
2017-03-08 12:49:52 +05:30
ayyoob
2384755a97
added claimable property and fixed unsecured endpoint bug
2017-03-08 03:14:51 +05:30
ayyoob
964fb7ce72
regenerated swagger api based on apimgt 2.1.0 rest api
2017-03-07 01:56:51 +05:30
ayyoob
525b55d603
avoid race condition by loading tiers
2017-03-06 11:30:22 +05:30
ayyoob
5e4b0564b7
added permission fix for operation and synchronised application creation to avoid duplicate subscription
2017-03-03 17:02:36 +05:30
ayyoob
6a0c0cb299
added default permissions
2017-03-02 20:27:32 +05:30
Megala
a2d0c59e17
Revert 2988357eb9
2017-03-02 15:18:34 +05:30
Megala
4fdeec89cc
Revert f3f7635d3b
2017-03-02 15:11:59 +05:30
ayyoob
d66e439f49
added carbon local ip as config
2017-03-02 14:05:57 +05:30
Susinda
09b74211c4
increment carbon-devicemgt version to 2.0.20
2017-03-02 12:39:19 +05:30
ayyoob
5d3aa49e06
added logger trace support for apim integration service
2017-03-02 00:31:34 +05:30
ayyoob
c088a9bc93
fixed api subscribe issue for device specific app creation
2017-03-01 23:26:17 +05:30
WSO2 Builder
7f98d37835
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare for next development iteration
2017-02-28 21:22:53 +05:30
WSO2 Builder
b03936ca49
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare release v2.0.19
2017-02-28 21:19:50 +05:30
charitha
abdffdbf39
Add tenant id to Enrollment Certificate
2017-02-28 21:18:46 +05:30
charitha
14dfc1b538
Fix minor issues found with jmeter tests
2017-02-28 21:18:22 +05:30
madhawap
f1b761d987
Minor code formating
2017-02-28 21:16:56 +05:30
Kamidu Sachith Punchihewa
8e530b0523
adding the removed tenant based token handlers
2017-02-28 21:16:21 +05:30
WSO2 Builder
82888e1d20
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare for next development iteration
2017-02-28 21:15:10 +05:30
WSO2 Builder
b11c2e451b
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare release v2.0.18
2017-02-28 21:14:44 +05:30
WSO2 Builder
67a091ff5a
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare for next development iteration
2017-02-28 21:12:47 +05:30
WSO2 Builder
dcc2088455
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare release v2.0.17
2017-02-28 21:12:14 +05:30
lakshani
eb12e5b9f1
Adding commit 'added java doc comments'
2017-02-28 21:11:15 +05:30
lakshani
9e5574dccc
Adding commit 'added change device status to device view page'
2017-02-28 21:09:05 +05:30
lakshani
3f90b403c0
Adding lakshani's commit 'updated device status button'
2017-02-28 21:03:53 +05:30
WSO2 Builder
927b2d451d
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare for next development iteration
2017-02-28 21:00:32 +05:30
WSO2 Builder
dfe9b1ff9c
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare release v2.0.16
2017-02-28 21:00:08 +05:30
charitha
7374a0825d
Fix https://wso2.org/jira/browse/IOTS-436
2017-02-28 20:56:32 +05:30
charitha
d2991585aa
Applying charithas commit on IOTS-436
2017-02-28 20:56:25 +05:30
ayyoob
470500b80e
added ssl context
2017-02-27 16:44:21 +05:30
geethkokila
e90dc8b6c1
Fixing the compile error
2017-02-24 12:32:00 +05:30
geethkokila
d8303356cd
Fixing the conflicts
2017-02-24 12:16:14 +05:30
kamidu
b7e3b28722
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-20 18:20:14 +05:30
kamidu
4e16e29b1c
removing group sharing
2017-02-20 18:20:04 +05:30
Imesh Chandrasiri
3c90f8ad49
temporary removal of view analytics
2017-02-20 17:19:20 +05:30
Imesh Chandrasiri
8cf92e8a5b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-20 15:11:08 +05:30
Imesh Chandrasiri
a938d57a65
Removing analytics link from groups listing
2017-02-20 15:11:00 +05:30
Kamidu Sachith Punchihewa
587c798f09
Merge pull request #613 from Kamidu/cloud-3.1.0
...
remove tennent related token handlers
2017-02-19 21:49:58 +05:30
Kamidu Sachith Punchihewa
4a5c99af78
remove tennent related token handlers
2017-02-19 21:49:19 +05:30
Imesh Chandrasiri
5097416d69
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-19 19:34:35 +05:30
Imesh Chandrasiri
368647f176
Temporary advance search removal commit
2017-02-19 19:34:28 +05:30
Kamidu Sachith Punchihewa
112efda8d5
Merge pull request #611 from Kamidu/cloud-3.1.0
...
removing device edit option
2017-02-19 18:45:07 +05:30
Kamidu Sachith Punchihewa
0da8847787
removing device edit option
2017-02-19 18:44:39 +05:30
Imesh Chandrasiri
f5e5dce872
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-19 18:25:07 +05:30
Imesh Chandrasiri
ee209064e3
Tooltip css fix
2017-02-19 18:24:59 +05:30
Kamidu Sachith Punchihewa
367dc1a30b
resolving return type issue in group mgt
2017-02-19 17:48:11 +05:30
Kamidu Sachith Punchihewa
527b844ee3
Error handled on the user session invalidation
2017-02-19 16:03:49 +05:30
Kamidu Sachith Punchihewa
318fbf9215
role loading issues
2017-02-19 15:54:53 +05:30
Kamidu Sachith Punchihewa
282801c814
updating cloud dashboard
2017-02-19 15:32:28 +05:30
kamidu
7480ccaa15
fixing datatable issues
2017-02-17 17:56:29 +05:30
kamidu
3e061f6e8b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-17 16:29:22 +05:30
kamidu
6a67f251ac
cloud related ui fixs
2017-02-17 16:29:11 +05:30
Hasunie
8bb75d291c
Avoiding package exporting org.wso2.carbon.device.mgt.core.internal
2017-02-16 18:30:40 +05:30
Hasunie
2a9027a15e
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-16 18:19:35 +05:30
Hasunie
6b1ab86276
fixing policyManagementDataHolder issue
2017-02-16 18:19:05 +05:30
Imesh Chandrasiri
3786ef2636
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-16 16:49:54 +05:30
Imesh Chandrasiri
0cddd896d4
Tooltip fix
2017-02-16 16:49:44 +05:30
kamidu
4725eb3c3b
chenge the group creating steps
2017-02-16 11:59:47 +05:30