ayyoob
a3910908f8
fixed an issue in the logging
8 years ago
ayyoob
018d875a84
removed temporary logs
...
(cherry picked from commit 615e44e)
8 years ago
kamidu
845a8cb8f7
enable statics url
8 years ago
WSO2 Builder
52b0165275
[WSO2 Release] [Jenkins #2245 ] [Release 2.0.50] prepare for next development iteration
8 years ago
WSO2 Builder
ada2669ecf
[WSO2 Release] [Jenkins #2245 ] [Release 2.0.50] prepare release v2.0.50
8 years ago
ayyoob
9967d6e7da
few fixes after testing mqtt authorisation flow
...
(cherry picked from commit 4aba08b)
8 years ago
ayyoob
1e2ca17275
fixed few issues after testing
...
(cherry picked from commit 5b6d8d3)
8 years ago
warunalakshitha
97a53a7387
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
warunalakshitha
9fa4eedca5
Add Scheduled for push notification sending
8 years ago
warunalakshitha
65667119f9
Add push notification configurations for push notification stratagies
8 years ago
warunalakshitha
3c1e4ba205
Add new classes for improve Performance of push notifications
8 years ago
Rasika Perera
636f0cbe98
#706 : Policy view and policy edit doesn't honor isCloud enabled parameter
8 years ago
WSO2 Builder
543e603298
[WSO2 Release] [Jenkins #2242 ] [Release 2.0.49] prepare for next development iteration
8 years ago
WSO2 Builder
5010a3eebf
[WSO2 Release] [Jenkins #2242 ] [Release 2.0.49] prepare release v2.0.49
8 years ago
WSO2 Builder
eb8ba53092
[WSO2 Release] [Jenkins #2240 ] [Release 2.0.48] prepare for next development iteration
8 years ago
WSO2 Builder
4764bff47e
[WSO2 Release] [Jenkins #2240 ] [Release 2.0.48] prepare release v2.0.48
8 years ago
Rasika Perera
a107a0392e
Fixing #703 : missing ContentType header on datatable invoker api
8 years ago
Rasika Perera
7660bf8569
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
ayyoob
3df2912a6a
added default UI for realtime,batch, device view and type view
8 years ago
ayyoob
2a89a2fb23
resolved issues in event management service
8 years ago
ayyoob
f834001d22
merged with origin
8 years ago
ayyoob
4ce8352690
added device event api
8 years ago
WSO2 Builder
c1b5a649f6
[WSO2 Release] [Jenkins #2234 ] [Release 2.0.47] prepare for next development iteration
8 years ago
WSO2 Builder
6ccccb67b4
[WSO2 Release] [Jenkins #2234 ] [Release 2.0.47] prepare release v2.0.47
8 years ago
Harshan Liyanage
0dc15324ad
Merge pull request #701 from amalhub/master
...
Merging Cloud updates to master
8 years ago
Jasintha
e6b38fbdb4
Implemeting dynamic recivers and streams deployment into DAS
8 years ago
Harshan Liyanage
273be79ca2
Resolving #695:Fix for Policy Delegation task is not starting for tenants in distributed setup
8 years ago
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.
8 years ago
kamidu
a9888b5cf7
adding device cloud header
8 years ago
WSO2 Builder
1ecb4edbd7
[WSO2 Release] [Jenkins #2232 ] [Release 2.0.46] prepare for next development iteration
8 years ago
WSO2 Builder
48a8f43cb3
[WSO2 Release] [Jenkins #2232 ] [Release 2.0.46] prepare release v2.0.46
8 years ago
megala21
32ea2e52c4
Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370
8 years ago
ayyoob
586bcae2b8
added default UI - initial commit
8 years ago
WSO2 Builder
16d97d62be
[WSO2 Release] [Jenkins #2229 ] [Release 2.0.45] prepare for next development iteration
8 years ago
WSO2 Builder
8891784b99
[WSO2 Release] [Jenkins #2229 ] [Release 2.0.45] prepare release v2.0.45
8 years ago
sinthuja
97ff0750ee
Merge pull request #694 from amalhub/master
...
Fixing security issue: Password Autocomplete in Firefox Browser
8 years ago
Amal Gunatilake
56cb6a3a1e
Fixing security issue: Password Autocomplete in Firefox Browser
...
https://github.com/wso2/product-iots/issues/372
8 years ago
ayyoob
ea6afee772
added device properties to a single table
8 years ago
ayyoob
0e9bb7caf6
corrected operation definition
8 years ago
ayyoob
c28f820455
added missing apis - operation and device management
8 years ago
WSO2 Builder
f7d1a7cf99
[WSO2 Release] [Jenkins #2225 ] [Release 2.0.44] prepare for next development iteration
8 years ago
WSO2 Builder
4b85af950c
[WSO2 Release] [Jenkins #2225 ] [Release 2.0.44] prepare release v2.0.44
8 years ago
ayyoob
0444f63a07
renamed method name
8 years ago
ayyoob
d121e557b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
ayyoob
8a842e8f8e
restricted basic auth support
8 years ago
WSO2 Builder
b9e614e383
[WSO2 Release] [Jenkins #2222 ] [Release 2.0.43] prepare for next development iteration
8 years ago
WSO2 Builder
d37951ef3f
[WSO2 Release] [Jenkins #2222 ] [Release 2.0.43] prepare release v2.0.43
8 years ago
megala21
2360b338d8
Fixing the role creation problem
8 years ago
Rasika Perera
1a4f195a74
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
WSO2 Builder
fc15f43b31
[WSO2 Release] [Jenkins #2210 ] [Release 2.0.42] prepare for next development iteration
8 years ago
WSO2 Builder
27b84bfc22
[WSO2 Release] [Jenkins #2210 ] [Release 2.0.42] prepare release v2.0.42
8 years ago
kamidu
8bc7362bc0
disableing advanced search
8 years ago
kamidu
a5a222ead6
fixing device status
8 years ago
Harshan Liyanage
46f418bafb
Api publishing timeout fixes for cloud.
8 years ago
kamidu
06366bff24
css changes for loading icon
8 years ago
kamidu
2c20070720
fixing icon issue in operation bar
8 years ago
kamidu
16b67bebda
hiding the advanced search
8 years ago
kamidu
9826a97d60
removing cope policies from cloud
8 years ago
Ace
903ab9abe3
Adding logic to acknowledge 404 response when tiers not available
8 years ago
kamidu
4cb816cb7f
policy filtering or cloud
8 years ago
Harshan Liyanage
6ad4a2634b
Fixed policy monitoring issue.
8 years ago
kamidu
57787a29c4
adding the new toplink json
8 years ago
WSO2 Builder
5496159f9d
[WSO2 Release] [Jenkins #2206 ] [Release 2.0.41] prepare for next development iteration
8 years ago
WSO2 Builder
ef94e90366
[WSO2 Release] [Jenkins #2206 ] [Release 2.0.41] prepare release v2.0.41
8 years ago
megala21
2b92676191
Fixes https://github.com/wso2/product-iots/issues/346
8 years ago
WSO2 Builder
a826370019
[WSO2 Release] [Jenkins #2204 ] [Release 2.0.40] prepare for next development iteration
8 years ago
WSO2 Builder
4654a4db45
[WSO2 Release] [Jenkins #2204 ] [Release 2.0.40] prepare release v2.0.40
8 years ago
Amal Gunatilake
980a90900d
Merge pull request #679 from Megala21/fix_group_share_ui
...
Fixes https://github.com/wso2/product-iots/issues/335
8 years ago
WSO2 Builder
8b7e458592
[WSO2 Release] [Jenkins #2201 ] [Release 2.0.39] prepare for next development iteration
8 years ago
WSO2 Builder
6297993560
[WSO2 Release] [Jenkins #2201 ] [Release 2.0.39] prepare release v2.0.39
8 years ago
lakshani
0f1b17a25e
Fixed the issue in application restriction for iOS
8 years ago
megala21
5cd58d7454
Fixes https://github.com/wso2/product-iots/issues/335
8 years ago
warunalakshitha
7517c58799
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
WSO2 Builder
802c83de39
[WSO2 Release] [Jenkins #2193 ] [Release 2.0.38] prepare for next development iteration
8 years ago
WSO2 Builder
98dda03784
[WSO2 Release] [Jenkins #2193 ] [Release 2.0.38] prepare release v2.0.38
8 years ago
sinthuja
18583af6b4
Fixing the case where multiple tags were passed for searching the APIs.
8 years ago
WSO2 Builder
f3e119cd78
[WSO2 Release] [Jenkins #2190 ] [Release 2.0.37] prepare for next development iteration
8 years ago
WSO2 Builder
a8f8a49a80
[WSO2 Release] [Jenkins #2190 ] [Release 2.0.37] prepare release v2.0.37
8 years ago
Harshan Liyanage
9e4d84dfb2
Fix for Advanced Search Issue #670
8 years ago
warunalakshitha
5831d277da
Fixing https://github.com/wso2/carbon-device-mgt-plugins/issues/613
8 years ago
Rasika Perera
6a623f5657
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
lakshani
5c7cfda487
Fixed jira IOTS-438
8 years ago
WSO2 Builder
0e5895ec78
[WSO2 Release] [Jenkins #2183 ] [Release 2.0.36] prepare for next development iteration
8 years ago
WSO2 Builder
d6080159cb
[WSO2 Release] [Jenkins #2183 ] [Release 2.0.36] prepare release v2.0.36
8 years ago
Amal Gunatilake
e9c2f3e72d
Merge branch 'master' into cloud-3.1.0
8 years ago
WSO2 Builder
3f8f8b3ab9
[WSO2 Release] [Jenkins #2180 ] [Release 2.0.35] prepare for next development iteration
8 years ago
WSO2 Builder
6a9a5ba9c8
[WSO2 Release] [Jenkins #2180 ] [Release 2.0.35] prepare release v2.0.35
8 years ago
amalhub
c65f9c6dcb
Fixing issue: https://github.com/wso2/product-iots/issues/314
8 years ago
kamidu
3b9ae200e7
fixing posible null pointer excep
8 years ago
kamidu
a85b5688a9
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu
0b94a284ad
new role filtering related fixes
8 years ago
kamidu
8c17418198
fixing the null pointer exception
8 years ago
kamidu
530e603fb5
enable role filtering and role count in device cloud
8 years ago
kamidu
cda0dd417f
fixing the role filtering api issues
8 years ago
Harshan Liyanage
d468ac07d0
Revert "Allowing configuration management in cloud environment"
8 years ago
Madawa Soysa
da69bc9fe5
Allowing configuration management in cloud environment
8 years ago
charitha
6656f9e6f0
Add support for hybrid device types which has emulation/virtual capabilities
...
(cherry picked from commit 78b7037
)
8 years ago
kamidu
e205fd97cd
fix the user view related issues and device location out dated issue
8 years ago
kamidu
1f572998f8
enable role filtering in device cloud
8 years ago
kamidu
73ab0a38bf
adding get location api witch was missing from previous emm versions
8 years ago
kamidu
a6f5c002a9
adding get location api witch was missing from previous emm versions
8 years ago
kamidu
a77794f81a
adding role filtering for device cloud via api
8 years ago
kamidu
fc6c8e0290
adding get location api witch was missing from previous emm versions
8 years ago
Susinda Perera
643be65cf9
Merge pull request #662 from amalhub/master
...
Once the password is changed - Curent user should be immediately logout
8 years ago
amalhub
4c6781d6b6
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout
8 years ago
WSO2 Builder
e8ee33e7a4
[WSO2 Release] [Jenkins #2177 ] [Release 2.0.34] prepare for next development iteration
8 years ago
WSO2 Builder
6cc898d2ab
[WSO2 Release] [Jenkins #2177 ] [Release 2.0.34] prepare release v2.0.34
8 years ago
Geeth
c0a474f6fc
Merge pull request #661 from charithag/master
...
Fixes and improvments
8 years ago
charitha
78b7037aa9
Add support for hybrid device types which has emulation/virtual capabilities
8 years ago
WSO2 Builder
a26a4bb539
[WSO2 Release] [Jenkins #2175 ] [Release 2.0.33] prepare for next development iteration
8 years ago
WSO2 Builder
000601911f
[WSO2 Release] [Jenkins #2175 ] [Release 2.0.33] prepare release v2.0.33
8 years ago
amalhub
af4ab19132
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/647
8 years ago
WSO2 Builder
50c9eb9ba4
[WSO2 Release] [Jenkins #2172 ] [Release 2.0.32] prepare for next development iteration
8 years ago
WSO2 Builder
ca79804c5c
[WSO2 Release] [Jenkins #2172 ] [Release 2.0.32] prepare release v2.0.32
8 years ago
sinthuja
54888b6727
Adding back the webscoket credential method invocation, as it's needed by the pugins.
8 years ago
charitha
5ff3ba3fcc
Fix issue in showing dynamic icons
8 years ago
kamidu
bf1548c062
title app name changed
8 years ago
WSO2 Builder
a35205c480
[WSO2 Release] [Jenkins #2169 ] [Release 2.0.31] prepare for next development iteration
8 years ago
WSO2 Builder
ac379c9bf9
[WSO2 Release] [Jenkins #2169 ] [Release 2.0.31] prepare release v2.0.31
8 years ago
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
8 years ago
kamidu
fef7a58ad4
title app name changed
8 years ago
Susinda
5d10575de8
Merge remote-tracking branch 'upstream/master'
8 years ago
Susinda
dc0606f207
Fixing typo in above commit
8 years ago
Susinda
96d45d006d
Fixing #645 , when password is changed redirect to logout
8 years ago
WSO2 Builder
de25f3afe3
[WSO2 Release] [Jenkins #2163 ] [Release 2.0.30] prepare for next development iteration
8 years ago
WSO2 Builder
55ecafe7f4
[WSO2 Release] [Jenkins #2163 ] [Release 2.0.30] prepare release v2.0.30
8 years ago
Amal Gunatilake
f93bac489f
Merge pull request #654 from susinda/master
...
Fixing #644
8 years ago
Susinda
226db9a230
Fixing #644
8 years ago
Amal Gunatilake
5ef2d9d121
Merge pull request #653 from susinda/master
...
Typo Fxed
8 years ago
Susinda
b3295ca2ef
Typo Fxed
8 years ago
WSO2 Builder
15d57f71ad
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare for next development iteration
8 years ago
WSO2 Builder
3af9e1729a
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare release v2.0.29
8 years ago
Amal Gunatilake
dbf657fae8
Merge pull request #640 from susinda/master
...
Fixing: https://github.com/wso2/carbon-device-mgt/issues/639
8 years ago
WSO2 Builder
322f39596e
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare for next development iteration
8 years ago
WSO2 Builder
18244d6c96
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare release v2.0.28
8 years ago
WSO2 Builder
12f21868dc
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare for next development iteration
8 years ago
WSO2 Builder
4328c3c39d
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare release v2.0.27
8 years ago
Kamidu Sachith Punchihewa
14d517e89d
Merge pull request #641 from wso2/cloud-3.1.0
...
Cloud related fixes
8 years ago
kamidu
42f2691962
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu
e30a5910f1
change the device cloud documentation link
8 years ago
kamidu
f3a61cb8f3
enhasing toplink
8 years ago
Susinda
cd4902f8ab
phoneNumber -> PhoneNumber
8 years ago
WSO2 Builder
c6bb8e0128
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare for next development iteration
8 years ago
WSO2 Builder
da9002ba9f
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare release v2.0.26
8 years ago
Susinda
a539775583
Fixing carbon-device-mgt/issues/639
8 years ago
amalhub
541f5440ab
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
amalhub
2c0ac79dce
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/637
8 years ago
Hasunie
1ee313ea77
Merge pull request #636 from harshanL/cloud-3.1.0
...
Fixed Device renaming issue.
8 years ago
WSO2 Builder
6114f4b2d5
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare for next development iteration
8 years ago
WSO2 Builder
ea8f19f26d
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare release v2.0.25
8 years ago
Harshan Liyanage
1cbdb84cf1
Fixed merge conflicts with PR-623
8 years ago
Harshan Liyanage
e686b2af0e
Resolved merge conflicts
8 years ago
kamidu
6fe7470af5
re enabling device renaming
8 years ago
Harshan Liyanage
755786db8b
Merge branch 'master' of https://github.com/sameeragunarathne/carbon-device-mgt into sameeragunarathne-master
8 years ago
Harshan Liyanage
06ccbe28cc
Fixed Device renaming issue.
8 years ago
WSO2 Builder
d433525145
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare for next development iteration
8 years ago
WSO2 Builder
35ee3eca3a
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare release v2.0.24
8 years ago
kamidu
3ff2c9894f
role filtering for device cloud is enabled
8 years ago
Harshan Liyanage
75486b3bb8
Fixed Device renaming issue.
8 years ago
sameera910409
33132b1f8e
refactor code for firebase cloud messaging
8 years ago
WSO2 Builder
4e0afb7d39
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare for next development iteration
8 years ago
WSO2 Builder
33f1448c82
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare release v2.0.23
8 years ago
Harshan Liyanage
3ab025a6d8
Merge pull request #631 from ayyoob/cloud-3.1.0
...
added claimable property and fixed unsecured endpoint bug
8 years ago
ayyoob
b1b0b03ce1
changed license year
8 years ago
Kamidu Punchihewa
e063fd0da9
code cleanup results
8 years ago
Kamidu Punchihewa
e6333438b9
ading role filtering and ui fixes
8 years ago
WSO2 Builder
e95e96f06c
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare for next development iteration
8 years ago
WSO2 Builder
5d55413e02
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare release v2.0.22
8 years ago
Susinda
40469d0e4d
Adding maven.javadoc.skip to org.wso2.carbon.apimgt.integration.generated.client project
8 years ago
Susinda
e23aaa6647
Adding Hasunie's fix on initialOperations implementation
8 years ago
Susinda
7083c4ec9b
version corrected to 2.0.22-SNAPSHOT
8 years ago
Susinda Perera
bd7d6939e5
Merge pull request #628 from susinda/master
...
Merging from cloud-3.1.0
8 years ago
Susinda
e83fa8cb02
org.wso2.carbon.apimgt.integration.generated.client version increment
8 years ago
WSO2 Builder
ae3300afde
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare for next development iteration
8 years ago
WSO2 Builder
6646c0c56f
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare release v2.0.21
8 years ago
Susinda Perera
7c9659ed29
Merge pull request #1 from susinda/cloud-3.1.0
...
Cloud 3.1.0
8 years ago
WSO2 Builder
21cdcdd21a
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare for next development iteration
8 years ago
WSO2 Builder
23be60ebd0
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare release v2.0.20
8 years ago
kamidu
0fade6aa9f
remove the cloud related config from config.jason
8 years ago
kamidu
dd26f366df
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu
f9a03133fa
device cloude related ui improvements
8 years ago
ayyoob
2384755a97
added claimable property and fixed unsecured endpoint bug
8 years ago
ayyoob
964fb7ce72
regenerated swagger api based on apimgt 2.1.0 rest api
8 years ago
ayyoob
525b55d603
avoid race condition by loading tiers
8 years ago
ayyoob
5e4b0564b7
added permission fix for operation and synchronised application creation to avoid duplicate subscription
8 years ago
ayyoob
6a0c0cb299
added default permissions
8 years ago
Megala
a2d0c59e17
Revert 2988357eb9
8 years ago
Megala
4fdeec89cc
Revert f3f7635d3b
8 years ago
ayyoob
d66e439f49
added carbon local ip as config
8 years ago
Susinda
09b74211c4
increment carbon-devicemgt version to 2.0.20
8 years ago
ayyoob
5d3aa49e06
added logger trace support for apim integration service
8 years ago
ayyoob
c088a9bc93
fixed api subscribe issue for device specific app creation
8 years ago
WSO2 Builder
7f98d37835
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare for next development iteration
8 years ago
WSO2 Builder
b03936ca49
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare release v2.0.19
8 years ago
charitha
abdffdbf39
Add tenant id to Enrollment Certificate
8 years ago
charitha
14dfc1b538
Fix minor issues found with jmeter tests
8 years ago
madhawap
f1b761d987
Minor code formating
8 years ago
Kamidu Sachith Punchihewa
8e530b0523
adding the removed tenant based token handlers
8 years ago
WSO2 Builder
82888e1d20
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare for next development iteration
8 years ago
WSO2 Builder
b11c2e451b
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare release v2.0.18
8 years ago
WSO2 Builder
67a091ff5a
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare for next development iteration
8 years ago
WSO2 Builder
dcc2088455
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare release v2.0.17
8 years ago
lakshani
eb12e5b9f1
Adding commit 'added java doc comments'
8 years ago
lakshani
9e5574dccc
Adding commit 'added change device status to device view page'
8 years ago
lakshani
3f90b403c0
Adding lakshani's commit 'updated device status button'
8 years ago
WSO2 Builder
927b2d451d
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare for next development iteration
8 years ago
WSO2 Builder
dfe9b1ff9c
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare release v2.0.16
8 years ago
charitha
7374a0825d
Fix https://wso2.org/jira/browse/IOTS-436
8 years ago
charitha
d2991585aa
Applying charithas commit on IOTS-436
8 years ago
ayyoob
470500b80e
added ssl context
8 years ago
geethkokila
e90dc8b6c1
Fixing the compile error
8 years ago
geethkokila
d8303356cd
Fixing the conflicts
8 years ago
kamidu
b7e3b28722
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu
4e16e29b1c
removing group sharing
8 years ago
Imesh Chandrasiri
3c90f8ad49
temporary removal of view analytics
8 years ago
Imesh Chandrasiri
8cf92e8a5b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri
a938d57a65
Removing analytics link from groups listing
8 years ago
Kamidu Sachith Punchihewa
587c798f09
Merge pull request #613 from Kamidu/cloud-3.1.0
...
remove tennent related token handlers
8 years ago
Kamidu Sachith Punchihewa
4a5c99af78
remove tennent related token handlers
8 years ago
Imesh Chandrasiri
5097416d69
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri
368647f176
Temporary advance search removal commit
8 years ago
Kamidu Sachith Punchihewa
112efda8d5
Merge pull request #611 from Kamidu/cloud-3.1.0
...
removing device edit option
8 years ago
Kamidu Sachith Punchihewa
0da8847787
removing device edit option
8 years ago
Imesh Chandrasiri
f5e5dce872
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri
ee209064e3
Tooltip css fix
8 years ago
Kamidu Sachith Punchihewa
367dc1a30b
resolving return type issue in group mgt
8 years ago
Kamidu Sachith Punchihewa
527b844ee3
Error handled on the user session invalidation
8 years ago
Kamidu Sachith Punchihewa
318fbf9215
role loading issues
8 years ago
Kamidu Sachith Punchihewa
282801c814
updating cloud dashboard
8 years ago
kamidu
7480ccaa15
fixing datatable issues
8 years ago
kamidu
3e061f6e8b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu
6a67f251ac
cloud related ui fixs
8 years ago
Hasunie
8bb75d291c
Avoiding package exporting org.wso2.carbon.device.mgt.core.internal
8 years ago
Hasunie
2a9027a15e
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Hasunie
6b1ab86276
fixing policyManagementDataHolder issue
8 years ago
Imesh Chandrasiri
3786ef2636
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri
0cddd896d4
Tooltip fix
8 years ago
kamidu
4725eb3c3b
chenge the group creating steps
8 years ago
kamidu
486e02fd71
adding ui changes to the cloud related uis
8 years ago
Hasunie
315be0a3c7
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Rasika Perera
9ca552584a
Merge pull request #602 from rasika/cloud-3.1.0
...
Adding tooltips
8 years ago
Rasika Perera
b8a1b945bb
Adding tooltips
8 years ago
Imesh Chandrasiri
9d80fcfd54
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri
7bc5d35746
data table padding fix
8 years ago
Kamidu Sachith Punchihewa
4d02f9971e
Merge pull request #591 from Kamidu/cloud-3.1.0
...
enable cloud related configurations to the devicemgt application
8 years ago
Hasunie
b584a39a41
removing comma seperation in import packages
8 years ago
Hasunie
476e439fe2
Fixing the task to get the only device registered tenants
8 years ago
Rasika Perera
d92c52b89b
Adding cloud error pages for jaggery.conf
8 years ago
Rasika Perera
8931478a55
Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json
8 years ago
kamidu
aba4ceaf76
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
kamidu
587f847934
ui improvements to device cloud
8 years ago
Milan Perera
28606f1729
Merge pull request #598 from ayyoob/210releasepatch
...
210releasepatch
8 years ago
Imesh Chandrasiri
c26d7fd15d
Changed device loading icon for device loading page
8 years ago
Imesh Chandrasiri
dcb29b7792
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
Imesh Chandrasiri
5a7fa99e0a
Fix data table icon padding issue
8 years ago
Rasika Perera
fbae181f07
Fixing footer getting cluttered on /devicemgt/devices/search page
8 years ago
Rasika Perera
dd645a9fda
Fixing footer getting cluttered on /devicemgt/devices/search page
8 years ago
Imesh Chandrasiri
b579870672
Data table icon cursor added
8 years ago
Imesh Chandrasiri
23edb1de7a
Model Popup title space issue fix
8 years ago
Imesh Chandrasiri
8bbb612de6
Fixing cloud header height issue and theme color
8 years ago
geethkokila
f3f7635d3b
Fixing the task to get the only the device enrolled tenants
8 years ago
kamidu
8a07639d6b
Fix responsive issue in clud header
8 years ago
kamidu
6e19ec31e3
fix url issues in the config.json
8 years ago
kamidu
b946eeae74
fix url issues in the config.json
8 years ago
kamidu
f772b35769
enable cloud related configurations to the devicemgt application
8 years ago
kamidu
4eaf2b41c8
enable cloud related configurations to the devicemgt application
8 years ago
ayyoob
dac7d3c1ee
made device management to be default tag
8 years ago
ayyoob
67ae4c7c68
fixed api subscription issue
8 years ago
ayyoob
6c96d228ae
added subscription fix
8 years ago
ayyoob
018b230b5a
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
ayyoob
87910bc92b
transferred mutual authenticator to jwt authenticator
8 years ago
kamidu
ddef86e226
stylish issues
8 years ago
kamidu
9cba33a6dc
Modification to the header panel
8 years ago
WSO2 Builder
b051bd108b
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare for next development iteration
8 years ago
WSO2 Builder
ce78ac277e
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare release v2.0.17
8 years ago
lakshani
18cb2b3e1f
added java doc comments
8 years ago
lakshani
a2679fde4c
added change device status to device view page
8 years ago
kamidu
fd3ff5496c
cloud relatd ui fixes
8 years ago
lakshani
2d83033b26
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicestatus
8 years ago
lakshani
a9a6883adc
updated device status button
8 years ago
WSO2 Builder
c954731870
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare for next development iteration
8 years ago
WSO2 Builder
e68c3d170b
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare release v2.0.16
8 years ago
Kamidu Sachith Punchihewa
681c320542
Update user-menu.hbs
8 years ago
Kamidu Sachith Punchihewa
00b1f982c6
Update user-menu.hbs
8 years ago
ayyoob
ed7b67dd24
made it accept tenant domain as parameter
8 years ago
ayyoob
b7566f4e4a
added artifact deployment support through UI
8 years ago
ayyoob
0999bb70a0
exposed artefact deployment through api
...
Merged Jasintha’s code
8 years ago
ayyoob
274d3e9aeb
used jwt grant type instead of saml
8 years ago
Kamidu Sachith Punchihewa
559fe98cc9
Merge pull request #585 from wso2/master
...
Cloud ui fixes and the new master fixes
8 years ago
WSO2 Builder
54a278a1bc
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare for next development iteration
8 years ago
WSO2 Builder
3bc46c4d2d
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare release v2.0.15
8 years ago
kamidu
befa75af9a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
6af09cdd31
Remove the defaut black color for icons
8 years ago
WSO2 Builder
1bc8f5c28d
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare for next development iteration
8 years ago
WSO2 Builder
1483503790
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare release v2.0.14
8 years ago
Hasunie
54d0d7a5ee
Merge pull request #582 from charithag/master-update-swagger-docs
...
Update swagger docs
8 years ago
kamidu
41fd402619
DIABLE CLOUD UI IN THE MASTER
8 years ago
kamidu
43b0d1f1ce
Enable appstore and app publisher
8 years ago
Milan Perera
701d6e4522
Updated the snapshot version of intergration client
8 years ago
Milan Perera
a5f41ef734
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
8 years ago
ayyoob
1387d326ca
merged with origin
8 years ago
ayyoob
4ec7762a5c
made it use the default saml grant type
8 years ago
Milan Perera
41353f8014
Fixed issues in scope validation feature
8 years ago
kamidu
4b396cf321
enable location without das
8 years ago
ayyoob
38f61adf94
few changes after testing multi tenancy
8 years ago
charitha
8e01a98ded
Removed unused Dashboard API
8 years ago
charitha
423879bee7
Updated swagger docs
8 years ago
charitha
3cf797fba6
Removed hardcoded device types in swagger docs
8 years ago
WSO2 Builder
5dc55bb5b5
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare for next development iteration
8 years ago
WSO2 Builder
c7fe9c3a20
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare release v2.0.13
8 years ago
lakshani
3b32635cf9
removed unwanted new lines
8 years ago
lakshani
bbcdf7aeda
removed unwanted new line
8 years ago
lakshani
26f2e2d2ae
added role query param to getdevices restapis
8 years ago
WSO2 Builder
c17bead1fc
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare for next development iteration
8 years ago
WSO2 Builder
14100d3cc8
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare release v2.0.12
8 years ago
GPrathap
9cdcb58103
uncommenting required fields
8 years ago
GPrathap
e7e8cb62b6
fixing permission issue when viewing device analytics dashboard
8 years ago
GPrathap
47e6f6d292
adding username as parameter
8 years ago
Milan Perera
2b4a3cde61
Fixed conflicts and merged
8 years ago
Milan Perera
7ba1dc989a
Implemented a scope delegation validator
8 years ago
Milan Perera
21d8d14b7e
Fixed multy tenancy issues related to android device type
8 years ago
ayyoob
30119ff263
fixed data holder issue
8 years ago
geethkokila
713ddbf416
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
8 years ago
geethkokila
2988357eb9
Changing the task to run for all the tenants
8 years ago
ayyoob
0c4a78f3e9
fixed api Id issue for subscription
8 years ago
ayyoob
3c45f9af11
fixed api Id issue for subscription
8 years ago
ayyoob
159e067fed
changed integration client version
8 years ago
ayyoob
b42505c1fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
8 years ago
ayyoob
1a7a215441
added missing license headers
8 years ago
ayyoob
1370b87618
fixed apim application issue
8 years ago
WSO2 Builder
cd7e0feaa6
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare for next development iteration
8 years ago
WSO2 Builder
abb150d9bd
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare release v2.0.11
8 years ago
ayyoob
7348ae2f2a
resolved merge issues
8 years ago
ayyoob
3423ef025d
merged with upstream
8 years ago
ayyoob
e74b4e23c4
removed apim dependency from cdmf
8 years ago
Milan Perera
e29aa58e19
Removed tenant domain from Basic Authenticator
8 years ago
WSO2 Builder
002fb8719b
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
04f32902fd
[maven-release-plugin] prepare release v2.0.10
8 years ago
Rasika Perera
704680d68d
Fixing null pointer when roles are not specified on creating new user
8 years ago
Rasika Perera
9a0ba9137b
Fixed permissions issue on grouping
8 years ago
Rasika Perera
d723e22a8c
Fixed roleUpdate issue
8 years ago
WSO2 Builder
5c207897ad
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
233d14edbd
[maven-release-plugin] prepare release v2.0.9
8 years ago
Rasika Perera
8e6855a203
Adding DEFAULT_DEVICE_USER on adding user
8 years ago
Rasika Perera
5ce413012e
Adding DEFAULT_DEVICE_USER and DEFAULT_DEVICE_ADMIN
8 years ago
Rasika Perera
5aa8776bfe
Fixing iot.analytics.host%:%iot.analytics.https.host => iot.analytics.host%:%iot.analytics.https.port
8 years ago
Rasika Perera
42816101bb
Merge pull request #566 from wso2/release-2.0.8
...
Release 2.0.8
8 years ago
Imesh Chandrasiri
3983780f7f
Fix for multiple advance search element
8 years ago
Imesh Chandrasiri
a5d1f70c93
git status
8 years ago
Imesh Chandrasiri
ef80d62307
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri
9f262c1afb
Message container markup fix for advance search
8 years ago
WSO2 Builder
eedecf00ed
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
ef57fc463b
[maven-release-plugin] prepare release v2.0.8
8 years ago
Ayyoob Hamza
96f0c633d9
Merge pull request #563 from madhawap/release-2.0.x
...
parameterizing sso config
8 years ago
madhawap
348b349a37
parameterizing sso config
8 years ago
Rasika Perera
212cc52eb2
Merge pull request #562 from Kamidu/release-2.0.x
...
improvements for location view
8 years ago
kamidu
eb17093747
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
kamidu
bf38ad5f70
adding location history to map view
8 years ago
Rasika Perera
fb1f7771c4
Fixing "process" not found on devicemgt
8 years ago
Rasika Perera
b39caade98
Adding system params picking up for app-conf.json
8 years ago
Rasika Perera
3a2b206fe6
Fixing certificate management api returns 403 forbidden
8 years ago
Rasika Perera
ff2cd32bce
Merge pull request #561 from geethkokila/release-2.0.x
...
Adding the fixes for device search
8 years ago
geethkokila
2743bf9458
Fixing the security issue due to not using prepared statement
8 years ago
geethkokila
7359b4c536
Fixing the security issue due to not using prepared statement
8 years ago
kamidu
bd75b789c2
Enable location histry for android sense
8 years ago
Imesh Chandrasiri
bc59ac6819
Adding action buttons to listing views
8 years ago
Imesh Chandrasiri
ba23e5cfd9
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri
9533bc9ac8
Adding advance search to devices page
8 years ago
Rasika Perera
e86776eb0b
Fixing "process" not found issues
8 years ago
Rasika Perera
3ff4e37937
Merge pull request #557 from DimalChandrasiri/release-2.0.x
...
Group detail view responsive issue fix
8 years ago
Rasika Perera
6733190760
Merge pull request #556 from Kamidu/release-2.0.x
...
Enable location history
8 years ago
Rasika Perera
15a919b8a7
Added parameters for configs
8 years ago
Rasika Perera
252eb78124
Now UI configs supports system parameters with eg. %iot.core.host%
8 years ago
Imesh Chandrasiri
75f2015f5a
Group detail view responsive issue fix
8 years ago
kamidu
fb89476e16
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
kamidu
5f5d19fc1e
Enable location history
8 years ago
Rasika Perera
27e953cda3
API subscription permission added to [devicemgt-user] role
8 years ago
inoshperera
346fd28814
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
inoshperera
0bb04789a6
adding permissions necessery for iOS to config.json
8 years ago
Milan Perera
f8de4869d9
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera
e9c3a0c3e8
Fixed token expiration issue
8 years ago
Rasika Perera
152ff2965a
Merge pull request #552 from Jasintha/release-2.0.x
...
Fixing firearm policy push notification issue
8 years ago
sameera910409
1bec5e5186
fixed user password reset failure issue in iot console
8 years ago
Jasintha
e8ffe60e8c
Fixing firealam policy push notification issue
8 years ago
Maninda
1f5448c2a0
Corrected the caching filter pattern
8 years ago
Imesh Chandrasiri
bdfb816ffc
Fix for issue where list item operations getting fired even after cancelling list item selection
8 years ago
kamidu
bb8985781e
removing duplicate methoads
8 years ago
kamidu
7698c12d80
removing duplicate methoads
8 years ago
kamidu
7b3db2bdd6
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera
51bd2b5bb6
UI improvement: Fixing buttons styles
8 years ago
Rasika Perera
60ac0522d8
Fixes for XSS attacks
8 years ago
ayyoob
5927064435
apim seperation
8 years ago
kamidu
5de2a233d7
Recomended security fixes for data tables
8 years ago
Rasika Perera
2b46691405
Fixing user menu not showing issue
8 years ago
ayyoob
4128e2d355
pointed to gateway node
8 years ago
Imesh Chandrasiri
ba506183b1
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri
34aac48071
Notification bar scroll and trigger issue fix
8 years ago
Rasika Perera
68ad05fde2
Merge pull request #546 from DimalChandrasiri/release-2.0.x
...
Fix for multiple popup issue and modal js improvement
8 years ago
ayyoob
8a883ccd41
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
2a538ff959
fixed multi tenant login issue
8 years ago
Maninda
8aed7c67a9
Added devicemgt web app configs to secure web app
8 years ago
Maninda
4fbab80782
Added security filters to jaggery.conf
8 years ago
Rasika Perera
2206e258d1
Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles
8 years ago
Imesh Chandrasiri
153e3bb719
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri
6e1e801ea0
Fix for multiple popup issue
8 years ago
WSO2 Builder
585b9bde4d
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
d206148841
[maven-release-plugin] prepare release v2.0.7
8 years ago
Rasika Perera
b9c1141f79
Added missing utility module import
8 years ago
Rasika Perera
24a7179c4b
Merge pull request #544 from geethkokila/release-2.0.x
...
Adding support for identifying the device type from the url
8 years ago
Rasika Perera
0227d5ccbb
Fixing https://wso2.org/jira/browse/IOTS-381
8 years ago
Rasika Perera
4549a34083
changed [fw-ok] with [fw-success]
8 years ago
geethkokila
bf8ab0da11
Adding support for identifying the device type from the url
8 years ago
ayyoob
44d09e09ea
few changes after testing the gateway
8 years ago
ayyoob
671d931d3e
merged with origin after resolving conflicts
8 years ago
ayyoob
5b3a8091ec
fixed Null pointer exception
8 years ago
Rasika Perera
864020f20e
Adding ability to add deviceType level scopes
8 years ago
Rasika Perera
f57de670ea
Adding devices:update into /devices scopes list
8 years ago
Rasika Perera
e11d2244f5
Fixing scope annotation /enrollment-invite
8 years ago
Rasika Perera
63cb0e1fde
Adding swagger annotations and scope for /effective-policy
8 years ago
Rasika Perera
3cc176c121
Fixing permission for certificates:verify
8 years ago
Rasika Perera
09aae93fc1
Adding perm:admin:certificates:verify scope
8 years ago
Milan Perera
d9ea6af775
Changed logs to warn
8 years ago
ayyoob
d4ec0705e7
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
cdd144237f
removed unused parameter
8 years ago
Milan Perera
311fe7810f
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera
21c50c9a55
Fixed NPE occurred due to scope mapping
8 years ago
ayyoob
2fbaf31b93
fixed permission and assigned environment variables for url context
8 years ago
ayyoob
93ae646c50
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
de957bec29
few changes after testing the cluster
8 years ago
Rasika Perera
e05600607a
Merge pull request #540 from madawas/release-2.0.x
...
Refactoring policy view and edit units
8 years ago
Rasika Perera
c7d489cf2c
Merge pull request #538 from madawas/IOTS-377
...
IOTS-377 : Fixing VFA icon not visible issue
8 years ago
Rasika Perera
9bd409e502
Merge pull request #536 from DimalChandrasiri/release-2.0.x
...
Updating font wso2 to version 1.2.1
8 years ago
Madawa Soysa
a28458cf13
Refactoring policy view and edit units
...
Refactored the units policy.view and policy.edit to be consistant with policy.create unit. Related to IOTS-296
8 years ago
Milan Perera
f25e82f4ec
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera
98ea97d890
Fixed permissions adding issue
8 years ago
Imesh Chandrasiri
957224b905
Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri
d686a9ea57
Updating font wso2 to version 1.2.1 - Commit 2
8 years ago
Madawa Soysa
8a7d0bb3aa
IOTS-377 : Fixing VFA icon not visible issue
...
Fixes IOTS-377
8 years ago
Rasika Perera
83868303dd
Merge branch 'release-2.0.x' into release-2.0.x
8 years ago
Rasika Perera
8311828c5d
Merge pull request #537 from ayyoob/release-2.0.x
...
updated ui config
8 years ago
Imesh Chandrasiri
f1954c4f10
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
0d721a226b
updated ui config
8 years ago
Imesh Chandrasiri
3230a4e269
Updating font wso2 to version 1.2.1
8 years ago
Rasika Perera
ef2a1b84a2
IOTS-376 : Fixing cannot delete a device
8 years ago
kamidu
4588cfbed4
Fixing the permission management issue in EMM console
8 years ago
Ace
c6d186aa1a
Adding missing fix
8 years ago
Ace
bd45b27cc9
Merging with upstream
8 years ago
Ace
643acd7827
Adding api for renaming devices
8 years ago
ayyoob
471e634790
merged with upstream
8 years ago
ayyoob
06977295ea
merged with upstream
8 years ago
Milan Perera
562631cc1d
Fixed scopes related issue in SAML Granttype
8 years ago
charitha
cb7ff7f66a
Change package name to lower case
8 years ago
ayyoob
9d5061230c
fixing test failures
...
(cherry picked from commit ac8dae7
)
8 years ago
charitha
c909144589
Add select2 controller to select roles to share a group
8 years ago
ayyoob
ac8dae7ed0
fixing test failures
8 years ago
Rasika Perera
e1228b408a
Removed [httpsWebURL] from config.json
8 years ago
Rasika Perera
9afffc6571
Merge pull request #530 from charithag/release-2.0.x
...
Add select2 controller to select roles to share a group
8 years ago
charitha
1ad9439162
Add select2 controller to select roles to share a group
8 years ago
Rasika Perera
250984f438
Merge pull request #529 from rasika/merge-master
...
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
5caa688014
Fixed issue in populating server.ip property.
8 years ago
Rasika Perera
0acd273ae1
Fixing merge conflicts
8 years ago
Rasika Perera
83aea1fd01
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
...
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
# components/apimgt-extensions/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
# components/device-mgt-extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
# components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
# components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
# components/identity-extensions/pom.xml
# components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
# components/policy-mgt/pom.xml
# components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
# components/webapp-authenticator-framework/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
# features/apimgt-extensions/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
# features/certificate-mgt/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
# features/device-mgt-extensions/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
# features/device-mgt/pom.xml
# features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
# features/dynamic-client-registration/pom.xml
# features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
# features/email-sender/pom.xml
# features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
# features/jwt-client/pom.xml
# features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
# features/oauth-extensions/pom.xml
# features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
# features/policy-mgt/pom.xml
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
# features/webapp-authenticator-framework/pom.xml
# pom.xml
8 years ago
ayyoob
c718d723c0
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
ea31637223
added scr reference to datasource for deployer and few fixes after the changes in the plugin
8 years ago
WSO2 Builder
5411d93103
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
3ea83b925a
[maven-release-plugin] prepare release v2.0.6
8 years ago
geethkokila
7059ad1243
Changing the package name
8 years ago
geethkokila
2881079b27
Removing two unnecessary classes from the project and adding java documentation to class
8 years ago
Rasika Perera
08ab946e88
Added doc comments
8 years ago
Rasika Perera
a16052431c
Corrected a typo on [APIMCertificateMGTException]
8 years ago
Rasika Perera
c2490347b6
Corrected a typo
8 years ago
Rasika Perera
ebdba19041
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
8 years ago
Rasika Perera
b4ed33bcd0
IOTS-171 : Register form validation message corrected
8 years ago
Rasika Perera
4de481e501
Merge pull request #521 from rasika/release-2.0.x
...
UI improvement for Datatables
8 years ago
Rasika Perera
d826ba81d0
UI improvement for Datatables
8 years ago
Joseph Fonseka
a5640f48b5
Changed auth type on API resources as configured in web.xml
8 years ago
Rasika Perera
78c413c1ba
Merge pull request #519 from hasuniea/release-2.0.x
...
getting SkippedEndpoint path from URL
8 years ago
Rasika Perera
dfcf72cae0
Merge pull request #518 from geethkokila/mutual_ssl_feature
...
Adding gateway support for IOS device type
8 years ago
Rasika Perera
8397b688e9
Merge branch 'release-2.0.x' into mutual_ssl_feature
8 years ago
Rasika Perera
bc93d48927
Merge pull request #520 from madhawap/release-2.0.x
...
fix to WebappPublisherConfig
8 years ago
madhawap
d22de197a1
fix to WebappPublisherConfig
8 years ago
Rasika Perera
b4a649bdfa
Merge pull request #516 from milanperera/release-2.0.x
...
Improved permission-scope mapping capabilities
8 years ago
Hasunie
45a543d3ed
getting SkippedEndpoint path from URL
8 years ago
geethkokila
3795a7e30f
Removing the hardcoded apis
8 years ago
geethkokila
739a8bdb69
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
geethkokila
44c7383b15
Adding support to send ios request the synapse gateway
8 years ago
Rasika Perera
1c1da1f5cd
Merge pull request #517 from rasika/release-2.0.x
...
Fixing CDMF version in footer
8 years ago
Rasika Perera
ab28d596e7
Fixing CDMF version in footer
8 years ago
Milan Perera
d51ee711fc
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera
79e98a592b
Merge pull request #515 from rasika/release-2.0.x
...
Replaced [EMM] with [IoT Server]
8 years ago
Milan Perera
228848075c
Fixed conflicts and merged
8 years ago
Rasika Perera
e501724c3c
Replaced [EMM] with [IoT Server]
8 years ago
Rasika Perera
7af63522f2
Fixed quick startup guide doc url
8 years ago
Milan Perera
42a587904f
Fixed issues in permission-scope mapping
8 years ago
geethkokila
9200adebed
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
charitha
d65557e03e
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha
e6e39532b7
Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements
8 years ago
Rasika Perera
3472090d1b
Merge pull request #513 from ruwany/wip
...
Fixing device listing issue
8 years ago
Rasika Perera
8706636b51
Merge pull request #511 from ayyoob/release-2.0.x
...
Made Policy Monitoring for device type to be multitenance & Added default values for push notification dynamic configuration
8 years ago
Ace
6a69d8cf4b
merging with upstream
8 years ago
Ace
b83479b214
Fixing device listing issue
8 years ago
inoshperera
e6a70b2394
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
inoshperera
11d2ecac10
removing basic auth headers from API definitions.
8 years ago
Milan Perera
637c014866
Refactored scope strings
8 years ago
Milan Perera
157ef998a6
Resolved conflicts and merged
8 years ago
Milan Perera
e0ee2fc1e5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
20c3940ca4
made MonitoringTask to get config from device management service
8 years ago
ayyoob
09a148d476
disabled ui and capp deployers
8 years ago
ayyoob
b20a2e0997
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
ayyoob
c69513e0f5
removed tenant domain from the web.xml
8 years ago
Chatura Dilan
e0627bf748
Merge pull request #509 from rasika/release-2.0.x
...
Fixing https://wso2.org/jira/browse/IOTS-362
8 years ago
GPrathap
5d1435c7bc
renamed permission string
8 years ago
Rasika Perera
25a35dcf20
Changing title [WSO2 IoT] into [WSO2 IoT Server]
8 years ago
Rasika Perera
7612f064fe
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Maninda
0a6ef8daf7
Added some security fixes for issues reported by FindBugs
8 years ago
Maninda
00a5a07373
Fixed some security issues found after running FindBugs security scan.
8 years ago
Milan Perera
f3409adc21
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Milan Perera
2a4a636eb4
Resolved conflicts and merged
8 years ago
Milan Perera
d13dadff08
Renamed prefix of scopes
8 years ago
GPrathap
0bd7b90e9a
added scope annotation
8 years ago
ayyoob
db2ddc7bed
policy manager refactored to support tenancy
8 years ago
ayyoob
9995f4293e
Default values set for push notification dynamic configuration
8 years ago
Milan Perera
7b8a7c0b52
Merge pull request #1 from GPrathap/release-2.0.x
...
removed setting APIs secured as default.
8 years ago
Maninda
0fb5a577b8
Fixed some issues found in FindBugs security analysis.
8 years ago
ayyoob
f511dc2bce
device type deployer for UI and plugin
8 years ago
Rasika Perera
235b41c9df
config.json [usernameLength] moved to [userValidationConfig][usernameLength]
8 years ago
Rasika Perera
2a7e62f857
config.json [apimgt-gateway] renamed to [gatewayEnabled]
8 years ago
Rasika Perera
e5062abcc2
Removed unneccesary configs
8 years ago
inoshperera
148c8046fe
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
inoshperera
c4a2ba0cea
adding http api publisher for Android agent to work out of the box
8 years ago
charitha
f6f99ed06a
Fixed following issues:
...
https://wso2.org/jira/browse/IOTS-271
8 years ago
Milan Perera
b860be0150
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
geethkokila
65cb12b5ac
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
charitha
295921b289
Fixed following issues:
...
https://wso2.org/jira/browse/IOTS-218
https://wso2.org/jira/browse/IOTS-236
https://wso2.org/jira/browse/IOTS-263
https://wso2.org/jira/browse/IOTS-173
8 years ago
Milan Perera
02d75b757c
Fixed conflicts and merged
8 years ago
GPrathap
f508bcfd0e
corrected method name
8 years ago
GPrathap
4c9578ebe2
resized buffer size to 0 for each scope
8 years ago
GPrathap
649879f998
removed setting APIs secured as default.
...
Because if secured is enabled, it is to be needed to provided parameters which are related to basic oauth, when this is false, jwt token is being used.
8 years ago
WSO2 Builder
6aea6195e9
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
3db5b289ac
[maven-release-plugin] prepare release v2.0.5
8 years ago
Rasika Perera
acb2c38799
Fixing user is not authorized to view devices
8 years ago
WSO2 Builder
ed47094964
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
8d409a7248
[maven-release-plugin] prepare release v2.0.4
8 years ago
charitha
1a93868424
Fixed https://wso2.org/jira/browse/IOTS-335
8 years ago
charitha
61d1710614
Fixed https://wso2.org/jira/browse/IOTS-341
8 years ago
Ace
674048ab27
Coorecting version import ranges
8 years ago
Rasika Perera
d001cf2ee1
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera
fea128d29e
Fixing grid-view cropped on group view
8 years ago
Ace
d6770c261a
updating appm dependencies to relased version
8 years ago
Ayyoob Hamza
4960fd0d05
Merge pull request #499 from charithag/release-2.0.x-IOTS-342
...
Fixed https://wso2.org/jira/browse/IOTS-342
8 years ago