Commit Graph

5403 Commits (36a91e0e62966ced74a2f362da7eeeb2fb167a17)

Author SHA1 Message Date
Charitha Goonetilleke e78a2a1279 Merge remote-tracking branch 'entgra/master' into entgra-master
6 years ago
Charitha Goonetilleke 75dd9321af Add methods to get device count based on status and device type
6 years ago
Saad Sahibjan ae9dd807cc Enrollment application install feature for policy
6 years ago
Madawa Soysa 6f80d1993d Move private constants to a public constant class
6 years ago
Madawa Soysa eea040f391 Remove redundant authorization check and fix the test
6 years ago
Madawa Soysa 001649e5fd Fix issue with advanced search to pick the correct enrollment
6 years ago
Entgra Builder cbe85378d8 [maven-release-plugin] prepare for next development iteration
6 years ago
Entgra Builder 4b1f83b168 [maven-release-plugin] prepare release v3.2.1
6 years ago
Charitha Goonetilleke c3893d93bb Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master
6 years ago
Charitha Goonetilleke 4deb71229c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
6 years ago
Ace 880720a72f Fixing issue with task scheduler
6 years ago
WSO2 Builder b4e8bb4da0 [WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare for next development iteration
6 years ago
WSO2 Builder e482894fbd [WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare release v3.1.51
6 years ago
Charitha Goonetilleke 10672ea534 Fixed date format issue in geofencing
6 years ago
Charitha Goonetilleke d936aea03a Fixed pom issues
6 years ago
Charitha Goonetilleke f0ec4a3520 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
6 years ago
WSO2 Builder 1bd160f551 [WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare for next development iteration
6 years ago
WSO2 Builder b45aef9fec [WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare release v3.1.50
6 years ago
Charitha Goonetilleke 86029752f8 Fixed https://github.com/wso2/product-iots/issues/1184
6 years ago
Charitha Goonetilleke e25d536210 Introduce new API for user search based on user attributes
6 years ago
WSO2 Builder 764b119ae5 [WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare for next development iteration
6 years ago
WSO2 Builder 1bbbce9ac3 [WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare release v3.1.49
6 years ago
geethkokila 2bb3e2cdc0 Fixing the SQL
6 years ago
WSO2 Builder 5005cebbff [WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare for next development iteration
6 years ago
WSO2 Builder 5d688d8c4f [WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare release v3.1.48
6 years ago
lasanthaDLPDS e76fe92ebe Fix device monitoring task disabling issue
6 years ago
Madawa Soysa 6795cbb180 Add IMEI parameter to custom parameters of the advanced search
6 years ago
Madawa Soysa 5300a7f363 Fix device advanced search
6 years ago
WSO2 Builder a18b4550ef [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare for next development iteration
6 years ago
WSO2 Builder 9c77054795 [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare release v3.1.47
6 years ago
Madawa Soysa 9b5cb1ef6a Fix issue with search not updating
6 years ago
Charitha Goonetilleke 128b5f64aa Fixed NPE in sending push notifications
6 years ago
Madawa Soysa 6aca4650e2 Introduce new API for user search based on user attributes
6 years ago
WSO2 Builder 8eaa7c6698 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare for next development iteration
6 years ago
WSO2 Builder 03b88248b8 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare release v3.1.46
6 years ago
Charitha Goonetilleke 3856a25449 Fixed authentication issue in deploying execution plans as non admin user
6 years ago
WSO2 Builder bfff9e7a7e [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare for next development iteration
6 years ago
WSO2 Builder af64244ab3 [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare release v3.1.45
6 years ago
Ace 3f77a3b27c Adding correct tenant ID
6 years ago
Ace 92bf6f4140 Fixing formatting issues
6 years ago
Ace b39be48919 Adding constants
6 years ago
Ace 8bc15e1f14 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
6 years ago
Ace 4aee621039 Fixing tenanted username
6 years ago
Ace 1721824d53 Fixing issue where super tenant table space is querried instead of relavent tenant when retrieving geo location data
6 years ago
Milan Perera a01886cb37 Handle NotNow response from device
6 years ago
WSO2 Builder e7a9406789 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare for next development iteration
6 years ago
WSO2 Builder b87b073739 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare release v3.1.44
6 years ago
Milan Perera b256d55847 Handle NotNow response from device
6 years ago
Ace de0bc0bb50 persisting profile operation payloads as string values as upposed to profile objects. this will iron iot future compatibility issues that may arise, due to operation dto getting updated
6 years ago
WSO2 Builder 806ac13c39 [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare for next development iteration
6 years ago
WSO2 Builder e3901043fc [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare release v3.1.43
6 years ago
Geeth 5ee7cba36a
Merge pull request #1264 from ruwany/master
6 years ago
Ace cb0fb87b49 Fixing test failures and adding enhancements
6 years ago
Ace 4b71c6ec40 Operation retrieval logic changed to retrieve operation details via table merge instead of secondary DB call
6 years ago
Ace de9cf67977 fixing issues with notification status not getting updated
6 years ago
WSO2 Builder 3782e68f27 [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare for next development iteration
6 years ago
WSO2 Builder 3111680b9f [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare release v3.1.42
6 years ago
Ace e487ef4627 Fixing issue due to changes in serialVersionUID after adding an additional field to Operation DTO. As a fix, serializationUID of the earlier revision of the class was included in the current code
6 years ago
Ace deeeb2ce48 Persisting profile operations as string payloads and retriving same as strings, failing which as profile objects to support legacy functonality
6 years ago
Ace 77db878951 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
6 years ago
Ace a8e52ee781 Fixing issue due to change in serialVersionUID after adding additional field to Operation DTO and correcting flaw in notification sending logic
6 years ago
WSO2 Builder 7186ed2f62 [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare for next development iteration
6 years ago
WSO2 Builder 60aee974ff [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare release v3.1.41
6 years ago
Charitha Goonetilleke 5d13979629 Increased notification popup time
6 years ago
Charitha Goonetilleke 9381362a0a Provide workaround to address WS issue
6 years ago
Ace 1fa0591f4b Fixing issue with notification sending logic
6 years ago
Charitha Goonetilleke 1f2f85d691 Increased notification popup time
6 years ago
Charitha Goonetilleke 53e1d3abde Provide workaround to address WS issue
6 years ago
Ace 4b08dd6053 Fixing issue with notification sending logic
6 years ago
charitha e12e7a3876 Add validation to event retrial
6 years ago
Ubuntu e5cc5284e3 [maven-release-plugin] prepare for next development iteration
6 years ago
Ubuntu ae078fe390 [maven-release-plugin] prepare release v3.2.0
6 years ago
Milan Perera 53f8014730 Whitelabel devicemgt jaggeryapp
6 years ago
charitha 034a15aa59 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
6 years ago
WSO2 Builder 353d6936db [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare for next development iteration
6 years ago
WSO2 Builder 8e2541b9ac [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare release v3.1.40
6 years ago
Milan Perera 4c7bd0664d Fix issue in order of get pending operations
6 years ago
charitha b5ce0fdd03 Merge branch 'iots-3.3.1' into entgra-master
6 years ago
charitha b46e45dae4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1
6 years ago
charitha fd8e73480d Order by on operation mapping ID
6 years ago
charitha 7ea609612c Revert "This is the fix for the intermittent issues when applying policies on devices"
6 years ago
WSO2 Builder 01991dcc4d [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare for next development iteration
6 years ago
WSO2 Builder 18b81223df [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare release v3.1.39
6 years ago
Milan Perera 576fa40cb0 Modify addOperation logic to improve the performance
6 years ago
Milan Perera 77f7792bc7 Fix wso2/product-iots#1863
6 years ago
WSO2 Builder cbbd327a02 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare for next development iteration
6 years ago
WSO2 Builder de07597d53 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare release v3.1.38
6 years ago
aselarbd ba8537e198 This is the fix for the intermittent issues when applying policies on devices
6 years ago
aselarbd 8fbe1a4234 This is the fix for the enrollment error occurred when a user enrols android device to EMM 2.2.0 in FCM enabled environment if whitelist policy is enforced.
6 years ago
aselarbd 3ca4672ac6 This commit fix the issue "Change password option does not work from the portal IOT server 3.1.0 "
6 years ago
WSO2 Builder 3401a8c845 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare for next development iteration
6 years ago
WSO2 Builder ecadadef94 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare release v3.1.37
6 years ago
geethkokila 2f428c8a58 Fix https://github.com/wso2/product-iots/issues/1857
6 years ago
WSO2 Builder 2b6de6834b [maven-release-plugin] prepare for next development iteration
6 years ago
WSO2 Builder 16c6a27f81 [maven-release-plugin] prepare release v3.1.36
6 years ago
Geeth a421c12d5e
Merge pull request #1255 from charithag/iots-3.3.1
6 years ago
charitha 22f02c4062 Update manager urls and product version
6 years ago
WSO2 Builder 252b260237 [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare for next development iteration
6 years ago
WSO2 Builder a2422cb02a [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare release v3.1.35
6 years ago
Geeth f5515bfa5f
Merge pull request #1252 from abhishekdesilva/master
6 years ago
abhishekdesilva 85040f0c68 Log debug process completion
6 years ago
abhishekdesilva 4aad82437b Log info has changed into debug
6 years ago
abhishekdesilva a0bc1cdd20 Reformatted the code block as necessary
6 years ago
WSO2 Builder af7aa73886 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare for next development iteration
6 years ago
WSO2 Builder 47ed74c156 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare release v3.1.34
6 years ago
charitha d54d78a02b Refactoring
6 years ago
charitha 82778f06c6 Add secure web socket proxy to route ws connections in IoTS cluster
6 years ago
WSO2 Builder 4848e271af [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare for next development iteration
6 years ago
WSO2 Builder c79baf3392 [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare release v3.1.33
6 years ago
geethkokila 7d34928ac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
6 years ago
geethkokila 1d427aef73 Fix https://github.com/wso2/product-iots/issues/1852
6 years ago
charitha e858f5b627 Merge remote-tracking branch 'entgra/master' into entgra-master
6 years ago
charitha 2cac0053ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
6 years ago
abhishekdesilva 870ff031bb Checking for pending operations before adding an operation
6 years ago
WSO2 Builder 02282967ab [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare for next development iteration
6 years ago
WSO2 Builder 7daeb6efb9 [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare release v3.1.32
6 years ago
charitha d2940bf7a1 Refactoring
6 years ago
charitha 47f619a136 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1
6 years ago
charitha 8c0869649a Update alert messages to convey proper meaning
6 years ago
charitha 055d422e23 Publish geo alerts to cdm notifications
6 years ago
Geeth a553e9aada
Merge pull request #1250 from abhishekdesilva/master
6 years ago
abhishekdesilva fa9a52048e Add archive pending operations configuration
6 years ago
charitha 2a995deeb4 Prevent duplicate alerts & added owner field
6 years ago
charitha 919fedee20 Improved geo-fencing performance
6 years ago
charitha ead01f837d Fixed issue in Geo fencing
7 years ago
WSO2 Builder 8da1bcb741 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare for next development iteration
7 years ago
WSO2 Builder 9c0cbdc983 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare release v3.1.31
7 years ago
abhishekdesilva 4c067f0f28 Archival/Purging Task Improvement
7 years ago
charitha 2bfd598c67 Add location extraction from device properties and deice type specific location retrieval
7 years ago
charitha bccb88ab22 Fixed build issue due to okio
7 years ago
charitha 9623fb294a Fixed build issue due to okhttp
7 years ago
Charitha Goonetilleke d971c62009 Add device event filter API
7 years ago
lashanfaliq95 d843b71e1f remove stack trace
7 years ago
lashanfaliq95 1fedf9650c remove wildcard imports and log the error msg in filter api
7 years ago
lashanfaliq95 c8d0b10a38 update the device filter api
7 years ago
lashanfaliq95 3a7136abf9 complete the event filter
7 years ago
lashanfaliq95 e1ffd6341d filter implementation which gets all records and based on the timestamp
7 years ago
lashanfaliq95 431342fd0f filter implementation which gets all records
7 years ago
charitha 796acbda16 Add location extraction from device properties and deice type specific location retrieval
7 years ago
lashanfaliq95 c6a1508ee7 add the filter api
7 years ago
charitha 598632fc36 Fixed build issue due to okio
7 years ago
charitha 636e71883c Fixed build issue due to okhttp
7 years ago
WSO2 Builder 0aec365dce [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare for next development iteration
7 years ago
WSO2 Builder ca890ac346 [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare release v3.1.30
7 years ago
madhawap b2a12f09e4 Make proxy configuration optional
7 years ago
WSO2 Builder 2e5db59398 [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare for next development iteration
7 years ago
WSO2 Builder 964d92eb7f [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare release v3.1.29
7 years ago
Madhawa Perera b87763dba1
Add capability to WSO2 IOT server to route HTTP/HTTPS calls through Proxy server (#1244)
7 years ago
WSO2 Builder 79d48bb1a8 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare for next development iteration
7 years ago
WSO2 Builder f05750b794 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare release v3.1.28
7 years ago
Rasika Perera ceb2ff5d9c
Merge pull request #1243 from rasika/master
7 years ago
Rasika Perera a22b2b324d Hide 'Select All' option when there're only single mandatory claim.
7 years ago
WSO2 Builder 2fcb647957 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare for next development iteration
7 years ago
WSO2 Builder 2f519baf67 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare release v3.1.27
7 years ago
GDLMadushanka 1ecb9b0495 Merge branch 'testCaseFixes' of https://github.com/GDLMadushanka/carbon-device-mgt into testCaseFixes
7 years ago
GDLMadushanka 05cffeb1e7 fix
7 years ago
GDLMadushanka 0fba2f1b24 Fix issues in test-cases
7 years ago
GDLMadushanka 4f591bd41d Fix issues in test-cases
7 years ago
WSO2 Builder 7431cde12a [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare for next development iteration
7 years ago
WSO2 Builder aa429e230c [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare release v3.1.26
7 years ago
Madawa Soysa 6b579d760e Remove example part of the comment
7 years ago
Madawa Soysa 6b8d555314 Add a delay for data tables server side paging
7 years ago
WSO2 Builder 7620d7ea5d [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare for next development iteration
7 years ago
WSO2 Builder 5fd8aeef89 [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare release v3.1.25
7 years ago
Rasika Perera 49584eb8f2
Merge pull request #1240 from rasika/master
7 years ago
Rasika Perera 5f37af8fd1 Fixes for multiple datatables overlapping function call points
7 years ago
Rasika Perera 9e3b17c65d Fix advanced operationsbar overlapping when multiple tables exists.
7 years ago
WSO2 Builder 3201dfcfa9 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare for next development iteration
7 years ago
WSO2 Builder 86000e93b2 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare release v3.1.24
7 years ago
Rasika Perera 272d64b0b2 Fix PaginationRequest.getProperty() method doesn't return anything
7 years ago
WSO2 Builder ac7e71282e [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare for next development iteration
7 years ago
WSO2 Builder 1c135b9e18 [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare release v3.1.23
7 years ago
geethkokila 54fc0be69f Fix the device information delete issue
7 years ago
WSO2 Builder 7dd3f29ff7 [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare for next development iteration
7 years ago
WSO2 Builder 03dd153f6f [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare release v3.1.22
7 years ago
Rasika Perera 4be47123b3
Merge pull request #1235 from rasika/master
7 years ago
WSO2 Builder db8a5afdf8 [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare for next development iteration
7 years ago
WSO2 Builder bb0c498b3a [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare release v3.1.21
7 years ago
Rasika Perera f14564339a Fix formatting issues
7 years ago
Rasika Perera 703a4cbb12 Add further fixes for the jwt-grant dependency issue
7 years ago
Arcane94 f6de4bb424 minor change in a function
7 years ago
WSO2 Builder 10cf201da7 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare for next development iteration
7 years ago
WSO2 Builder 2c73d73860 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare release v3.1.20
7 years ago
WSO2 Builder 7a6e33ca49 Merge commit '790641a2aa9bba74f3dedb0f9a3c3fb9491cfd80' into 6975a622-1dc6-4b54-86ab-b5021d7e0e74
7 years ago
WSO2 Builder 790641a2aa [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare for next development iteration
7 years ago
WSO2 Builder efb54864c6 [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare release v3.1.19
7 years ago
Rasika Perera 4c8fb7b5c2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
Rasika Perera df6e43eac5 Adding privacy policy and cookie policy
7 years ago
Madawa Soysa e5eeb78d09 Generate nav menu icons based on correct permissions
7 years ago
WSO2 Builder 7fe945f1bf [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare for next development iteration
7 years ago
WSO2 Builder 555a349fd6 [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare release v3.1.18
7 years ago
charitha f62cb4febd Add missing media type
7 years ago
WSO2 Builder f7f13f2052 [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare for next development iteration
7 years ago
WSO2 Builder d44ac973cb [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare release v3.1.17
7 years ago
Rasika Perera 6316daa13a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
Rasika Perera b865dc7823 Update license header
7 years ago
Rasika Perera 583b17d405 Add login.do, retry.do and consent.do
7 years ago
WSO2 Builder a51a3cd6a4 [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare for next development iteration
7 years ago
WSO2 Builder f416cecb9e [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare release v3.1.16
7 years ago
charitha 481d381ca7 Fixed exception in subscribing APIs
7 years ago