Saad Sahibjan
ae9dd807cc
Enrollment application install feature for policy
2019-01-01 08:19:53 +00:00
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
charitha
10672ea534
Fixed date format issue in geofencing
2018-10-30 20:47:31 +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
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
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
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
charitha
5d13979629
Increased notification popup time
2018-10-08 23:11:51 +05:30
charitha
1f2f85d691
Increased notification popup time
2018-10-08 23:07:36 +05:30
Milan Perera
53f8014730
Whitelabel devicemgt jaggeryapp
2018-09-27 11:09:13 +05:30
charitha
22f02c4062
Update manager urls and product version
2018-08-30 11:51:16 +05:30
charitha
82778f06c6
Add secure web socket proxy to route ws connections in IoTS cluster
2018-08-20 15:44:55 +05:30
charitha
055d422e23
Publish geo alerts to cdm notifications
2018-08-10 15:26:04 +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
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
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
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
Arcane94
f6de4bb424
minor change in a function
2018-03-16 15:17:58 +05:30
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
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
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
charitha
f6d5498240
Add privacy policy consent
2018-03-14 17:50:17 +05:30
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
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
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
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
geethkokila
ec3f814133
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-14 10:05:48 +05:30
n-jay
280a63bdbd
Remove UI API scopes from config file
2018-03-13 15:13:22 +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
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
lasantha
8efcfca877
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-11 01:10:33 +05:30
