Commit Graph

6644 Commits

Author SHA1 Message Date
Jayasanka
c904587599 Created class for add new app 2019-03-27 19:17:37 +05:30
Jayasanka
f8ec1be9b8 Overrided css class for header 2019-03-27 19:17:07 +05:30
Jayasanka
3c50af2a14 Removed unused routs 2019-03-26 23:04:07 +05:30
Jayasanka
ab4b5d1764 Created Layout for dashboard 2019-03-26 22:40:28 +05:30
Jayasanka
536a2ca81b Created new routes with router config 2019-03-26 22:40:07 +05:30
lasanthaDLPDS
9876d8685c Refactor the source 2019-03-26 18:25:24 +05:30
lasanthaDLPDS
b2260b6919 Add modification to app creating flow 2019-03-25 21:07:44 +05:30
lasanthaDLPDS
02b99eb442 Merge branch 'application-mgt-new' of gitlab.com:tcdlpds/carbon-device-mgt into application-mgt-new 2019-03-23 02:32:08 +05:30
lasanthaDLPDS
5717e81cfb modefying DAO layer 2019-03-23 02:31:47 +05:30
Geeth Munasinghe
cf11ed671c Adding todos 2019-03-22 15:02:01 +05:30
lasanthaDLPDS
6e25a0bc3e Improve DB connection handling 2019-03-21 22:21:30 +05:30
Jayasanka
15f38ba101 Added login to router 2019-03-21 20:00:41 +05:30
Jayasanka
7ee7384969 Changed webpack to absolute path 2019-03-21 19:59:40 +05:30
lasanthaDLPDS
dc518dcca2 Add modification for app getting logic 2019-03-21 18:58:50 +05:30
Jayasanka
40e9fbebb8 Created Component for Sub Routes 2019-03-21 14:36:51 +05:30
lasanthaDLPDS
9dc885e888 Fix minor issues in APPM publisher 2019-03-21 01:47:39 +05:30
lasanthaDLPDS
3c9ba37bfb Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-03-20 23:25:30 +05:30
jayasanka
c7cb3319eb Added routings 2019-03-20 22:21:14 +05:30
lasanthaDLPDS
ed780cbe9a Fix app release deleting API 2019-03-20 21:45:22 +05:30
lasanthaDLPDS
29efebdb99 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-03-20 18:45:10 +05:30
lasanthaDLPDS
b3fb1f2234 Add modification for app manager publisher 2019-03-20 18:44:23 +05:30
jayasanka
3dc7758d20 Created login page 2019-03-20 01:57:01 +05:30
jayasanka
9361a70023 Removed comments 2019-03-20 01:55:19 +05:30
jayasanka
ea2dd0a024 configured of LESS Module in webpack 2019-03-19 22:41:17 +05:30
jayasanka
2a5cc97de9 Fixed routing 2019-03-19 21:42:57 +05:30
lasanthaDLPDS
b440c57147 Improve APPM publisher logic 2019-03-18 06:00:00 +05:30
jayasanka
6ad21b473e added new files 2019-03-14 17:25:35 +05:30
jayasanka
f010304eba Added ant design to the publisher 2019-03-14 17:22:20 +05:30
lasanthaDLPDS
69b65aa073 Remove unnecessary files 2019-03-14 15:02:07 +05:30
lasanthaDLPDS
d7c92612f1 Add new UI theme dependencies 2019-03-14 14:57:13 +05:30
lasanthaDLPDS
98d14b0815 Fix merge conflicts 2019-03-13 12:09:29 +05:30
lasanthaDLPDS
49c1279dd5 APPM publisher UI deploying as web app 2019-03-13 03:06:52 +05:30
Saad Sahibjan
625fb7d07e Allow webclips installation via enrollment app install policy 2019-03-12 22:00:49 +05:30
Saad Sahibjan
a9a01c045e Add copy commands to copy UserValidateManagement and OAuth2TokenManagement synapse APIs to IoTs pack 2019-03-12 10:33:13 +00:00
lasanthaDLPDS
fbcb1d0e32 Add modification to application creating logic 2019-03-05 02:48:17 +05:30
lasanthaDLPDS
0cb26066c5 Fix lifecycle instance initiating issue 2019-03-04 19:07:50 +05:30
Saad Sahibjan
0d084242d0 Increase length of VALUE_FIELD column in DM_DEVICE_INFO table 2019-03-04 16:35:39 +05:30
lasanthaDLPDS
911bc6f9a0 Fix application getting issue 2019-03-04 10:25:13 +05:30
lasanthaDLPDS
e2acb5c4c8 Fix application installing issue 2019-03-04 02:57:08 +05:30
lasanthaDLPDS
a7a8a9c6df Improve APPM publisher functionality and add UI source 2019-03-03 08:36:20 +05:30
inoshperera
a39d567e85 fix License text loading inconsistency in tenants 2019-02-02 18:20:11 +05:30
lasanthaDLPDS
f92ae35e4b Fix the task running issue in tenant mode
If a run time error encountered while sending a notification(e.g:- Push Notification ) to a device when the task is running for tenants, it terminates the task running and notifications won't be sending to devices which are enrolled to other tenants as well. Hence cath the exception in sendNotification method and log.

Further, since this is critical path, added few debug logs as well.
2019-01-28 11:56:49 +05:30
Inosh Perara
ecd35c34e4 Merge branch 'master' into 'master'
Add enrollment notification sending feature

See merge request entgra/carbon-device-mgt!38
2019-01-28 05:48:01 +00:00
lasanthaDLPDS
7975563530 Improve the payload of enrollment notification 2019-01-24 17:41:53 +05:30
lasanthaDLPDS
c4c92f0faa Adding application management initial pub UI 2019-01-23 14:26:16 +05:30
charitha
2380a22d53 Commit transaction after changing status 2019-01-21 15:36:42 +05:30
lasanthaDLPDS
e852c62663 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt 2019-01-21 10:54:37 +05:30
lasanthaDLPDS
b90766b5a4 Add enrollment notification sending feature 2019-01-18 08:04:40 +05:30
charitha
026bd175e9 Reformat & fix API publishing issue to Gateway 2019-01-17 22:46:32 +05:30
charitha
8b34253bc1 Optimize functionality 2019-01-17 15:28:12 +05:30
charitha
3d42175bea Merge branch 'master' of https://gitlab.com/ruwany.ace/carbon-device-mgt into entgra-master 2019-01-17 14:00:22 +05:30
Ace
18078c51e8 bug fixes 2019-01-17 13:53:42 +05:30
Ace
59186155d0 Adding new apis to update devices status/get count/get list based on status 2019-01-17 12:35:06 +05:30
charitha
e78a2a1279 Merge remote-tracking branch 'entgra/master' into entgra-master 2019-01-14 15:24:15 +05:30
charitha
75dd9321af Add methods to get device count based on status and device type 2019-01-14 15:24:01 +05:30
Saad Sahibjan
ae9dd807cc Enrollment application install feature for policy 2019-01-01 08:19:53 +00:00
Madawa Soysa
6f80d1993d Move private constants to a public constant class 2018-12-13 20:21:59 +11:00
Madawa Soysa
eea040f391 Remove redundant authorization check and fix the test 2018-12-09 14:01:45 +11:00
Madawa Soysa
001649e5fd Fix issue with advanced search to pick the correct enrollment
This commit addresses following two issues,

1. Advanced search feature returns the oldest enrollment instance

This issue occurs when the same device is enrolled for multiple users. The cause of the issue is filtering the devices by device identifier which is a unique property for a device. This commit fixes the issue by filtering the devices from enrollment id and owner instead of the device identifier.

2. All devices do not return for privileged users when searched through advanced-search

The cause of the issue is not considering the user permissions when filtering the devices. This commit fixes the issue by validating the permissions of the logged in user before filtering.

