Commit Graph

5834 Commits

Author SHA1 Message Date
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