community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,454 Commits 31 Branches 461 Tags 183 MiB
35a62ae52e
Commit Graph

6019 Commits

Author SHA1 Message Date
Charitha Goonetilleke
e25d536210 Introduce new API for user search based on user attributes 
Closes product-iots#6
See merge request entgra/carbon-device-mgt!31
 2018-10-27 12:26:59 +00:00
WSO2 Builder
764b119ae5 [WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare for next development iteration 2018-10-24 19:03:29 +00:00
WSO2 Builder
1bbbce9ac3 [WSO2 Release] [Jenkins #3050] [Release 3.1.49] prepare release v3.1.49 2018-10-24 19:03:17 +00:00
geethkokila
2bb3e2cdc0 Fixing the SQL 2018-10-25 00:11:49 +05:30
WSO2 Builder
5005cebbff [WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare for next development iteration 2018-10-24 04:01:39 +00:00
WSO2 Builder
5d688d8c4f [WSO2 Release] [Jenkins #3048] [Release 3.1.48] prepare release v3.1.48 2018-10-24 04:01:27 +00:00
lasanthaDLPDS
e76fe92ebe Fix device monitoring task disabling issue 2018-10-24 08:29:35 +05:30
Madawa Soysa
6795cbb180 Add IMEI parameter to custom parameters of the advanced search 
Fixes entgra/product-iots#8
 2018-10-24 13:53:13 +11:00
Madawa Soysa
5300a7f363 Fix device advanced search 
Device search button was not functioning due to a id mismatch. This
commit fixes the issue.

Fixes entgra/product-iots#7
 2018-10-24 13:52:28 +11:00
WSO2 Builder
a18b4550ef [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare for next development iteration 2018-10-22 19:13:35 +00:00
WSO2 Builder
9c77054795 [WSO2 Release] [Jenkins #3046] [Release 3.1.47] prepare release v3.1.47 2018-10-22 19:13:23 +00:00
Madawa Soysa
9b5cb1ef6a Fix issue with search not updating 
Related: entgra/product-iots#6
 2018-10-22 17:47:32 +11:00
charitha
128b5f64aa Fixed NPE in sending push notifications 2018-10-22 10:36:58 +05:30
Madawa Soysa
6aca4650e2 Introduce new API for user search based on user attributes 
This commit introduces a new API to search users based on user claims such as First Name, Last Name, Email, etc. This new API can be used to filter users through a search query. Also this commit includes the UI modifications to modify the exiting user listing page to allow filter users by attributes.

Fixes to entgra/product-iots#6
 2018-10-22 13:41:30 +11:00
WSO2 Builder
8eaa7c6698 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare for next development iteration 2018-10-21 13:35:14 +00:00
WSO2 Builder
03b88248b8 [WSO2 Release] [Jenkins #3044] [Release 3.1.46] prepare release v3.1.46 2018-10-21 13:34:59 +00:00
charitha
3856a25449 Fixed authentication issue in deploying execution plans as non admin user 2018-10-21 14:30:06 +05:30
WSO2 Builder
bfff9e7a7e [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare for next development iteration 2018-10-18 06:51:09 +00:00
WSO2 Builder
af64244ab3 [WSO2 Release] [Jenkins #3042] [Release 3.1.45] prepare release v3.1.45 2018-10-18 06:50:57 +00:00
Ace
3f77a3b27c Adding correct tenant ID 2018-10-18 11:55:20 +05:30
Ace
92bf6f4140 Fixing formatting issues 2018-10-18 11:36:12 +05:30
Ace
b39be48919 Adding constants 2018-10-18 11:31:10 +05:30
Ace
8bc15e1f14 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-10-18 11:24:10 +05:30
Ace
4aee621039 Fixing tenanted username 2018-10-17 20:30:17 +05:30
Ace
1721824d53 Fixing issue where super tenant table space is querried instead of relavent tenant when retrieving geo location data 2018-10-17 16:49:29 +05:30
Milan Perera
a01886cb37 Handle NotNow response from device 2018-10-16 21:12:05 +05:30
WSO2 Builder
e7a9406789 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare for next development iteration 2018-10-16 13:39:36 +00:00
WSO2 Builder
b87b073739 [WSO2 Release] [Jenkins #3040] [Release 3.1.44] prepare release v3.1.44 2018-10-16 13:39:24 +00:00
Milan Perera
b256d55847 Handle NotNow response from device 2018-10-16 17:41:39 +05:30
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 2018-10-12 10:44:53 +05:30
WSO2 Builder
806ac13c39 [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare for next development iteration 2018-10-12 03:58:28 +00:00
WSO2 Builder
e3901043fc [WSO2 Release] [Jenkins #3038] [Release 3.1.43] prepare release v3.1.43 2018-10-12 03:58:17 +00:00
Geeth
5ee7cba36a
Merge pull request #1264 from ruwany/master 
Persisting profile operations as string values instead of Objects
 2018-10-12 09:11:58 +05:30
Ace
cb0fb87b49 Fixing test failures and adding enhancements 2018-10-11 16:37:13 +05:30
Ace
4b71c6ec40 Operation retrieval logic changed to retrieve operation details via table merge instead of secondary DB call 2018-10-11 14:21:26 +05:30
Ace
de9cf67977 fixing issues with notification status not getting updated 2018-10-10 22:35:05 +05:30
WSO2 Builder
3782e68f27 [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare for next development iteration 2018-10-10 13:11:05 +00:00
WSO2 Builder
3111680b9f [WSO2 Release] [Jenkins #3036] [Release 3.1.42] prepare release v3.1.42 2018-10-10 13:10:53 +00:00
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 2018-10-10 18:37:37 +05:30
Ace
deeeb2ce48 Persisting profile operations as string payloads and retriving same as strings, failing which as profile objects to support legacy functonality 2018-10-10 11:20:45 +05:30
Ace
77db878951 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-10-09 13:59:28 +05:30
Ace
a8e52ee781 Fixing issue due to change in serialVersionUID after adding additional field to Operation DTO and correcting flaw in notification sending logic 2018-10-09 13:57:02 +05:30
WSO2 Builder
7186ed2f62 [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare for next development iteration 2018-10-08 18:01:00 +00:00
WSO2 Builder
60aee974ff [WSO2 Release] [Jenkins #3034] [Release 3.1.41] prepare release v3.1.41 2018-10-08 18:00:47 +00:00
charitha
5d13979629 Increased notification popup time 2018-10-08 23:11:51 +05:30
charitha
9381362a0a Provide workaround to address WS issue 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026
 2018-10-08 23:11:44 +05:30
Ace
1fa0591f4b Fixing issue with notification sending logic 2018-10-08 23:11:38 +05:30
charitha
1f2f85d691 Increased notification popup time 2018-10-08 23:07:36 +05:30
charitha
53e1d3abde Provide workaround to address WS issue 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026
 2018-10-08 22:52:55 +05:30
Ace
4b08dd6053 Fixing issue with notification sending logic 2018-10-06 15:46:47 +05:30
lasanthaDLPDS
c1a23bfed8 Add create new app release API 2018-10-06 10:35:40 +05:30
lasanthaDLPDS
425938e3a8 Add app release inserting API 2018-10-04 02:37:26 +05:30
lasanthaDLPDS
cd28edc6a3 Filx application getting API issue 2018-10-02 17:35:09 +05:30
lasanthaDLPDS
74be4d8a82 Improve application releases getting logic 2018-10-01 18:24:12 +05:30
lasanthaDLPDS
9978af097d Bump APPM version 2018-10-01 01:48:07 +05:30
lasanthaDLPDS
7388bcadce Merge master branch 2018-10-01 01:27:45 +05:30
lasanthaDLPDS
f37a478a99 Refactor the source 2018-10-01 01:21:52 +05:30
charitha
e12e7a3876 Add validation to event retrial 2018-09-30 21:57:29 +05:30
lasanthaDLPDS
1e4d14d837 Fix review managing issues 2018-09-29 23:06:32 +05:30
lasanthaDLPDS
54cee927f2 Fix transaction handeling issue 2018-09-29 23:06:32 +05:30
lasanthaDLPDS
4692eb5f92 Improve review management functionalities 2018-09-29 23:06:32 +05:30
inoshperera
a3b8cef1a2 Fixing connection issue, dao layer fixes 2018-09-29 18:15:58 +05:30
inoshperera
d9d0d0a5b8 add getLifecycleState check 2018-09-29 12:21:23 +05:30
inoshperera
853d095706 conflict fixes 2018-09-29 12:03:11 +05:30
inoshperera
dbc382716a fixing conflics and fixes to app update APIs 2018-09-29 10:41:17 +05:30
inoshperera
7dd7dc8d64 partial fix on app update apis -2 2018-09-29 09:40:31 +05:30
inoshperera
4e7f1e4047 partial fix on app update apis 2018-09-29 09:39:53 +05:30
Ubuntu
e5cc5284e3 [maven-release-plugin] prepare for next development iteration 2018-09-28 17:13:33 +00:00
Ubuntu
ae078fe390 [maven-release-plugin] prepare release v3.2.0 2018-09-28 17:12:41 +00:00
lasanthaDLPDS
2c9ea2b5cf Fix lifecycle adding issue 2018-09-28 17:57:04 +05:30
lasanthaDLPDS
b283c1dfde Improve lifecycle management 2018-09-28 04:10:07 +05:30
lasanthaDLPDS
409f6fce14 Fix get lifecycle issue 2018-09-27 18:47:54 +05:30
Milan Perera
53f8014730 Whitelabel devicemgt jaggeryapp 2018-09-27 11:09:13 +05:30
lasanthaDLPDS
f4e1ca6815 Improve publisher APIs 2018-09-27 09:24:31 +05:30
lasanthaDLPDS
abf9c05f0c Improve applications retreving method 2018-09-27 08:15:19 +05:30
lasanthaDLPDS
94d3f1b3b1 Fix SQL issues 2018-09-26 18:02:03 +05:30
charitha
034a15aa59 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 2018-09-26 14:23:04 +05:30
lasanthaDLPDS
6f020076c5 Fix API tags registering issue 2018-09-26 14:22:25 +05:30
lasanthaDLPDS
ea6a644682 Improve app manager functionalities 2018-09-25 18:31:54 +05:30
lasanthaDLPDS
7ecaf232f5 Fix store API deploying issue 2018-09-25 08:08:27 +05:30
lasanthaDLPDS
23e3732ac1 Fix build failure 2018-09-24 14:03:11 +05:30
Inosh Perara
df65b68597 app get by ID 2018-09-24 02:15:28 +00:00
inoshperera
f1e0b1a4fa adding get app by ID 2018-09-23 23:08:45 +05:30
Inosh Perara
107e46a0bc App create fixed 2018-09-23 16:22:38 +00:00
inoshperera
ae476d85df fixing conflicts 2018-09-23 21:30:28 +05:30
inoshperera
4512a4e2d7 working state on happy path app create 2018-09-23 21:17:24 +05:30
lasanthaDLPDS
c7956b7af1 Fix service registering issue 2018-09-23 20:08:52 +05:30
inoshperera
27e4dc14d3 add created related fixes 2018-09-23 16:20:48 +05:30
inoshperera
75008e38b8 Fixes to get create app working 2018-09-23 16:14:13 +05:30
lasanthaDLPDS
b0520ac976 Refactor the source: 2018-09-22 17:52:05 +05:30
lasanthaDLPDS
4562432509 Complete review management 2018-09-22 17:52:05 +05:30
lasanthaDLPDS
3e16ec96b9 Improve review management 2018-09-22 17:52:04 +05:30
inoshperera
2e0bacbd18 Bug fixes in app creation logic 2018-09-22 15:19:44 +05:30
inoshperera
21a87d8b8c fixing app get and few issues in app create 2018-09-21 22:16:36 +05:30
inoshperera
a0030a9b7f adding seriasation ID 2018-09-21 06:49:45 +05:30
inoshperera
b856aa36fe Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2018-09-21 06:41:34 +05:30
inoshperera
874a83cee5 fixing conflicts 2018-09-21 06:40:58 +05:30
inoshperera
a4e17ef99b Adding app install basics WIP 2018-09-21 06:37:59 +05:30
Dharmakeerthi Lasantha
d1095826b8 Merge branch 'application-mgt-new' into 'application-mgt-new' 
Fix DAO layer issues and improve review management

See merge request entgra/carbon-device-mgt!6
 2018-09-20 12:54:33 +00:00
lasanthaDLPDS
48f0636fa1 Fix DAO layer issues and improve review management 2018-09-20 18:21:44 +05:30
Madawa Soysa
9df8660bdf Add package name to ApplicationRelease and change ApplicationType enum 2018-09-20 16:55:34 +05:30
lasanthaDLPDS
d9daffcefc Remove review management tests 2018-09-20 15:21:53 +05:30
geethkokila
106632403e Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-20 15:08:05 +05:30
geethkokila
c23770db33 Fix the osgi and validate issues 2018-09-20 15:07:40 +05:30
lasanthaDLPDS
1bee1a2975 Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-20 11:58:56 +05:30
lasanthaDLPDS
1ea47c8361 Improve review mnagement WIP 2018-09-20 11:58:05 +05:30
geethkokila
7630cb0fb1 Fix the osgi issues 2018-09-20 11:52:25 +05:30
WSO2 Builder
353d6936db [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare for next development iteration 2018-09-19 15:36:32 +00:00
WSO2 Builder
8e2541b9ac [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare release v3.1.40 2018-09-19 15:36:20 +00:00
lasanthaDLPDS
f5615c5ec7 Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-19 18:46:27 +05:30
lasanthaDLPDS
6da8dada71 Improve comment management 2018-09-19 18:45:58 +05:30
Milan Perera
4c7bd0664d Fix issue in order of get pending operations 2018-09-19 16:30:41 +05:30
geethkokila
4ded86a134 Add app manager osgi fixes 2018-09-19 15:55:11 +05:30
charitha
b5ce0fdd03 Merge branch 'iots-3.3.1' into entgra-master 2018-09-19 13:15:21 +05:30
Milan Perera
7d59c342b2 Application mgt new (#7) 
* Improve lifecycle state management

* Add unit tests for lifecycle management

* Add class level comments to lifecycle management
 2018-09-19 11:21:40 +05:30
lasanthaDLPDS
421dc5edf1 Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-19 07:28:45 +05:30
lasanthaDLPDS
6066d93edd Add review management 2018-09-19 07:27:49 +05:30
Milan Perera
6a9cec4c89 Add scopes to publisher mgt API (#5) 2018-09-17 19:28:25 +05:30
inoshperera
1052888605 Test Case for StorageManagementUtilTest (#4) 
* Adding unit test for StorageManagementUtilTest.java

* formatting fixes
 2018-09-16 17:37:25 +05:30
inoshperera
8983fd6d51 formatting fixes 2018-09-16 17:32:41 +05:30
inoshperera
e6f099d43b Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-16 17:26:53 +05:30
inoshperera
a6cdbb856b Adding unit test for StorageManagementUtilTest.java 2018-09-16 17:26:20 +05:30
lasanthaDLPDS
ff96884268 Refactor the source 2018-09-16 08:55:09 +05:30
lasanthaDLPDS
b3874ee1ba Refactor the source 2018-09-16 01:57:08 +05:30
lasanthaDLPDS
f861134ff6 Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-15 22:45:26 +05:30
lasanthaDLPDS
4c5cdc75fe Adding application release creating logic 2018-09-15 22:44:24 +05:30
geethkokila
0dea5cd0aa Resolve conflicts 2018-09-15 21:59:51 +05:30
geethkokila
18c3ee23b9 Adding the changes for the app manager 2018-09-15 21:58:02 +05:30
inoshperera
57efe389ac Merge branch 'application-mgt-new' of https://github.com/lasanthaDLPDS/carbon-device-mgt into application-mgt-new 2018-09-15 17:45:30 +05:30
inoshperera
14ea6dbba8 fixing conflicts 2018-09-15 17:44:13 +05:30
inoshperera
61c0ebc995 Adding unit tests case infrastructure to core and adding unit testcases for ArtifactsParser.java 2018-09-15 17:30:38 +05:30
lasanthaDLPDS
3e2f757c1e Improve lifecycle management 2018-09-15 15:32:52 +05:30
lasanthaDLPDS
34fe427852 Add swagger annotations to ApplicationRelease bean 2018-09-15 13:18:20 +05:30
lasanthaDLPDS
f9ec82e4dc Merge with upstream 2018-09-15 12:50:18 +05:30
geethkokila
34fad87cce Fixing the conflicts 2018-09-15 11:57:29 +05:30
lasanthaDLPDS
a01ecdb9c3 Modify ArtifactParser and get the version of an artifact through ArtifatcParser 2018-09-15 02:22:40 +05:30
inoshperera
2011843736 Adding APK parcing and ipa parsing capability 2018-09-14 22:19:49 +05:30
charitha
b46e45dae4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-09-13 15:29:30 +05:30
charitha
fd8e73480d Order by on operation mapping ID 2018-09-13 15:28:58 +05:30
lasanthaDLPDS
222225121c Modify isRestricted data type 2018-09-13 13:08:40 +05:30
lasanthaDLPDS
4316cb0ef4 Add javadoc comments and improve logic 2018-09-12 18:20:05 +05:30
charitha
7ea609612c Revert "This is the fix for the intermittent issues when applying policies on devices" 
This reverts commit ba8537e
 2018-09-12 13:29:23 +05:30
WSO2 Builder
01991dcc4d [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare for next development iteration 2018-09-12 07:55:38 +00:00
WSO2 Builder
18b81223df [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare release v3.1.39 2018-09-12 07:55:26 +00:00
Milan Perera
576fa40cb0 Modify addOperation logic to improve the performance 2018-09-12 11:10:55 +05:30
Milan Perera
77f7792bc7 Fix wso2/product-iots#1863 2018-09-12 11:00:12 +05:30
lasanthaDLPDS
26568273e5 Improve app creating logic and comment management 2018-09-12 04:13:51 +05:30
lasanthaDLPDS
e5ef68fa3c Improve comment management 2018-09-11 17:39:19 +05:30
WSO2 Builder
cbbd327a02 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare for next development iteration 2018-09-11 06:43:08 +00:00
WSO2 Builder
de07597d53 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare release v3.1.38 2018-09-11 06:42:55 +00:00
aselarbd
ba8537e198 This is the fix for the intermittent issues when applying policies on devices 
Please find the GitHub issue from [1]

[1]: https://github.com/wso2/product-iots/issues/1833
 2018-09-10 11:56:59 +05:30
lasanthaDLPDS
2fd7601139 Refactor and modify storage management logic 2018-09-10 01:14:35 +05:30
lasanthaDLPDS
c950223283 Refactor the source 2018-09-09 21:21:17 +05:30
lasanthaDLPDS
1cce5d7e34 Improve app managing functionalties and refactor the source 2018-09-08 08:55:53 +05:30
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. 
Please find the GitHub issue from [1]

[1]: https://github.com/wso2/product-iots/issues/1827
 2018-09-07 14:56:31 +05:30
aselarbd
3ca4672ac6 This commit fix the issue "Change password option does not work from the portal IOT server 3.1.0 " 
For more info refer https://github.com/wso2/product-iots/issues/1835
 2018-09-07 14:21:14 +05:30
WSO2 Builder
3401a8c845 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare for next development iteration 2018-08-30 14:38:47 +00:00
WSO2 Builder
ecadadef94 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare release v3.1.37 2018-08-30 14:38:36 +00:00
geethkokila
2f428c8a58 Fix https://github.com/wso2/product-iots/issues/1857 
Filtering the activities based on the user who added the operation
 2018-08-30 18:01:12 +05:30
WSO2 Builder
2b6de6834b [maven-release-plugin] prepare for next development iteration 2018-08-30 09:30:45 +00:00
WSO2 Builder
16c6a27f81 [maven-release-plugin] prepare release v3.1.36 2018-08-30 09:30:34 +00:00
Geeth
a421c12d5e
Merge pull request #1255 from charithag/iots-3.3.1 
Update manager urls and product version
 2018-08-30 14:15:27 +05:30
charitha
22f02c4062 Update manager urls and product version 2018-08-30 11:51:16 +05:30
WSO2 Builder
252b260237 [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare for next development iteration 2018-08-22 10:22:19 +00:00
WSO2 Builder
a2422cb02a [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare release v3.1.35 2018-08-22 10:22:09 +00:00
Geeth
f5515bfa5f
Merge pull request #1252 from abhishekdesilva/master 
Checking for pending operations before adding an operation
 2018-08-22 15:37:21 +05:30
abhishekdesilva
85040f0c68 Log debug process completion 2018-08-21 15:00:14 +05:30
abhishekdesilva
4aad82437b Log info has changed into debug 2018-08-21 14:46:18 +05:30
abhishekdesilva
a0bc1cdd20 Reformatted the code block as necessary 2018-08-21 09:53:23 +05:30
WSO2 Builder
af7aa73886 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare for next development iteration 2018-08-20 15:59:37 +00:00
WSO2 Builder
47ed74c156 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare release v3.1.34 2018-08-20 15:59:26 +00:00
charitha
d54d78a02b Refactoring 2018-08-20 21:16:08 +05:30
charitha
82778f06c6 Add secure web socket proxy to route ws connections in IoTS cluster 2018-08-20 15:44:55 +05:30
lasanthaDLPDS
9379c2ae47 Fix build failure 2018-08-19 15:33:20 +05:30
lasanthaDLPDS
d293b5b1b8 Fix merge conflixts 2018-08-19 15:06:25 +05:30
lasanthaDLPDS
797652b741 Merge branch 'application-mgt-new' of https://github.com/wso2/carbon-device-mgt into application-mgt-new 2018-08-19 13:22:22 +05:30
WSO2 Builder
4848e271af [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare for next development iteration 2018-08-13 10:09:29 +00:00
WSO2 Builder
c79baf3392 [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare release v3.1.33 2018-08-13 10:09:18 +00:00
geethkokila
7d34928ac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-08-13 14:56:13 +05:30
geethkokila
1d427aef73 Fix https://github.com/wso2/product-iots/issues/1852 2018-08-13 14:55:00 +05:30
charitha
e858f5b627 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-08-13 12:21:24 +05:30
charitha
2cac0053ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImplTest.java
 2018-08-13 12:20:51 +05:30
abhishekdesilva
870ff031bb Checking for pending operations before adding an operation 2018-08-13 11:15:06 +05:30
WSO2 Builder
02282967ab [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare for next development iteration 2018-08-13 04:48:34 +00:00
WSO2 Builder
7daeb6efb9 [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare release v3.1.32 2018-08-13 04:48:24 +00:00
charitha
d2940bf7a1 Refactoring 2018-08-13 09:44:40 +05:30
charitha
47f619a136 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-08-11 08:29:45 +05:30
charitha
8c0869649a Update alert messages to convey proper meaning 2018-08-10 19:37:05 +05:30
charitha
055d422e23 Publish geo alerts to cdm notifications 2018-08-10 15:26:04 +05:30
Geeth
a553e9aada
Merge pull request #1250 from abhishekdesilva/master 
Add archive pending operations configuration
 2018-08-08 11:33:17 +05:30
abhishekdesilva
fa9a52048e Add archive pending operations configuration 2018-08-08 11:10:56 +05:30
charitha
2a995deeb4 Prevent duplicate alerts & added owner field 2018-08-03 22:31:24 +05:30
charitha
919fedee20 Improved geo-fencing performance 2018-07-31 16:00:12 +05:30
charitha
ead01f837d Fixed issue in Geo fencing 2018-07-26 12:23:47 +05:30
WSO2 Builder
8da1bcb741 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare for next development iteration 2018-07-26 06:48:42 +00:00
WSO2 Builder
9c0cbdc983 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare release v3.1.31 2018-07-26 06:48:31 +00:00
abhishekdesilva
4c067f0f28 Archival/Purging Task Improvement 2018-07-25 21:15:49 +05:30
charitha
2bfd598c67 Add location extraction from device properties and deice type specific location retrieval 2018-07-23 11:35:17 +05:30
charitha
bccb88ab22 Fixed build issue due to okio 2018-07-23 11:35:06 +05:30
charitha
9623fb294a Fixed build issue due to okhttp 2018-07-23 11:34:47 +05:30
Charitha Wijesinghe
d971c62009 Add device event filter API 
See merge request entgra/carbon-device-mgt!2
 2018-07-23 06:02:23 +00:00
lashanfaliq95
d843b71e1f remove stack trace 2018-07-20 16:15:07 +05:30
lashanfaliq95
1fedf9650c remove wildcard imports and log the error msg in filter api 2018-07-20 10:05:18 +05:30
lashanfaliq95
c8d0b10a38 update the device filter api 2018-07-16 18:08:52 +05:30
lashanfaliq95
3a7136abf9 complete the event filter 2018-07-15 10:58:09 +05:30
lashanfaliq95
e1ffd6341d filter implementation which gets all records and based on the timestamp 2018-07-13 17:50:39 +05:30
lashanfaliq95
431342fd0f filter implementation which gets all records 2018-07-11 19:51:12 +05:30
charitha
796acbda16 Add location extraction from device properties and deice type specific location retrieval 2018-07-11 10:28:14 +05:30
lashanfaliq95
c6a1508ee7 add the filter api 2018-07-11 09:26:01 +05:30
charitha
598632fc36 Fixed build issue due to okio 2018-07-07 09:23:44 +05:30
charitha
636e71883c Fixed build issue due to okhttp 2018-07-06 22:40:07 +05:30
WSO2 Builder
0aec365dce [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare for next development iteration 2018-05-15 08:24:46 +00:00
WSO2 Builder
ca890ac346 [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare release v3.1.30 2018-05-15 08:24:36 +00:00
madhawap
b2a12f09e4 Make proxy configuration optional 
As per the current configurations it is mandatory to set a value for http.nonProxyHosts property in order to server to run on 'change-ip' mode. With this modification it is made optional where even without this property IoT server can be run on 'change-ip' mode. 'Change-ip' mode is where server is configured to run on a different IP other than localhost
 2018-05-15 13:23:41 +05:30
Dharmakeerhi Lasantha
bc162d05fd
Merge pull request #1199 from NishadiPrasangini/AppManager 
App manager
 2018-04-23 11:17:34 +05:30
WSO2 Builder
2e5db59398 [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare for next development iteration 2018-04-18 10:06:19 +00:00
WSO2 Builder
964d92eb7f [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare release v3.1.29 2018-04-18 10:06:04 +00:00
Madhawa Perera
b87763dba1
Add capability to WSO2 IOT server to route HTTP/HTTPS calls through Proxy server (#1244) 
* Fix IoT Server HTTP/HTTPS calls bypassing a Proxy server

Since the Feign client is not supporting proxy routing this fix has included okhttp client and pass it to the feigns okkhttp client wrapper in order to pass HTTP/HTTPS call through proxy server if the system proxy properties are set. Further this modifies the apache http client also to pick system properties.

fixes wso2/product-iots#1806

* Remove unwanted comments and commented lines

* Remove the localhost host check

* Add default non proxy hosts

Added localhost as a default non proxy host

* use the version property from parent pom

Use the version property, "github.openfeign.version" from parent pom instead of hard-coding the version range
 2018-04-18 15:18:59 +05:30
WSO2 Builder
79d48bb1a8 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare for next development iteration 2018-03-28 08:36:21 +00:00
WSO2 Builder
f05750b794 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare release v3.1.28 2018-03-28 08:36:10 +00:00
Rasika Perera
ceb2ff5d9c
Merge pull request #1243 from rasika/master 
Hide 'Select All' option when there're only single mandatory claim.
 2018-03-28 13:51:55 +05:30
Rasika Perera
a22b2b324d Hide 'Select All' option when there're only single mandatory claim. 2018-03-28 12:46:26 +05:30
WSO2 Builder
2fcb647957 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare for next development iteration 2018-03-28 05:13:35 +00:00
WSO2 Builder
2f519baf67 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare release v3.1.27 2018-03-28 05:13:25 +00:00
GDLMadushanka
1ecb9b0495 Merge branch 'testCaseFixes' of https://github.com/GDLMadushanka/carbon-device-mgt into testCaseFixes 2018-03-28 10:09:09 +05:30
GDLMadushanka
05cffeb1e7 fix 2018-03-28 10:07:40 +05:30
GDLMadushanka
0fba2f1b24 Fix issues in test-cases 2018-03-28 10:00:09 +05:30
GDLMadushanka
4f591bd41d Fix issues in test-cases 2018-03-28 09:49:21 +05:30
lasanthaDLPDS
c755dc018a Add Application updating functionality 2018-03-28 00:08:42 +05:30
WSO2 Builder
7431cde12a [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare for next development iteration 2018-03-23 05:51:48 +00:00
WSO2 Builder
aa429e230c [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare release v3.1.26 2018-03-23 05:51:38 +00:00
Madawa Soysa
6b579d760e Remove example part of the comment 2018-03-23 11:03:49 +05:30
Madawa Soysa
6b8d555314 Add a delay for data tables server side paging 
DataTables library instantiates an ajax request for each key release when searching/filtering. in a system with a larger dataset, many requests are made to the back end for a longer keyword search which is a huge overload.

Also, sometimes since the request initialized for the first character returns the largest subset of data (if available) this request may take a longer time to process. Since DataTables update the table in the order that the response comes, the final result shown would be the last response received which can be incorrect.

This commit resolves the above issue by enabling a delay before the requests made using DataTables fnSetFilteringDelay plugin.
 2018-03-22 18:33:21 +05:30
lasanthaDLPDS
6c65aef26c Remove unnecessary imports 2018-03-22 00:29:19 +05:30
lasanthaDLPDS
d5b2bfd510 Modify Application and Release validation methods 
Ahis commit contaisns followings. Added a query to get application release when application id and release UUID is passed. Modified application validation method and removed unnecessary logic. Modified Application release validation method aand removed unnecessary logic. As a result of these modifications, modified relevant method calls as well
 2018-03-21 23:53:46 +05:30
lasanthaDLPDS
47a02dc903 Add permision check and app status check for deletion 2018-03-21 17:41:32 +05:30
lasanthaDLPDS
a05c412d77 Copy publisher and store web apps into IoTS webapp folder 
Added p2.inf configuration to copy store and publisher web apps into IoTS webapp folder
 2018-03-20 18:10:49 +05:30
lasanthaDLPDS
0b78df50a7 Add application deleting functionality 
Modified DAO layer. When delete an application it is moved to REMOVED status.
 2018-03-20 17:43:37 +05:30
lasanthaDLPDS
c95733a781 Add iOS applications and Web Clip publishing functionality 
This commit contains followings
Added dependencies for URL validation and plist parsing.
Added version retrieval functionality for iOS application
Added WEB clip publishing functionality.
In order to compatible with above functionalities modified the source
 2018-03-20 17:14:15 +05:30
WSO2 Builder
7620d7ea5d [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare for next development iteration 2018-03-20 06:51:22 +00:00
WSO2 Builder
5fd8aeef89 [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare release v3.1.25 2018-03-20 06:51:13 +00:00
Rasika Perera
49584eb8f2
Merge pull request #1240 from rasika/master 
Fix advanced operationsbar overlapping when multiple tables exists.
 2018-03-20 11:51:31 +05:30
Rasika Perera
5f37af8fd1 Fixes for multiple datatables overlapping function call points 2018-03-20 11:50:44 +05:30
Rasika Perera
9e3b17c65d Fix advanced operationsbar overlapping when multiple tables exists. 2018-03-20 10:17:46 +05:30
lasanthaDLPDS
b45d11bfdc Fix issues in swagger definition 2018-03-20 09:54:24 +05:30
WSO2 Builder
3201dfcfa9 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare for next development iteration 2018-03-20 02:16:46 +00:00
WSO2 Builder
86000e93b2 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare release v3.1.24 2018-03-20 02:16:36 +00:00
Rasika Perera
272d64b0b2 Fix PaginationRequest.getProperty() method doesn't return anything 2018-03-20 07:31:11 +05:30
lasanthaDLPDS
976d0ad60d Modify application retrieval API 
As per the API designing best practices, added offset and limit query parameters for application getting API.
 2018-03-19 20:37:30 +05:30
lasanthaDLPDS
71aa6762ac Refactor APPM DAO Layer 
Refactored the APPM DAO layer. Further verified and added required functionality to compatible with other DBMS, such as Oracle, PostgreSQL, MSSQL
 2018-03-19 18:41:23 +05:30
WSO2 Builder
ac7e71282e [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare for next development iteration 2018-03-16 12:27:13 +00:00
WSO2 Builder
1c135b9e18 [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare release v3.1.23 2018-03-16 12:26:59 +00:00
geethkokila
54fc0be69f Fix the device information delete issue 2018-03-16 17:23:45 +05:30
WSO2 Builder
7dd3f29ff7 [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare for next development iteration 2018-03-16 11:15:13 +00:00
WSO2 Builder
03dd153f6f [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare release v3.1.22 2018-03-16 11:14:57 +00:00
Rasika Perera
4be47123b3
Merge pull request #1235 from rasika/master 
Update carbon-device-mgt dependencies
 2018-03-16 16:21:58 +05:30
WSO2 Builder
db8a5afdf8 [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare for next development iteration 2018-03-16 10:36:01 +00:00
WSO2 Builder
bb0c498b3a [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare release v3.1.21 2018-03-16 10:35:50 +00:00
Rasika Perera
f14564339a Fix formatting issues 2018-03-16 15:39:57 +05:30
Rasika Perera
703a4cbb12 Add further fixes for the jwt-grant dependency issue 2018-03-16 15:37:04 +05:30
Arcane94
f6de4bb424 minor change in a function 2018-03-16 15:17:58 +05:30
WSO2 Builder
10cf201da7 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare for next development iteration 2018-03-16 08:50:22 +00:00
WSO2 Builder
2c73d73860 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare release v3.1.20 2018-03-16 08:50:11 +00:00
WSO2 Builder
7a6e33ca49 Merge commit '790641a2aa9bba74f3dedb0f9a3c3fb9491cfd80' into 6975a622-1dc6-4b54-86ab-b5021d7e0e74 2018-03-16 08:38:14 +00:00
WSO2 Builder
790641a2aa [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare for next development iteration 2018-03-16 08:23:46 +00:00
WSO2 Builder
efb54864c6 [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare release v3.1.19 2018-03-16 08:23:35 +00:00
Rasika Perera
4c8fb7b5c2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-16 13:50:12 +05:30
Rasika Perera
df6e43eac5 Adding privacy policy and cookie policy 2018-03-16 13:49:53 +05:30
Madawa Soysa
e5eeb78d09 Generate nav menu icons based on correct permissions 
This commit fixes the mismatching permissions which are checked while generating navigation menu icons.
- Correct the wrong permission string used for configuration management.
- Introduce a new UI permission for certificate management.
- Move device type link under "owning device permission" which is the permission declared in the JAX-RS implementation.

Resolves wso2/product-iots#1782
 2018-03-16 13:36:38 +05:30
WSO2 Builder
7fe945f1bf [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare for next development iteration 2018-03-15 22:28:55 +00:00
WSO2 Builder
555a349fd6 [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare release v3.1.18 2018-03-15 22:28:45 +00:00
charitha
f62cb4febd Add missing media type 2018-03-16 01:46:41 +05:30
WSO2 Builder
f7f13f2052 [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare for next development iteration 2018-03-15 17:52:55 +00:00
WSO2 Builder
d44ac973cb [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare release v3.1.17 2018-03-15 17:52:45 +00:00
Rasika Perera
6316daa13a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-15 23:07:06 +05:30
Rasika Perera
b865dc7823 Update license header 2018-03-15 23:04:38 +05:30
Rasika Perera
583b17d405 Add login.do, retry.do and consent.do 
This implements following fixes/improvements;
* Adding an intermediate for user to accept consents.
* Fixing issue of not redirected to the consent.do
* Authentication failure page
 2018-03-15 23:02:16 +05:30
WSO2 Builder
a51a3cd6a4 [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare for next development iteration 2018-03-15 16:58:58 +00:00
WSO2 Builder
f416cecb9e [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare release v3.1.16 2018-03-15 16:58:48 +00:00
charitha
481d381ca7 Fixed exception in subscribing APIs 2018-03-15 20:21:18 +05:30
WSO2 Builder
41358a41a5 [WSO2 Release] [Jenkins #2979] [Release 3.1.15] prepare for next development iteration 2018-03-15 11:37:04 +00:00
WSO2 Builder
d679faecca [WSO2 Release] [Jenkins #2979] [Release 3.1.15] prepare release v3.1.15 2018-03-15 11:36:53 +00:00
geethkokila
7aab14c07d Fix the path parameter 2018-03-15 16:50:04 +05:30
WSO2 Builder
5a1b4b154e [WSO2 Release] [Jenkins #2977] [Release 3.1.14] prepare for next development iteration 2018-03-15 09:37:25 +00:00
WSO2 Builder
50232e10a5 [WSO2 Release] [Jenkins #2977] [Release 3.1.14] prepare release v3.1.14 2018-03-15 09:37:14 +00:00
Ruwan Yatawara
88924ac8d6 Correcting issue with events resource path 2018-03-15 14:31:44 +05:30
WSO2 Builder
f265ddc736 [WSO2 Release] [Jenkins #2975] [Release 3.1.13] prepare for next development iteration 2018-03-14 20:15:12 +00:00
WSO2 Builder
221fb27c6c [WSO2 Release] [Jenkins #2975] [Release 3.1.13] prepare release v3.1.13 2018-03-14 20:14:58 +00:00
geethkokila
dbf4ff0132 Add a temporary fix for api subscription issue 2018-03-15 01:28:05 +05:30
WSO2 Builder
7d1183274d [WSO2 Release] [Jenkins #2973] [Release 3.1.12] prepare for next development iteration 2018-03-14 17:51:27 +00:00
WSO2 Builder
1e875dc00b [WSO2 Release] [Jenkins #2973] [Release 3.1.12] prepare release v3.1.12 2018-03-14 17:51:16 +00:00
Dharmakeerhi Lasantha
e9e7368b55
Merge pull request #1226 from geethkokila/master 
Fix the api publishing issue
 2018-03-14 23:07:42 +05:30
geethkokila
9dcc9d9ddc Fix the api publishing issue 2018-03-14 23:05:50 +05:30
WSO2 Builder
1c3bca244a [WSO2 Release] [Jenkins #2971] [Release 3.1.11] prepare for next development iteration 2018-03-14 17:01:33 +00:00
WSO2 Builder
4140ba7e76 [WSO2 Release] [Jenkins #2971] [Release 3.1.11] prepare release v3.1.11 2018-03-14 17:01:23 +00:00
Rasika Perera
5d1e4ed99e
Merge pull request #1225 from rasika/master 
Adding filter value options for data-dep-status and data-boolean
 2018-03-14 22:16:26 +05:30
Rasika Perera
b04af49594 Fix minor formatting issue 2018-03-14 22:15:16 +05:30
Rasika Perera
f3da8d4a57 Adding filter value options for data-dep-status and data-boolean 2018-03-14 22:07:20 +05:30
WSO2 Builder
d2163025f2 [WSO2 Release] [Jenkins #2969] [Release 3.1.10] prepare for next development iteration 2018-03-14 15:15:04 +00:00
WSO2 Builder
494b4db66b [WSO2 Release] [Jenkins #2969] [Release 3.1.10] prepare release v3.1.10 2018-03-14 15:14:53 +00:00