Fixes entgra/product-iots#13
Fixes entgra/product-iots#14
2018-12-04 23:04:25 +11:00
lasanthaDLPDS
f810c1a7e4 Fix minor issues and add app manager UI into the feature 2018-11-21 08:01:51 +05:30
lasanthaDLPDS
b6a0b75f05 Fix build failure 2018-11-18 14:04:14 +05:30
lasanthaDLPDS
8841741567 Fiz merge conflicts 2018-11-18 08:05:35 +05:30
Entgra Builder
cbe85378d8 [maven-release-plugin] prepare for next development iteration 2018-11-11 13:25:02 +00:00
Entgra Builder
4b1f83b168 [maven-release-plugin] prepare release v3.2.1 2018-11-11 13:24:57 +00:00
charitha
c3893d93bb Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2018-11-11 14:28:00 +05:30
charitha
4deb71229c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-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.handlers/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
#	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.cert.admin.v09.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml
#	components/certificate-mgt/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/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.data.publisher/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml
#	components/device-mgt/pom.xml
#	components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
#	components/email-sender/pom.xml
#	components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
#	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/test-coverage/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.handler.server.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.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.device.type.deployer.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.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.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.basics.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/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
2018-11-11 14:27:32 +05:30
Ace
880720a72f Fixing issue with task scheduler 2018-11-09 21:51:42 +05:30
WSO2 Builder
b4e8bb4da0 [WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare for next development iteration 2018-10-30 16:02:55 +00:00
WSO2 Builder
e482894fbd [WSO2 Release] [Jenkins #3054] [Release 3.1.51] prepare release v3.1.51 2018-10-30 16:02:44 +00:00
charitha
10672ea534 Fixed date format issue in geofencing 2018-10-30 20:47:31 +05:30
charitha
d936aea03a Fixed pom issues 2018-10-30 14:45:54 +05:30
charitha
f0ec4a3520 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-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.handlers/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
#	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.cert.admin.v09.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml
#	components/certificate-mgt/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/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.data.publisher/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
#	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/dto/operation/mgt/Operation.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/ProfileOperationDAOImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/pom.xml
#	components/device-mgt/pom.xml
#	components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
#	components/email-sender/pom.xml
#	components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
#	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/test-coverage/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.handler.server.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.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.device.type.deployer.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.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.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.basics.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/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
2018-10-30 14:29:37 +05:30
WSO2 Builder
1bd160f551 [WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare for next development iteration 2018-10-30 07:42:23 +00:00
WSO2 Builder
b45aef9fec [WSO2 Release] [Jenkins #3052] [Release 3.1.50] prepare release v3.1.50 2018-10-30 07:42:11 +00:00
charitha
86029752f8 Fixed https://github.com/wso2/product-iots/issues/1184 2018-10-29 21:03:24 +05:30
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
charitha
47de05c2e1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 17:50:32 +05:30
charitha
f6d5498240 Add privacy policy consent 2018-03-14 17:50:17 +05:30
WSO2 Builder
31f11433bb [WSO2 Release] [Jenkins #2967] [Release 3.1.9] prepare for next development iteration 2018-03-14 11:23:00 +00:00
WSO2 Builder
a3773032ce [WSO2 Release] [Jenkins #2967] [Release 3.1.9] prepare release v3.1.9 2018-03-14 11:22:50 +00:00
Geeth
d69ce0b9a1
Merge pull request #1223 from charithag/master
Updated API Publisher & Store extensions after bumping versions
2018-03-14 16:38:37 +05:30
WSO2 Builder
fa014fb838 [WSO2 Release] [Jenkins #2965] [Release 3.1.8] prepare for next development iteration 2018-03-14 10:29:02 +00:00
WSO2 Builder
e2218ed497 [WSO2 Release] [Jenkins #2965] [Release 3.1.8] prepare release v3.1.8 2018-03-14 10:28:52 +00:00
WSO2 Builder
eac2de37b2 Merge commit 'a73300b693013ab64bdf11dab9f626e4837eec04' into 34580e6a-6593-4c6a-8b11-5da48c102194 2018-03-14 10:16:37 +00:00
WSO2 Builder
a73300b693 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare for next development iteration 2018-03-14 09:53:11 +00:00
WSO2 Builder
fa5300cec1 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare release v3.1.7 2018-03-14 09:52:58 +00:00
charitha
3fda0a1459 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 15:14:25 +05:30
Rasika Perera
108675261f
Merge pull request #1193 from lashanfaliq95/master
Updated the last-known api to be able to return a number of records.
2018-03-14 15:14:07 +05:30
charitha
6f19ca3e20 Fixed test failures 2018-03-14 15:13:27 +05:30
WSO2 Builder
8282e69e12 Merge commit '46c4111b1dbaf85b9c413254f376c651488a5f57' into e61b2ead-a0d6-41af-8fb3-d2c404e569e2 2018-03-14 09:33:55 +00:00
lashanfaliq95
d60b885045 changed the parameters "type" and "deviceId" as required for the last-know api. 2018-03-14 14:44:47 +05:30
WSO2 Builder
46c4111b1d [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare for next development iteration 2018-03-14 09:08:39 +00:00
WSO2 Builder
28ec21a4f3 [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare release v3.1.6 2018-03-14 09:08:27 +00:00
Rasika Perera
5ea66b2125
Merge pull request #1214 from n-jay/dep-ui2
UI implementation for DEP management of iOS devices
2018-03-14 14:22:12 +05:30
Rasika Perera
815cea8ab1
Merge pull request #1215 from Arcane94/geoFencing
Adding geofencing feature to geo devices dashboard
2018-03-14 14:20:39 +05:30
geethkokila
7cb9685bc6 Fix the api publisher and store update 2018-03-14 14:13:04 +05:30
Ruwan
af4f3302ad
Merge pull request #1222 from rasika/master
Adding an extension point into the PaginationRequest class
2018-03-14 13:59:10 +05:30
lashanfaliq95
b4f78337fa last-known api
updated the comment of the api and handled the error when a negative
value is passed as the limit.
2018-03-14 13:49:11 +05:30
Rasika Perera
e996f1f9f0 Adding an extension point into the PaginationRequest class
This allows other APIs which has additional parameters to be passed into
the backend DAOs
2018-03-14 13:20:11 +05:30
Arcane94
50a14e4321 Requested changes 2018-03-14 12:05:21 +05:30
Arcane94
e778700a5e Some more license year changes 2018-03-14 12:05:21 +05:30
Arcane94
0aff4193d3 License year changes and comment changes 2018-03-14 12:05:21 +05:30
Arcane94
8c303911b0 Final frontend and backend changes 2018-03-14 12:05:21 +05:30
Arcane94
1ffaad6fb7 rolling back some imports 2018-03-14 11:59:54 +05:30
Arcane94
27ae7cfed8 Fix for adding alerts twice with same name bug 2018-03-14 11:57:01 +05:30
Arcane94
9e64c8971d Minor changes in execution plans 2018-03-14 11:46:38 +05:30
Arcane94
7c88dfa0b3 Minor changes in backend APIs 2018-03-14 11:46:38 +05:30
Arcane94
7583957e16 Execution Plans and other updates 2018-03-14 11:46:38 +05:30
Arcane94
790f91b3b7 Add method overloads 2018-03-14 11:46:38 +05:30
WSO2 Builder
10f32aa150 [WSO2 Release] [Jenkins #2961] [Release 3.1.5] prepare for next development iteration 2018-03-14 06:01:28 +00:00
WSO2 Builder
b2c969ef85 [WSO2 Release] [Jenkins #2961] [Release 3.1.5] prepare release v3.1.5 2018-03-14 06:01:18 +00:00
Charitha Goonetilleke
6922a8693f
Merge pull request #1221 from geethkokila/master
Add GDPR fixes
2018-03-14 05:46:06 +00:00
n-jay
84c683a02b Edit nav-menu to include change DEP management page visibility logic 2018-03-14 11:03:37 +05:30
n-jay
43feaf7bc7 Add DEP management icon to navmenu
The DEP management page is formed once the iOS plugin has been deployed
within the IoT Home. Till then, any functionality with regards to DEP
management is not present within the server.
An icon in the navmenu allows users to access the DEP management page.

This commit includes the feature where the navmenu detects if the iOS
plugin has been deployed and accordingly displays the icon to access
the DEP management page.
2018-03-14 10:56:47 +05:30
WSO2 Builder
ffb28d018b [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare for next development iteration 2018-03-14 04:57:03 +00:00
WSO2 Builder
66591d3680 [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare release v3.1.4 2018-03-14 04:56:53 +00:00
geethkokila
ec3f814133 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 10:05:48 +05:30
Charitha Goonetilleke
329e41b04c
Merge pull request #1197 from Arcane94/master
Fixed https://github.com/wso2/carbon-device-mgt/issues/1194
2018-03-14 04:25:21 +00:00
n-jay
280a63bdbd Remove UI API scopes from config file 2018-03-13 15:13:22 +05:30
Lashan Faliq
51753ebbbf Merge branch 'master' into master 2018-03-13 14:48:50 +05:30
n-jay
a36a5aa279 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-13 12:23:41 +05:30
Kamidu Sachith Punchihewa
5bd42415b2
Merge pull request #1209 from lasanthaDLPDS/master
Fix formatting issues
2018-03-13 11:05:23 +05:30
n-jay
69ac1edc9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-13 09:48:19 +05:30
WSO2 Builder
0f272ff4ed [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare for next development iteration 2018-03-13 04:16:58 +00:00
WSO2 Builder
ac9d20af2f [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare release v3.1.3 2018-03-13 04:16:48 +00:00
WSO2 Builder
bbe144e25f [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare for next development iteration 2018-03-12 11:42:26 +00:00
WSO2 Builder
7ee1bdacb6 [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare release v3.1.2 2018-03-12 11:42:16 +00:00
WSO2 Builder
b31c31b410 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare for next development iteration 2018-03-12 11:15:23 +00:00
WSO2 Builder
ab8cd3f8e3 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare release v3.1.1 2018-03-12 11:15:13 +00:00
lasantha
04527696eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-12 16:36:33 +05:30
Rasika Perera
7860e02814
Merge pull request #1217 from lasanthaDLPDS/geet_3.3.0
Fix OAuth2ScopeValidator Issues
2018-03-12 16:32:40 +05:30
lasantha
9629101a85 Fix OAuth2ScopeValidator Issues
Due to the version bumping of the identity component, there were some references to the deprecated methods. Hence removed those and referred approved methods. In addition to that, to compatible with WSO2 cording standards, reformat the source as well.
2018-03-12 15:31:14 +05:30
WSO2 Builder
748798df4c [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare for next development iteration 2018-03-12 09:51:53 +00:00
WSO2 Builder
e0704671de [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare release v3.1.0 2018-03-12 09:51:43 +00:00
geethkokila
71f1ff96e6 Update device-mgt component version (3.1.0) 2018-03-12 14:57:21 +05:30
n-jay
7eab9e914d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-12 14:29:08 +05:30
n-jay
fedd2a3257 Added iOS DEP management page to navbar 2018-03-12 14:28:24 +05:30
n-jay
1cfcc3a599 Added iOS DEP API scopes in UI config file 2018-03-12 14:27:12 +05:30
WSO2 Builder
9ba315217c [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare for next development iteration 2018-03-12 08:42:09 +00:00
WSO2 Builder
96ee898b50 [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare release v3.0.244 2018-03-12 08:41:56 +00:00
geethkokila
7a25109882 Changing the carbon commons versions and api-registration endpoint 2018-03-12 11:30:28 +05:30
geethkokila
812c715c09 Bump the versions of other components
This commits changes the versions of other components and fixes the compilation errors and test failures
2018-03-12 11:30:28 +05:30
lasantha
f9559a510b Remove tenant id from the Application Release bean 2018-03-12 11:14:15 +05:30
lasantha
e00aa1be09 Fix build failure
Removed application release management service refernce from the ApplicationManagementUtil.java
2018-03-12 11:13:07 +05:30
lasantha
6f18a70d4b Add application release updating logic into the service layer
Adding application release updating logic and application release creating logic into the service layer.
2018-03-12 11:07:47 +05:30
lasantha
f83b466955 Format the application management API source 2018-03-12 11:00:29 +05:30
lasantha
8b505a7741 Reformat the DAO layer and add application release updating SQL logic
In order to fix DAO issues and improve the logic, modified the DAO layer. Further added generic application release SQL to update application release.
2018-03-12 10:57:23 +05:30
lasantha
1b7451327e Remove application release management service source.
The application release management service source is moved to application management service. Therefore removed the application release management service source from the application management component.
2018-03-12 10:45:45 +05:30
geethkokila
fbd7ba2afb Changing the carbon commons versions and api-registration endpoint 2018-03-12 09:24:53 +05:30
lasantha
8efcfca877 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-11 01:10:33 +05:30
WSO2 Builder
93422ae12d [WSO2 Release] [Jenkins #2945] [Release 3.0.243] prepare for next development iteration 2018-03-09 12:28:00 +00:00
WSO2 Builder
e4bc050806 [WSO2 Release] [Jenkins #2945] [Release 3.0.243] prepare release v3.0.243 2018-03-09 12:27:50 +00:00
Madhawa Perera
3fa513cabd
Fix UI loading issue on Safari 11.0.3 (#1212)
* Fix UI loading issue on Safari 11.0.3

Fix the issue of operation logs and location doesn't display on device detail page on safari browser 11.0.3

Fixes wso2/product-iots#1752

* Add comments describing code lines
2018-03-09 17:43:33 +05:30
geethkokila
62098b2c1c Bump the versions of other components
This commits changes the versions of other components and fixes the compilation errors and test failures
2018-03-09 16:57:21 +05:30
Arcane94
2fb5ec431a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-09 14:46:56 +05:30
WSO2 Builder
873bff0042 [WSO2 Release] [Jenkins #2943] [Release 3.0.242] prepare for next development iteration 2018-03-08 14:28:50 +00:00
WSO2 Builder
8b63813d84 [WSO2 Release] [Jenkins #2943] [Release 3.0.242] prepare release v3.0.242 2018-03-08 14:28:40 +00:00
shavidissa
b9cde9b936 Updated the swagger content - Groups (#1211)
* Updated the swagger content for the APIs used to add devices to groups

* Formatting the swagger content
2018-03-08 19:45:14 +05:30
lasantha
24a9a7f23d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-08 13:43:08 +05:30
geethkokila
9f9fd963a9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-08 10:22:36 +05:30
WSO2 Builder
997bf0d16b [WSO2 Release] [Jenkins #2941] [Release 3.0.241] prepare for next development iteration 2018-03-08 04:29:13 +00:00
WSO2 Builder
aabdc33dc1 [WSO2 Release] [Jenkins #2941] [Release 3.0.241] prepare release v3.0.241 2018-03-08 04:29:02 +00:00
Shavindri Dissanayake
ead0e202d6 updating the swagger content 2018-03-07 19:34:45 +05:30
lasantha
fc30d00ecd Fix minor DAO layer issues 2018-03-05 17:57:04 +05:30
lasantha
b0eafe7180 Fixed application management issues and improve functionalities 2018-03-05 17:15:40 +05:30
lasantha
7278408b44 Refactored the source code 2018-03-05 17:15:40 +05:30
lasantha
c3f04eeed0 refactored the Application management DAO layer 2018-03-05 17:15:39 +05:30
lasantha
6e3cc085ff Fixed application getting issues and improved the application getting functionality
Improved application functionalities. Modified service layer, DAO layer and API layer
2018-03-05 17:14:48 +05:30
lasantha
ef0e7ee738 adding sorting orders 2018-03-05 17:11:44 +05:30
lasantha
9f609964b7 adding application types 2018-03-05 17:11:44 +05:30
lasantha
6b0e281112 Adding APK file validation functionalty
To implement apk file validation we are using external library. APK parser: https://github.com/hsiafan/apk-parser
2018-03-05 17:11:44 +05:30
lasantha
460a356bee Adding Application management functionalities and API
Adding application, application lifecycle and application release management business logic and also API implementation
2018-03-05 17:11:44 +05:30
lasantha
5ee9983305 modified application management store API
This is WIP API and in order to avoid build failure commented few lines and those need to be fixed when the development continues
2018-03-05 17:11:44 +05:30
lasantha
c3d0b375a5 Adding App storing functionalities
Adding App deleting, editing and storing fucntionalities and fixed related bugs. To delete application artifacts, used recursive method and validation application is removed from the storage management. Since application validation is doing at application management and it is guaranteed that storage management is called after the application management removed the application validation from storage management
2018-03-05 17:11:44 +05:30
lasantha
2cbf78d464 Fixed issues in Generic DAO Impl 2018-03-05 17:11:44 +05:30
Arcane94
1716fc4500 logic changes of the fix 2018-03-05 16:46:50 +05:30
lasantha
0aef14bdbe Fix the issue in certificate-mgt-admin-v0.9 copyright text 2018-03-05 11:07:03 +05:30
lasantha
e30ce5bcbd Format certificate-mgt-v0.9 source 2018-03-05 10:59:29 +05:30
Arcane94
c0024ce26f Exception name change and minor modifications 2018-03-05 10:42:26 +05:30
geethkokila
b50c657b6b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-05 10:09:22 +05:30
lasantha
831fdcb335 Fix the issue in device-mgt-v0.9 copyright text 2018-03-05 01:29:32 +05:30
lasantha
1d53023fdc Fix the issue in certificate-mgt-v0.9 copyright text 2018-03-05 01:28:42 +05:30
lasantha
c86c976fe6 Format the source of geofence 2018-03-05 00:29:16 +05:30
WSO2 Builder
af430cba61 [WSO2 Release] [Jenkins #2939] [Release 3.0.240] prepare for next development iteration 2018-03-03 19:12:01 +00:00
WSO2 Builder
60190f36ef [WSO2 Release] [Jenkins #2939] [Release 3.0.240] prepare release v3.0.240 2018-03-03 19:11:50 +00:00
charitha
ab4f2b4833 Add response status to device property update API and improve db connection handling in device property update 2018-03-03 22:47:32 +05:30
charitha
dbc08da314 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-03 22:43:05 +05:30
WSO2 Builder
cafbfebfb1 [WSO2 Release] [Jenkins #2937] [Release 3.0.239] prepare for next development iteration 2018-03-03 16:24:17 +00:00
WSO2 Builder
08e9f918cf [WSO2 Release] [Jenkins #2937] [Release 3.0.239] prepare release v3.0.239 2018-03-03 16:24:06 +00:00
Rasika Perera
d3de6ea7f9
Merge pull request #1207 from rasika/rasika-geo
Fixing minor UI issue in Geo Analytics
2018-03-03 21:43:29 +05:30
Rasika Perera
97767fa6d4
Fixing minor UI issue in Geo Analytics 2018-03-03 21:27:23 +05:30
WSO2 Builder
ce73acb26e [WSO2 Release] [Jenkins #2935] [Release 3.0.238] prepare for next development iteration 2018-03-03 06:51:15 +00:00
WSO2 Builder
15de1dfd83 [WSO2 Release] [Jenkins #2935] [Release 3.0.238] prepare release v3.0.238 2018-03-03 06:51:05 +00:00
Madawa Soysa
e617273c3d Fix policy view interface loading issue (#1206)
* Fix policy view interface loading issue

When the policy view page is loaded some of the variables of the policyPayloadObj becomes undefined or null.  This commit checks for the empty and undefined variables.

Relates wso2/product-iots#1681

* Fix formatting issues
2018-03-03 12:09:54 +05:30
charitha
ad3f7928f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-02 17:46:21 +05:30
geethkokila
5fdf91d4ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-02 12:10:53 +05:30
WSO2 Builder
0bbdf7a65f [WSO2 Release] [Jenkins #2933] [Release 3.0.237] prepare for next development iteration 2018-03-01 17:52:06 +00:00
WSO2 Builder
13e63e41ac [WSO2 Release] [Jenkins #2933] [Release 3.0.237] prepare release v3.0.237 2018-03-01 17:51:55 +00:00
Arcane94
46dbbdbcb8 Year change in license details 2018-03-01 23:15:14 +05:30
lasantha
9c85c4afdd Fix operation log and device view displaying issue
As a result of syntax issue, device view and operation logs viewing is broken. Therefore fixed the syntax issue.

This Resolves wso2/product-iots#1728
2018-03-01 22:14:36 +05:30
WSO2 Builder
9a06578ac2 [WSO2 Release] [Jenkins #2931] [Release 3.0.236] prepare for next development iteration 2018-02-28 17:32:14 +00:00
WSO2 Builder
5d36bd5312 [WSO2 Release] [Jenkins #2931] [Release 3.0.236] prepare release v3.0.236 2018-02-28 17:32:02 +00:00
Rasika Perera
f8840547cf
Merge pull request #1204 from rasika/master
Add search by device name filter
2018-02-28 22:43:56 +05:30
Rasika Perera
170e6d5349 Add search by device name filter 2018-02-28 22:37:02 +05:30
WSO2 Builder
b7e85c213b [WSO2 Release] [Jenkins #2929] [Release 3.0.235] prepare for next development iteration 2018-02-28 16:54:14 +00:00
WSO2 Builder
b70e0252c4 [WSO2 Release] [Jenkins #2929] [Release 3.0.235] prepare release v3.0.235 2018-02-28 16:54:02 +00:00
Rasika Perera
88e1b925bb
Merge pull request #1202 from rasika/fix-1724
Fix the issue of an error printed when shutting down the IoT Server
2018-02-28 22:13:50 +05:30
Rasika Perera
f766e4c10e
Merge pull request #1203 from lasanthaDLPDS/master
Adding debug logs and formatting the source
2018-02-28 22:13:28 +05:30
WSO2 Builder
d2f18ddbc9 [WSO2 Release] [Jenkins #2927] [Release 3.0.234] prepare for next development iteration 2018-02-28 14:52:48 +00:00
WSO2 Builder
8f1f8eefe4 [WSO2 Release] [Jenkins #2927] [Release 3.0.234] prepare release v3.0.234 2018-02-28 14:52:38 +00:00
WSO2 Builder
62c9ed3e1e Merge commit '30bb2a866566422f83a21ac95ee661c28572e5ff' into 21083545-a8aa-47e3-8c3d-99350689e63e 2018-02-28 14:41:13 +00:00
WSO2 Builder
30bb2a8665 [WSO2 Release] [Jenkins #2926] [Release 3.0.233] prepare for next development iteration 2018-02-28 14:28:44 +00:00
lasantha
fc982eab67 remove unnecessary empty lines 2018-02-28 19:58:40 +05:30
WSO2 Builder
a325b3c6c0 [WSO2 Release] [Jenkins #2926] [Release 3.0.233] prepare release v3.0.233 2018-02-28 14:28:32 +00:00
lasantha
8df53899d6 remove unnecessary imports 2018-02-28 19:56:18 +05:30
lasantha
0ce103e1ad Format the source code
In order to equivalent with WSO2 coding standards modified the source code
2018-02-28 19:53:35 +05:30
Rasika Perera
6e6b9e963e
Merge pull request #1201 from rasika/master
Update documentation anchor links
2018-02-28 19:50:25 +05:30
Rasika Perera
7696319021
Merge pull request #1200 from milanperera/r-320
Fix issues in data archival feature
2018-02-28 19:47:17 +05:30
lasantha
18b1f7830d Add debug logs for Device Management Plugin Repository
It is important to have debugged logs when finding the root causes for some issues.Hence added those to the Device Management Plugin Repository.
2018-02-28 19:44:55 +05:30
Rasika Perera
7ad790be54 Fix error log printed when undeploying the devicemgt provider
Resolves https://github.com/wso2/product-iots/issues/1724

(cherry picked from commit c72d4ea)
2018-02-28 19:41:04 +05:30
Rasika Perera
028ae524c2 Updating v3.1.0 into v.3.2.0 2018-02-28 19:10:31 +05:30
WSO2 Builder
8a06a494c4 [WSO2 Release] [Jenkins #2924] [Release 3.0.232] prepare for next development iteration 2018-02-28 13:06:34 +00:00
WSO2 Builder
f7e3cd9c3c [WSO2 Release] [Jenkins #2924] [Release 3.0.232] prepare release v3.0.232 2018-02-28 13:06:24 +00:00
Rasika Perera
166b7b6891 Updating doc links
Resolving https://github.com/wso2/product-iots/issues/1694
2018-02-28 18:10:36 +05:30
Milan Perera
415aac1ce0 Fix issues in data archival feature
There were few issues regarding the data retreiving SQL query and archived config operations
2018-02-28 18:09:10 +05:30
geethkokila
3610d68fe6 Add alert ui view for the cookie policy and privacy policy
This changes the styles and wording for the privacy and cookie policy
2018-02-28 12:25:27 +05:30
nishadi
565087f4f2 Changed CommentManagementAPIImpl
Message of the errors were changed.
2018-02-28 12:16:20 +05:30
nishadi
b5c28943ee Changed CommentManagementAPIImpl
changed returning null into response ok.
2018-02-28 11:22:51 +05:30
nishadi
2981a1537e Changed CommentManagementAPIImpl
changed returning null into response ok.
2018-02-28 11:21:41 +05:30
geethkokila
b5dfe80e3d Add privacy and cookie policy url
Adding the cookie and privacy policy url to the register page
2018-02-28 10:33:10 +05:30
geethkokila
a277e7996a Add privacy and cookie policy url
Adding the cookie and privacy policy url to the login page
2018-02-28 10:27:10 +05:30
nishadi
f82368990f Changed CommentManagementAPIImpl 2018-02-27 17:23:49 +05:30
nishadi
0ac0efcf2e Add new methods
Exception handling test methods for rating methods
2018-02-27 17:22:08 +05:30
nishadi
e70899a193 Add new methods
Exception handling test methods for rating methods
2018-02-27 16:47:12 +05:30
nishadi
55a005e992 Add new methods
Exception handling test methods for rating methods
2018-02-27 15:36:27 +05:30
geethkokila
b78e6d6d01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-27 14:36:13 +05:30
nishadi
dab9208168 Add new methods
TestAddCommentInternalError and TestDeleteComment.
2018-02-27 13:04:38 +05:30
nishadi
dff3cf7645 Reformatted the codes 2018-02-26 23:30:11 +05:30
kamidu
8bab4601f4 Removing unsupported js operations
To enable IE support removed the => operation frommthe logic
2018-02-26 23:17:29 +05:30
nishadi
9936bda78b CommentManagementAPITest class
adding copyright message.
2018-02-26 23:14:17 +05:30
nishadi
891c3410ee CommentManagementAPITest class
adding copyright message.
2018-02-26 22:56:39 +05:30
kamidu
967582d0c3 changing the java scrip to support IE
The current or each funtion is not supported my IE and EGDE browsers so we replace that logic with JQuery each to suport IE and EDGE browsers
2018-02-26 15:45:23 +05:30
nishadi
87d48dca98 Reformat CommentManagementAPITest class 2018-02-24 19:14:10 +05:30
nishadi
37f595d382 Added CommentManagementAPITest class
Test of CommentManagementAPI class
2018-02-24 18:56:09 +05:30
nishadi
97915e29be Application mgt api Pom.xml changed 2018-02-24 18:40:18 +05:30
nishadi
20c1ba1052 CommentManager
Tenant Id variable was added to CommentManagerImpl class.
2018-02-24 18:39:25 +05:30
nishadi
471e6e3b21 CommentManagerImpl
Variable values changed.
2018-02-24 18:37:47 +05:30
nishadi
072d8b6455 CommentManagementAPIImpl 2018-02-24 18:34:27 +05:30
nishadi
7d22c45636 CommentManagementAPIImpl 2018-02-24 18:33:38 +05:30
nishadi
c26903c446 CommentManagementAPIImpl
variable redundant reduced.
2018-02-24 18:32:33 +05:30
nishadi
c3f8d15910 CommentManagementAPIImpl
newStar variable changed.
2018-02-24 18:31:10 +05:30
nishadi
ef059800e2 CommentManagementAPIImpl
CommentManagementAPIImpl class moved to store/api/services/impl directory.
2018-02-24 18:29:31 +05:30
nishadi
b60f3f0a9e CommentManagementApi
CommentManagementApi class moved to store/api/services directory.
2018-02-24 18:28:13 +05:30
nishadi
c216048b57 Test Resources
log4j.properties and testng.xml files added.
2018-02-24 18:25:48 +05:30
nishadi
09a2c484f0 CommentMgtTestHelper
Dummy data for comments Testing.
2018-02-24 18:21:32 +05:30
Arcane94
832eb0c6a8 Adding license details to AlertAlreadyExist class 2018-02-24 15:29:09 +05:30
Arcane94
50503fc7c0 Fixing the issue when defining alerts with same name 2018-02-24 15:15:36 +05:30
lashanfaliq95
7a1c17081b fixed the issues 2018-02-23 18:15:15 +05:30
WSO2 Builder
6b99197b54 [WSO2 Release] [Jenkins #2922] [Release 3.0.231] prepare for next development iteration 2018-02-23 10:20:25 +00:00
WSO2 Builder
313918c656 [WSO2 Release] [Jenkins #2922] [Release 3.0.231] prepare release v3.0.231 2018-02-23 10:20:15 +00:00
WSO2 Builder
13a116c7e3 Merge commit 'f0cbe36ebee1f2dde088a9f70d9009350d998775' into c95329e5-bd9c-4d79-820a-d63940dc2c8c 2018-02-23 10:07:54 +00:00
Madawa Soysa
de9480e721
Merge pull request #1196 from lasanthaDLPDS/master
Formatting device-location API
2018-02-23 15:26:07 +05:30
WSO2 Builder
f0cbe36ebe [WSO2 Release] [Jenkins #2921] [Release 3.0.230] prepare for next development iteration 2018-02-23 09:56:02 +00:00
WSO2 Builder
a688f56892 [WSO2 Release] [Jenkins #2921] [Release 3.0.230] prepare release v3.0.230 2018-02-23 09:55:52 +00:00
Kamidu Sachith Punchihewa
22929c3886
Merge pull request #1192 from Kamidu/master
Enable user's last name in the email template
2018-02-23 15:13:06 +05:30
lasantha
175c987b8a formatting device-location API 2018-02-23 14:29:49 +05:30
lashanfaliq95
65cfca7024 Updated the last-known api to be able to return a number of records. 2018-02-23 09:00:18 +05:30
geethkokila
2c0ca5c210 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-23 08:49:22 +05:30
WSO2 Builder
12e8639907 [WSO2 Release] [Jenkins #2919] [Release 3.0.229] prepare for next development iteration 2018-02-22 16:42:34 +00:00
WSO2 Builder
4f364288c5 [WSO2 Release] [Jenkins #2919] [Release 3.0.229] prepare release v3.0.229 2018-02-22 16:42:24 +00:00
Madawa Soysa
cecb988a01
Merge pull request #1188 from rasika/fix-1689
Fixing issue of the platform filter in devices listing page
2018-02-22 21:53:15 +05:30
kamidu
66a4e60b16 Enable user's last name in the email template
This is to enable the user's last name also to be included in the meta information list on email templates. When customizing the email template users can define to include both fist and last name to the content or title of the email
2018-02-22 17:53:24 +05:30
geethkokila
8cf1bd996c Adding the privacy api
This is has an api to delete device of users when they request
2018-02-22 15:54:09 +05:30
geethkokila
1d605d0921 Fixing the issue where Enrollment ID is not inclueded in some tables.
Fixing the issue where enrolment id is not included in the device-info, device-details, device-location, device-application-mapping tables. This fixes the https://github.com/wso2/product-iots/issues/1707
2018-02-22 15:54:08 +05:30
Ace
8895d0f94d Adding debug logs 2018-02-22 15:54:08 +05:30
Ace
a7b37a160b Removing un-necessary checks when retrieving getAllDeviceInfo 2018-02-22 15:54:08 +05:30
WSO2 Builder
5851c43e3f [WSO2 Release] [Jenkins #2917] [Release 3.0.228] prepare for next development iteration 2018-02-22 10:20:59 +00:00
WSO2 Builder
9e5ecfe204 [WSO2 Release] [Jenkins #2917] [Release 3.0.228] prepare release v3.0.228 2018-02-22 10:20:49 +00:00
Charitha Goonetilleke
c0615fee83
Merge pull request #1190 from ruwany/master
Removing code that leads to an exception when retrieved device count is 0
2018-02-22 15:27:23 +05:30
Ace
90d38bf699 Adding debug logs 2018-02-22 13:07:48 +05:30
Ace
fc7f80c543 Removing un-necessary checks when retrieving getAllDeviceInfo 2018-02-22 13:03:16 +05:30
WSO2 Builder
a29736e09e [WSO2 Release] [Jenkins #2915] [Release 3.0.227] prepare for next development iteration 2018-02-21 04:15:10 +00:00
WSO2 Builder
59265f4add [WSO2 Release] [Jenkins #2915] [Release 3.0.227] prepare release v3.0.227 2018-02-21 04:14:57 +00:00
Madawa Soysa
b911c9e169 Adding entity application mapping to the database
When an application installation request is made other than adding an application install operation a mapping between the devices and the installed applications are kept in the database. In a case where an enterprise wide installation happens a mapping is made with the respective entity and the application.

This commit implement the mapping function.

Related to issue wso2/product-iots#1688
2018-02-20 18:51:34 +05:30
kamidu
f87a3a6b08 Fixing the issue when marking as read notification
The issue occures when the notification id is larger than 45 due to the restiction on paramater size. I have removed the related validation in order to resolve the issue.
2018-02-20 14:33:33 +05:30
Rasika Perera
bc18d60c55 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1689 2018-02-20 14:28:21 +05:30
Rasika Perera
49f97f02e8 Fixing platform filtering not working correctly
Resolves https://github.com/wso2/product-iots/issues/1689
2018-02-20 14:28:03 +05:30
Ruwan
40ae5a09a2
Merge pull request #1184 from ruwany/master
Fixed https://github.com/wso2/carbon-device-mgt/issues/1175
2018-02-20 12:17:32 +05:30
Rasika Perera
8e3a298bb0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1689 2018-02-19 19:50:05 +05:30
Rasika Perera
528837ce1f Fixing platform filtering not working correctly
Resolves https://github.com/wso2/product-iots/issues/1689
2018-02-19 19:49:45 +05:30
WSO2 Builder
00b2ded5ea [WSO2 Release] [Jenkins #2910] [Release 3.0.226] prepare for next development iteration 2018-02-19 12:56:51 +00:00
WSO2 Builder
1a107902fe [WSO2 Release] [Jenkins #2910] [Release 3.0.226] prepare release v3.0.226 2018-02-19 12:56:37 +00:00
Charitha Goonetilleke
2832644d4b
Merge pull request #1187 from rasika/fix-1689
Fixing issue of devices listing page filters are not showing all the available filtering options
2018-02-19 18:14:21 +05:30
Rasika Perera
b5f4bd757a Fixing devices listing page filters are not showing all the available filtering options
Resolves https://github.com/wso2/product-iots/issues/1689
2018-02-19 17:23:22 +05:30
Madawa Soysa
debe93cb03 Improving application subscription API
Changing the DeviceIdentifier bean to the same as org.wso2.carbon.device.mgt.common.DeviceIdentifier and implement the install app device.

Adding an ApplicationInstallResponse as the response to respond with more information to the application install request.

related to wso2/product-iots#1688
2018-02-19 10:22:08 +05:30
Madawa Soysa
f66ff60ada Adding a method to retrieve Application by UUID
Application install request is made for a UUID which is associated with an application release. In order to get the details of the application to build the payload of the install application operation, it is required to get the application from the database related to the UUID.
2018-02-19 10:22:08 +05:30
Madawa Soysa
690eff6660 Refactoring mobile application subscription API 2018-02-19 10:22:08 +05:30
Ace
2516967159 Fixing test failure 2018-02-15 13:31:34 +05:30
lasantha
6792c21210 Rmoved the lifecycle managemt
Removed the lifecycle management core and formatted the source
2018-02-15 10:36:28 +05:30
Ace
e604532b28 Fixing fomatting issues 2018-02-15 08:50:16 +05:30
Ace
bba4b09284 Adding comments 2018-02-15 08:30:34 +05:30
Ace
81cb39a4a6 Fixed https://github.com/wso2/carbon-device-mgt/issues/1175 2018-02-14 21:27:39 +05:30
lasantha
9b1820dca5 Adding Lifecycle Management functionalities and fixed related bugs 2018-02-14 16:51:49 +05:30
WSO2 Builder
9c9a37b42b [WSO2 Release] [Jenkins #2908] [Release 3.0.225] prepare for next development iteration 2018-02-13 05:04:50 +00:00
WSO2 Builder
0d9364671a [WSO2 Release] [Jenkins #2908] [Release 3.0.225] prepare release v3.0.225 2018-02-13 05:04:36 +00:00
charitha
a876b65974 Fixed regression issues related to https://github.com/wso2/product-iots/issues/1671 2018-02-12 20:16:06 +05:30
Madawa Soysa
3a44421cea Fixing policy view interface not loading issue
When a policy is created and viewed the policy using the policy view icon the page keeps loading sometimes due to undefined deviceGroups variable inside the policyPayloadObj. 

This commit fixes this issue by improving the code where the null check has been made to check if the  deviceGroup is null. Also made few improvements in the code where the checks have been made.

Resolves wso2/product-iots#1681
2018-02-12 14:56:50 +05:30
WSO2 Builder
436fb63d93 [WSO2 Release] [Jenkins #2906] [Release 3.0.224] prepare for next development iteration 2018-02-10 17:15:41 +00:00
WSO2 Builder
3f095b4b6a [WSO2 Release] [Jenkins #2906] [Release 3.0.224] prepare release v3.0.224 2018-02-10 17:15:27 +00:00
charitha
c600719f3c Fixed https://github.com/wso2/product-iots/issues/1671 2018-02-10 21:48:30 +05:30
WSO2 Builder
ee53943d3e [WSO2 Release] [Jenkins #2904] [Release 3.0.223] prepare for next development iteration 2018-02-07 09:48:07 +00:00
WSO2 Builder
ac7126bc13 [WSO2 Release] [Jenkins #2904] [Release 3.0.223] prepare release v3.0.223 2018-02-07 09:47:53 +00:00
lasantha
fb8d9dd494 refactored the source and fixed some bugs 2018-02-07 00:14:01 +05:30
WSO2 Builder
01cd9eb3ef [WSO2 Release] [Jenkins #2902] [Release 3.0.222] prepare for next development iteration 2018-02-06 15:17:31 +00:00
WSO2 Builder
b5a10cc078 [WSO2 Release] [Jenkins #2902] [Release 3.0.222] prepare release v3.0.222 2018-02-06 15:17:16 +00:00
WSO2 Builder
65fe3ade2e [WSO2 Release] [Jenkins #2900] [Release 3.0.221] prepare for next development iteration 2018-02-06 10:02:17 +00:00
WSO2 Builder
2356b6114e [WSO2 Release] [Jenkins #2900] [Release 3.0.221] prepare release v3.0.221 2018-02-06 10:02:03 +00:00
Rasika Perera
afe66f237a Fix https://github.com/wso2/product-iots/issues/1659 (#1177) 2018-02-06 15:11:32 +05:30
lasantha
669881eae7 adding appliction release functionalites and fixed build failure 2018-02-05 19:23:57 +05:30
lasantha
f17c36d13f Added app release updating fucntionality and fixed APPM related bugs 2018-02-04 23:28:07 +05:30
lasantha
c392f0e57d merge with upstream and fixed conflicts 2018-02-04 04:13:14 +05:30
lasantha
fdac04dd3e complete app release getting flow and fixed related bugs 2018-02-04 04:05:04 +05:30
lasantha
569007514e Added app release creation method and fixed issues 2018-02-02 12:59:31 +05:30
WSO2 Builder
0b4882e667 [WSO2 Release] [Jenkins #2898] [Release 3.0.220] prepare for next development iteration 2018-02-01 06:22:08 +00:00
WSO2 Builder
647beefcab [WSO2 Release] [Jenkins #2898] [Release 3.0.220] prepare release v3.0.220 2018-02-01 06:21:54 +00:00
WSO2 Builder
82f2567255 [WSO2 Release] [Jenkins #2896] [Release 3.0.219] prepare for next development iteration 2018-01-29 12:03:48 +00:00
WSO2 Builder
14770bb7bd [WSO2 Release] [Jenkins #2896] [Release 3.0.219] prepare release v3.0.219 2018-01-29 12:03:34 +00:00
Rasika Perera
16b0615577
Merge pull request #1170 from rasika/fix-1629
Fixing group operations bar not shown when "Select All" is clicked
2018-01-29 17:11:00 +05:30
WSO2 Builder
83c74259cd [WSO2 Release] [Jenkins #2894] [Release 3.0.218] prepare for next development iteration 2018-01-29 11:23:51 +00:00
WSO2 Builder
5b4e6f1d4d [WSO2 Release] [Jenkins #2894] [Release 3.0.218] prepare release v3.0.218 2018-01-29 11:23:36 +00:00
Kamidu Sachith Punchihewa
952c1fe28d
Merge pull request #1173 from rasika/fix-1624
Fixing regression issues for the validations
2018-01-29 16:38:40 +05:30
Rasika Perera
7673dca496 Fixing regression issues 2018-01-29 16:24:36 +05:30
WSO2 Builder
9bbf7cc54a [WSO2 Release] [Jenkins #2892] [Release 3.0.217] prepare for next development iteration 2018-01-29 08:45:58 +00:00
WSO2 Builder
407ee4ed43 [WSO2 Release] [Jenkins #2892] [Release 3.0.217] prepare release v3.0.217 2018-01-29 08:45:43 +00:00
lasantha
317386afb8 bump version of the app manager component 2018-01-28 10:29:54 +05:30
lasantha
ae1c99f665 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into application-mgt-new 2018-01-28 09:27:16 +05:30
lasantha
02415dfd92 merge with upstream master 2018-01-28 09:26:30 +05:30
WSO2 Builder
3014089807 [WSO2 Release] [Jenkins #2890] [Release 3.0.216] prepare for next development iteration 2018-01-26 14:21:01 +00:00
WSO2 Builder
3dd8c8bf2f [WSO2 Release] [Jenkins #2890] [Release 3.0.216] prepare release v3.0.216 2018-01-26 14:20:44 +00:00
Rasika Perera
7db642a9be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1629 2018-01-26 19:43:55 +05:30
kamidu
bb0920ef7f code reformatted to resolve the exsisted code formatting issues 2018-01-26 17:56:38 +05:30
kamidu
3bcb1b729c improve the java script code of changing the text and visibility
Improved the logic in order to remove the unesssary text changes and visibility changes. and fix the code formatting issues found in the code.
2018-01-26 17:56:38 +05:30
kamidu
9cc76da4c2 Fix git issue https://github.com/wso2/product-iots/issues/1629
Fixes wso2/product-iots#1629
2018-01-26 17:56:38 +05:30
WSO2 Builder
2cd3b81aaa [WSO2 Release] [Jenkins #2888] [Release 3.0.215] prepare for next development iteration 2018-01-26 08:57:24 +00:00
WSO2 Builder
8301dda57d [WSO2 Release] [Jenkins #2888] [Release 3.0.215] prepare release v3.0.215 2018-01-26 08:57:10 +00:00
Rasika Perera
6c2f4e3c8d
Merge pull request #1165 from rasika/fix-1624
Adding additional validations to improve stability of the product
2018-01-26 14:14:30 +05:30
WSO2 Builder
6f6c3e2051 [maven-release-plugin] prepare for next development iteration 2018-01-26 06:54:56 +00:00
WSO2 Builder
a47115d92d [maven-release-plugin] prepare release v3.0.214 2018-01-26 06:54:41 +00:00
Rasika Perera
003ae9883b Fixing https://github.com/wso2/product-iots/issues/1629 2018-01-25 16:12:04 +05:30
charitha
3cf0d12181 Updated license year 2018-01-25 14:59:35 +05:30
charitha
c542c3efe9 Implemented operation response publishing to analytics 2018-01-25 14:52:32 +05:30
WSO2 Builder
b5ed177338 [WSO2 Release] [Jenkins #2878] [Release 3.0.212] prepare for next development iteration 2018-01-25 02:54:38 +00:00
WSO2 Builder
8569092e00 [WSO2 Release] [Jenkins #2878] [Release 3.0.212] prepare release v3.0.212 2018-01-25 02:54:22 +00:00
charitha
439fae4f8d Fixed https://github.com/wso2/product-iots/issues/1630 2018-01-24 22:53:50 +05:30
WSO2 Builder
d4a2b807aa [WSO2 Release] [Jenkins #2876] [Release 3.0.211] prepare for next development iteration 2018-01-24 06:54:45 +00:00
WSO2 Builder
97324f8c19 [WSO2 Release] [Jenkins #2876] [Release 3.0.211] prepare release v3.0.211 2018-01-24 06:54:31 +00:00
Ruwan
16cd6056a9
Merge pull request #1167 from ruwany/master
Fix for https://github.com/wso2/product-iots/issues/1399
2018-01-24 12:07:46 +05:30
WSO2 Builder
b885931c26 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare for next development iteration 2018-01-24 05:53:23 +00:00
WSO2 Builder
e1a5b3ec43 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare release v3.0.210 2018-01-24 05:53:08 +00:00
Ace
bc9450b7ff merging with upstream 2018-01-24 10:53:00 +05:30
Ace
327f49cfd9 Fix for https://github.com/wso2/product-iots/issues/1399 2018-01-24 10:52:33 +05:30
Rasika Perera
ab352015b7 Fixes for the https://github.com/wso2/product-iots/issues/1624 2018-01-24 07:26:56 +05:30
Rasika Perera
8a09e44c3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1624 2018-01-23 18:48:26 +05:30
WSO2 Builder
b428ecb931 [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare for next development iteration 2018-01-23 13:16:30 +00:00
WSO2 Builder
091da0326d [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare release v3.0.209 2018-01-23 13:16:15 +00:00
Rasika Perera
c5622c7b0b Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:35:10 +05:30
WSO2 Builder
45f778d2e4 Merge commit '774c20a09a0bb12b11dbec7c4ec9d5fb491575e2' into 1d9c0cda-191e-4c45-9fd9-32a2aa0808a4 2018-01-23 13:03:19 +00:00
WSO2 Builder
774c20a09a [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare for next development iteration 2018-01-23 12:48:12 +00:00
WSO2 Builder
4d35797a55 [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare release v3.0.208 2018-01-23 12:47:55 +00:00
Rasika Perera
f3860e42f7 Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:08:20 +05:30
Rasika Perera
5347930d95
Merge branch 'master' into fix-1623 2018-01-23 18:00:54 +05:30
Rasika Perera
a406dd0540
Merge pull request #1163 from rasika/fix-1611
Isolating Geo Location Enabling Configuration
2018-01-23 17:59:57 +05:30
Rasika Perera
c46a2037fe Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-23 16:02:17 +05:30
Rasika Perera
68a5415e0b Fixing https://github.com/wso2/product-iots/issues/1623 2018-01-23 15:19:03 +05:30
Rasika Perera
3a9261536e Renamed isEnabled into Enabled for the consistency 2018-01-23 14:59:52 +05:30
Rasika Perera
08f4f04101 Fixing a typo 2018-01-23 14:39:33 +05:30
WSO2 Builder
8776317dfe [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare for next development iteration 2018-01-22 11:14:43 +00:00
WSO2 Builder
21c406fe01 [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare release v3.0.207 2018-01-22 11:14:29 +00:00
Rasika Perera
394f45f4bd Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-22 15:43:07 +05:30
geethkokila
ca92c5029f Changing the variable name 2018-01-22 15:25:40 +05:30
geethkokila
a0a2817730 Changing the variable name 2018-01-22 15:19:24 +05:30
geethkokila
7c4ca89beb Removing extra lines 2018-01-22 15:13:43 +05:30
geethkokila
5c2c7dfc2a Removing commented lines 2018-01-22 15:11:29 +05:30
geethkokila
8f1d15c690 Removing commented lines 2018-01-22 15:10:47 +05:30
geethkokila
03570f3ad7 Improvements to policy monitoring framework
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
2018-01-22 14:39:29 +05:30
geethkokila
1a957666e3 Improvements to policy monitoring framework
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
2018-01-22 14:39:16 +05:30
WSO2 Builder
d8caf3baea [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare for next development iteration 2018-01-22 04:26:32 +00:00
WSO2 Builder
944d640d5f [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare release v3.0.206 2018-01-22 04:26:17 +00:00
Madhawa Perera
e56fb5f4de
New Activity Info Provider API resource which accept an array of activity IDs to get activity information (#1161)
* New Activity Info Provider API resource which accept an array of activity IDs to get activity information

* Modifications to the new activity info provider api

* Add acceptable activity list count validation

* Modifications to the new activity provider API resource

* Added license header to the test class

* Modifications to the new activity provider api
2018-01-22 09:38:51 +05:30
nishadi
c50de8e2de Modified CommentsDAOmpl
Removed concatenation.
2018-01-18 16:33:04 +05:30
nishadi
a321bf934b Modified CommentsManagerImpl
Reformatted.
2018-01-18 16:26:40 +05:30
nishadi
40771cbfcd Modified CommentDAOImpl
String sql change int constant.
2018-01-18 16:21:18 +05:30
nishadi
8f8ec9a86a parameter in the consumes annotation changed to application/json 2018-01-18 15:56:38 +05:30
nishadi
eced883e7f Error response message changed. 2018-01-18 15:54:34 +05:30
nishadi
7242c63e60 CommentId changed into commentId 2018-01-18 14:54:15 +05:30
nishadi
27d3862ac8 CommentId changed into commentId 2018-01-18 14:42:40 +05:30
nishadi
3b86f8a443 CommentId changed into commentId 2018-01-18 14:16:48 +05:30
nishadi
da0b147050 modified commentsManagerImpl
Reformatted.
2018-01-18 13:31:21 +05:30
nishadi
f02a0b9e6c Modified pom.xml at org.wso2.carbon.device.application.mgt.common
Extra dependency to "org.wso2.carbon.device.application.mgt.core" is removed.
2018-01-18 11:32:32 +05:30
nishadi
4ea87284f2 Modified CommentAPIImpl
Reformatted
2018-01-18 11:17:05 +05:30
nishadi
a1868939a7 Modified CommentDAOImpl
Reformatted
2018-01-18 02:44:56 +05:30
nishadi
30ae09b067 Modified CommentDAOImpl
Reformatted
2018-01-18 02:42:57 +05:30
nishadi
c35ccf9888 Modified CommentManagerImpl
Changed the messages of the Exceptions.
2018-01-18 02:06:15 +05:30
nishadi
62ac3455dd Changed license year 2018-01-18 00:11:52 +05:30
nishadi
ff3eacd0ba Removed suppressing deprecated warning. 2018-01-18 00:06:41 +05:30
nishadi
a6f2486ec6 Modified Comment ManagementAPiImpl
changed returning error response message into "return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();"
2018-01-18 00:03:46 +05:30
nishadi
919a7a8ddd Modified pom.xml at org.wso2.carbon.device.application.mgt.api
removed extra dependencies
2018-01-17 17:27:18 +05:30
nishadi
4c1d8dfa4d Modified APIUtil
Modified the osgi contexts and reformatted.
2018-01-17 16:28:17 +05:30
WSO2 Builder
15bea25074 [WSO2 Release] [Jenkins #2865] [Release 3.0.205] prepare for next development iteration 2018-01-17 10:53:13 +00:00
WSO2 Builder
f9484f286f [WSO2 Release] [Jenkins #2865] [Release 3.0.205] prepare release v3.0.205 2018-01-17 10:52:58 +00:00
WSO2 Builder
a4a1587cb3 Merge commit '955de2159ce36a8e784cd203466b5f8d9405e3ba' into b141a02b-f6a3-4cd5-b234-bea699286e00 2018-01-17 10:37:49 +00:00
nishadi
3cc15d0df0 Reformatted the code. 2018-01-17 16:06:41 +05:30
nishadi
3bfb2addbb Reformatted the code. 2018-01-17 15:58:01 +05:30
WSO2 Builder
955de2159c [WSO2 Release] [Jenkins #2864] [Release 3.0.204] prepare for next development iteration 2018-01-17 10:13:09 +00:00
WSO2 Builder
d7c66d1d67 [WSO2 Release] [Jenkins #2864] [Release 3.0.204] prepare release v3.0.204 2018-01-17 10:12:51 +00:00
nishadi
1bbd0b1aa5 Modified CommentManagerImpl ,CommentManagementAPIImpl,CommentManagementAPI
Modified the exceptions.
2018-01-17 15:32:59 +05:30
Rasika Perera
67a12dc57b
Merge pull request #1158 from Kamidu/master
validation improvements
2018-01-17 15:32:28 +05:30
nishadi
c1dca737f7 Modified CommentManager
Edited the comments.
2018-01-17 15:16:29 +05:30
nishadi
3bd6d03b4c Modified CommentManagerImpl and CommentManager
wrapped & thrown the sql and db exceptions with CommentManagementException and ApplicationManagementException.
2018-01-17 15:13:22 +05:30
nishadi
caa47417bc Modified CommentManagerImpl
removed catch (SQLException e) and catch (DBConnectionException e).
2018-01-17 14:27:44 +05:30
Rasika Perera
6651dbb64a Fixed a typo 2018-01-17 14:07:00 +05:30
Rasika Perera
b24095779a Fixing https://github.com/wso2/product-iots/issues/1142 2018-01-17 13:51:18 +05:30
nishadi
74ea82c926 Modified CommentManagerImpl
Renamed ApplicationManagementDAOFactory.getCommentDAO as commentDAO
2018-01-17 13:36:42 +05:30
nishadi
a45ba625fe Renamed apAppCommentId into CommentId 2018-01-17 12:26:42 +05:30
kamidu
e086ecf28a correct olad formatting issues 2018-01-17 12:22:45 +05:30
nishadi
906535eb24 Modify CommentsManagerImpl
Removed Not found Exception
2018-01-17 11:51:32 +05:30
nishadi
4fb77cbee8 Modify CommentsManagerImpl
Removed throwing NullPointerException;
2018-01-17 11:45:14 +05:30
nishadi
a1911432a6 Modify PaginationConfiguration
Removed commented codes.
2018-01-17 11:32:50 +05:30
nishadi
99b916d6ff Modify Comment
Removed commented codes.
2018-01-17 11:30:02 +05:30
nishadi
453559a07b Modify CommentManagementAPIImpl
returned Error Response.
2018-01-17 11:24:54 +05:30
WSO2 Builder
4883a5779d [WSO2 Release] [Jenkins #2862] [Release 3.0.203] prepare for next development iteration 2018-01-17 05:51:08 +00:00
WSO2 Builder
4546e323cf [WSO2 Release] [Jenkins #2862] [Release 3.0.203] prepare release v3.0.203 2018-01-17 05:50:53 +00:00
nishadi
06059cacf1 Modify CommentManagementAPIImpl
Removed the comment.
2018-01-17 11:19:56 +05:30
nishadi
0f4e4ea483 Modify CommentManagementAPI
add "defaultValue" parameter here in the ApiParams
2018-01-17 11:18:24 +05:30
nishadi
7849d0938b Modify APIUtil
change the format of imports.
2018-01-17 11:09:39 +05:30
nishadi
a6434d918b Modify APIUtil
change the format of imports.
2018-01-17 11:07:11 +05:30
WSO2 Builder
eae50efeee [WSO2 Release] [Jenkins #2860] [Release 3.0.202] prepare for next development iteration 2018-01-17 03:07:14 +00:00
WSO2 Builder
6646a2f445 [WSO2 Release] [Jenkins #2860] [Release 3.0.202] prepare release v3.0.202 2018-01-17 03:07:00 +00:00
inoshperera
a49cdd9113
Merge pull request #1157 from inoshperera/master
The device identity certificate's subject name has a hardcoded value
2018-01-17 08:21:21 +05:30
kamidu
46d85a3833 removing console logs 2018-01-17 00:33:42 +05:30
kamidu
cdff923aab validation improvements 2018-01-16 18:46:38 +05:30
nishadi
5dce27e23b Adding CommentDAOImpl
Implementation of CommentDAO interface.
2018-01-16 16:40:21 +05:30
nishadi
7fb0faa2b8 Modify pom.xml at org.wso2.carbon.device.application.mgt.api 2018-01-16 16:36:01 +05:30
nishadi
f7caa02b81 Modify pom.xml at org.wso2.carbon.device.application.mgt.common
Dependancy is added to org.wso2.carbon.device.application.mgt.core
2018-01-16 16:33:52 +05:30
nishadi
819034f97d Adding Implementation of Comment Manager 2018-01-16 16:17:31 +05:30
nishadi
6b6a5bdbb1 Adding Comment Manager Interface
Included the comment management methods and stars rating methods
2018-01-16 16:15:53 +05:30
nishadi
64e8faa153 Adding CommentDAO Interface 2018-01-16 16:03:15 +05:30
nishadi
99857c9acc Modify Util
validateCommentListPageSize method is added.
2018-01-16 16:01:19 +05:30
nishadi
35e4174211 Modify Application Management DAO Factory
getCommentDAO method is added.
2018-01-16 16:00:02 +05:30
nishadi
5096654658 Adding Pagination Configuration for application-mgt 2018-01-16 15:56:34 +05:30
nishadi
87d1928f4c Modify Configuration Management 2018-01-16 15:55:51 +05:30
inoshperera
465e711242 https://github.com/wso2/product-iots/issues/1601 2018-01-16 15:55:23 +05:30
nishadi
9f44795682 Modify Configuration
Pagination Configuration is added.
2018-01-16 15:54:52 +05:30
nishadi
9f67e52741 Adding Pagination Result for application-mgt 2018-01-16 15:53:07 +05:30
nishadi
849474de87 Adding Pagination Request for application-mgt 2018-01-16 15:52:34 +05:30
nishadi
a0ef2dbafe Adding Comment 2018-01-16 15:51:18 +05:30
nishadi
c00345e7d7 Modify Application Release
Variables are added- noOfRatedUsers and stars.
2018-01-16 15:50:47 +05:30
nishadi
6dbdddb3d2 Adding Comment Manager Interface
Included the comment management methods and stars rating methods
2018-01-16 15:48:38 +05:30
nishadi
46f087f215 Adding Comment Management Exception
Handle the Exceptions of Comment Management.
2018-01-16 15:39:48 +05:30
nishadi
dbd9ad77ae Modified API Util
getComment method is added to the APIUtil file.
2018-01-16 15:37:03 +05:30
nishadi
b9bb6830f4 Adding Implementation of Comment Management API 2018-01-16 15:35:35 +05:30
nishadi
627aaab233 Adding Comment Management API 2018-01-16 15:35:03 +05:30
WSO2 Builder
086eeecb01 [WSO2 Release] [Jenkins #2858] [Release 3.0.201] prepare for next development iteration 2018-01-15 10:15:25 +00:00
WSO2 Builder
74d5a5b469 [WSO2 Release] [Jenkins #2858] [Release 3.0.201] prepare release v3.0.201 2018-01-15 10:15:11 +00:00
geethkokila
0e3069b0da Changing the generic application retrieval to get the application ids
This fixes the issue caused due to retrieving the application details by submiting the device id, becasue at the first storing of the application, they are not stored agaist a device. It get's mapped later with the device. Hence it caused a null pointer
2018-01-15 15:24:27 +05:30
WSO2 Builder
c57dec9f30 [WSO2 Release] [Jenkins #2856] [Release 3.0.200] prepare for next development iteration 2018-01-15 09:01:23 +00:00
WSO2 Builder
b51c9e9d4c [WSO2 Release] [Jenkins #2856] [Release 3.0.200] prepare release v3.0.200 2018-01-15 09:01:09 +00:00
geethkokila
b652d025c8 This commits fixes the issues of having the Application memory info and is-active flag with the DM_APPLICATION table, because those values should go to to DM_APPLICATION_MAPPING table. Change of the tables has happened. 2018-01-15 13:56:05 +05:30
lasantha
393d11630b resolve pom issues 2018-01-14 16:44:17 +05:30
WSO2 Builder
531f209b2c [WSO2 Release] [Jenkins #2854] [Release 3.0.199] prepare for next development iteration 2018-01-11 06:25:59 +00:00
WSO2 Builder
2415a8d7fa [WSO2 Release] [Jenkins #2854] [Release 3.0.199] prepare release v3.0.199 2018-01-11 06:25:44 +00:00
WSO2 Builder
ae743d0fbd [WSO2 Release] [Jenkins #2852] [Release 3.0.198] prepare for next development iteration 2018-01-10 08:33:28 +00:00
WSO2 Builder
7691579570 [WSO2 Release] [Jenkins #2852] [Release 3.0.198] prepare release v3.0.198 2018-01-10 08:33:14 +00:00
charitha
1c904e72f6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-01-10 13:50:00 +05:30
charitha
50269aacc6 Fixed https://github.com/wso2/product-iots/issues/1218 2018-01-10 13:34:09 +05:30
WSO2 Builder
ffedebe554 [WSO2 Release] [Jenkins #2850] [Release 3.0.197] prepare for next development iteration 2018-01-10 07:47:13 +00:00
WSO2 Builder
63ebfd7837 [WSO2 Release] [Jenkins #2850] [Release 3.0.197] prepare release v3.0.197 2018-01-10 07:46:58 +00:00
Ruwan
b6792f89f1
Merge pull request #1152 from ruwany/master
Fixing https://github.com/wso2/product-iots/issues/1579
2018-01-10 12:58:29 +05:30
Ace
e054a49aea Adding fix for https://github.com/wso2/product-iots/issues/1579 2018-01-10 12:26:52 +05:30
WSO2 Builder
8531895e67 [WSO2 Release] [Jenkins #2848] [Release 3.0.196] prepare for next development iteration 2018-01-10 02:17:21 +00:00
WSO2 Builder
c5e9ae3c1a [WSO2 Release] [Jenkins #2848] [Release 3.0.196] prepare release v3.0.196 2018-01-10 02:17:06 +00:00
Rasika Perera
ca0089b49e https://github.com/wso2/product-iots/issues/1573 Removed android-web-agent, Fixed download URL 2018-01-09 20:06:50 +05:30
WSO2 Builder
17abcc8192 [WSO2 Release] [Jenkins #2846] [Release 3.0.195] prepare for next development iteration 2018-01-09 10:22:08 +00:00
WSO2 Builder
c4dfe974f1 [WSO2 Release] [Jenkins #2846] [Release 3.0.195] prepare release v3.0.195 2018-01-09 10:21:51 +00:00
WSO2 Builder
e08669a51d Merge commit 'becdfba15e826cf60eb64a8400cdb9b3ff58ec4d' into 2df7da8d-e5ad-4a38-9c5e-0a2f0d200522 2018-01-09 10:06:07 +00:00
WSO2 Builder
becdfba15e [WSO2 Release] [Jenkins #2845] [Release 3.0.194] prepare for next development iteration 2018-01-09 09:45:57 +00:00
WSO2 Builder
b70504bc8b [WSO2 Release] [Jenkins #2845] [Release 3.0.194] prepare release v3.0.194 2018-01-09 09:45:38 +00:00
Rasika Perera
8997b4ba53
Merge pull request #1150 from rasika/fix-1547
Fixing https://github.com/wso2/product-iots/issues/1547
2018-01-09 15:08:55 +05:30
Ruwan
c6c068fad2
Merge pull request #1149 from inoshperera/master
Improvement on the basic auth handling
2018-01-09 15:01:24 +05:30
Rasika Perera
4770b9b603 Fixing https://github.com/wso2/product-iots/issues/1547 2018-01-09 14:52:48 +05:30
inoshperera
28eb239179 upgrading the json version and documenting the usage of the basicAuth paramater. 2018-01-09 14:51:23 +05:30
WSO2 Builder
36d1839ce2 [WSO2 Release] [Jenkins #2843] [Release 3.0.193] prepare for next development iteration 2018-01-09 08:43:08 +00:00
WSO2 Builder
a67433442e [WSO2 Release] [Jenkins #2843] [Release 3.0.193] prepare release v3.0.193 2018-01-09 08:42:54 +00:00
Rasika Perera
83ae57a044
Merge pull request #1147 from rasika/fix-1553
Fixing cannot publish policies without enrolling a device
2018-01-09 13:58:24 +05:30
inoshperera
0485e9c2b3 Fixes https://github.com/wso2/product-iots/issues/1570 2018-01-08 17:57:44 +05:30
WSO2 Builder
8d26327a9d [WSO2 Release] [Jenkins #2841] [Release 3.0.192] prepare for next development iteration 2018-01-04 17:13:30 +00:00
WSO2 Builder
4d16377ddf [WSO2 Release] [Jenkins #2841] [Release 3.0.192] prepare release v3.0.192 2018-01-04 17:13:14 +00:00
kamidu
09f395660a Fixing the DAO layer acess to maintain the consistancy on implimentation 2018-01-04 12:38:17 +05:30
Rasika Perera
e254d4ccc8 Fixing https://github.com/wso2/product-iots/issues/1553 and https://github.com/wso2/product-iots/issues/1546 2018-01-04 00:29:23 +05:30
kamidu
6daf95b78d Change the config placement for improve the separatability 2018-01-03 16:27:09 +05:30
kamidu
33b27234a0 Enable the new configuration for testing 2018-01-03 15:03:08 +05:30
lasantha
486aac1cdc adding application release creation functioanlity (NC) 2018-01-01 00:53:43 +05:30
lasantha
f8c5ff95b9 Device API layer into two sections. named as store and publisher 2017-12-29 15:01:38 +05:30
kamidu
2505d4907a Fixing https://github.com/wso2/product-iots/issues/1565 2017-12-29 10:37:57 +05:30
lasantha
05b1221641 increase version 2017-12-25 07:30:05 +05:30
lasantha
667f997f34 merging with master branch 2017-12-24 14:19:50 +05:30
lasantha
11ea50e8ab Adding AP improvements(incomplete) 2017-12-24 13:58:41 +05:30
WSO2 Builder
5783a74110 [WSO2 Release] [Jenkins #2838] [Release 3.0.191] prepare for next development iteration 2017-12-22 06:19:13 +00:00
WSO2 Builder
7a7613a0cb [WSO2 Release] [Jenkins #2838] [Release 3.0.191] prepare release v3.0.191 2017-12-22 06:18:57 +00:00
Ace
42f36e5a9a Fixing test failure 2017-12-22 11:12:48 +05:30
Rasika Perera
7b8ba259e4
Merge pull request #1134 from madhawap/vf-dev-3
Added an API to filter activities by operation code
2017-12-21 18:43:17 +05:30
Madawa Soysa
e786fa410b Checking if the user store manager class is a sub class of the default
This commit is to modify the current logic which checks if the UserStoreManager class is equal to the JDBCUserStoreManager class to support subclasses of the JDBCUserStoreManager class to return correct total user count.

In this commit, instead of comparing the string name, tests the UserStoreManager instance is a type of JDBCUserStoreManager.

Resolves wso2/product-iots#1556
2017-12-21 17:06:28 +05:30
Kamidu Sachith Punchihewa
d397d73777
Merge pull request #1139 from rasika/fix-1544
Fixing devicemgt roles not created for newly created tenants
2017-12-19 12:07:49 +05:30
Kamidu Sachith Punchihewa
48e67df534
Merge pull request #1141 from ruwany/master
Notification center enhancements
2017-12-19 11:47:43 +05:30
Ace
e2ce619166 Adding UI enhancements and including unit tests 2017-12-19 11:16:55 +05:30
WSO2 Builder
b8643213b6 [WSO2 Release] [Jenkins #2831] [Release 3.0.190] prepare for next development iteration 2017-12-18 16:17:54 +00:00
WSO2 Builder
34dc4038e6 [WSO2 Release] [Jenkins #2831] [Release 3.0.190] prepare release v3.0.190 2017-12-18 16:17:39 +00:00
kamidu
049c6bcdae Enaled policy description on effective policy view 2017-12-18 20:59:09 +05:30
Rasika Perera
08e40d3989 Fixing error log 2017-12-18 17:04:36 +05:30
Rasika Perera
2e7bd0626d Fixing https://github.com/wso2/product-iots/issues/1544 2017-12-18 16:57:03 +05:30
Ace
fb6c98b969 Restricting clear notifications to tenant domain only 2017-12-18 12:43:37 +05:30
Ace
15991f626d Adding clear notifications button to notification listing page 2017-12-18 11:14:02 +05:30
Ace
29c0692286 removing un-necessary logs 2017-12-16 11:29:10 +05:30
Ace
c506d90698 removing un-necessary logs 2017-12-16 11:27:28 +05:30
Ace
9ac89d1ebe merging with upstream 2017-12-16 10:03:28 +05:30
Ace
855f294ed2 improving notifications management 2017-12-16 10:03:02 +05:30
Madawa Soysa
6fed9f7823 Changing the order by parameter when getNextPendingOperation called
Changing the order by parameter to UPDATED_TIMESTAMP.

Resolves wso2/product-iots#1539
2017-12-16 09:49:20 +05:30
WSO2 Builder
2a01c77ef9 [WSO2 Release] [Jenkins #2827] [Release 3.0.189] prepare for next development iteration 2017-12-15 12:11:35 +00:00
WSO2 Builder
ce604ed214 [WSO2 Release] [Jenkins #2827] [Release 3.0.189] prepare release v3.0.189 2017-12-15 12:11:21 +00:00
lasantha
1a8816f531 fixed build failure 2017-12-15 16:25:12 +05:30
Madawa Soysa
8df3999cbc
Merge pull request #1135 from Kamidu/master
Enable roles containing the filter to be listed in role listing
2017-12-15 14:55:04 +05:30
Madawa Soysa
30da164121
Merge pull request #1136 from lasanthaDLPDS/vf-dev-api
Adding v0.9 API version for device management and certificate management
2017-12-15 14:38:34 +05:30
lasantha
11310a9145 default API set to newly added API and fixed it by using context parameters 2017-12-15 10:21:15 +05:30
kamidu
e10cf66813 Enable roles containing the filter to be listed in role listing 2017-12-14 19:18:44 +05:30
WSO2 Builder
5262f516f4 [WSO2 Release] [Jenkins #2822] [Release 3.0.188] prepare for next development iteration 2017-12-14 12:11:12 +00:00
WSO2 Builder
2bfe4bbfe7 [WSO2 Release] [Jenkins #2822] [Release 3.0.188] prepare release v3.0.188 2017-12-14 12:10:58 +00:00
madhawap
16f70454ad Added an API to filter activities by operation code 2017-12-14 14:44:53 +05:30
kamidu
1413ff5268 Fixing https://github.com/wso2/product-iots/issues/1526 2017-12-14 14:43:28 +05:30
WSO2 Builder
3ce2d1c3b2 [WSO2 Release] [Jenkins #2820] [Release 3.0.187] prepare for next development iteration 2017-12-13 09:02:53 +00:00
WSO2 Builder
ae71fafc10 [WSO2 Release] [Jenkins #2820] [Release 3.0.187] prepare release v3.0.187 2017-12-13 09:02:38 +00:00
Rasika Perera
0a9ecd3100
Merge pull request #1132 from ruwany/master
Fix for https://github.com/wso2/product-iots/issues/1525
2017-12-13 14:06:34 +05:30
Ace
1472cf6e27 Merging with upstream 2017-12-13 14:06:20 +05:30
Ace
aa654ea5bf Fix for https://github.com/wso2/product-iots/issues/1525 2017-12-13 14:02:34 +05:30
charitha
7ab31ae7d8 Fixed https://github.com/wso2/product-iots/issues/1523 2017-12-13 13:56:29 +05:30
WSO2 Builder
6fe5b6909f [WSO2 Release] [Jenkins #2818] [Release 3.0.186] prepare for next development iteration 2017-12-13 04:14:53 +00:00
WSO2 Builder
ff97ffbfcc [WSO2 Release] [Jenkins #2818] [Release 3.0.186] prepare release v3.0.186 2017-12-13 04:14:39 +00:00
Ace
e06d8f9e13 merging with upstream 2017-12-13 00:25:22 +05:30
Ace
62c6882fa2 Fixing server startup issue when configured with PostgreSQL DB 2017-12-13 00:23:08 +05:30
lasantha
9a7745d915 Adding new API version for backward compatibility 2017-12-12 18:20:37 +05:30
WSO2 Builder
689373a58f [WSO2 Release] [Jenkins #2816] [Release 3.0.185] prepare for next development iteration 2017-12-12 08:11:10 +00:00
WSO2 Builder
babc4a9e9a [WSO2 Release] [Jenkins #2816] [Release 3.0.185] prepare release v3.0.185 2017-12-12 08:10:56 +00:00