Chatura Dilan
|
9d5e912d11
|
Added MySQL DAO
|
2017-05-09 11:30:53 +05:30 |
|
Geeth
|
6798dea68a
|
Merge pull request #725 from warunalakshitha/master
Add Scheduler Task for Sending Push Notification
|
2017-05-02 17:04:03 +05:30 |
|
warunalakshitha
|
e1e2b14b5f
|
Rename push status to push notification status and add configurable initial delay for scheduler task
|
2017-05-01 20:44:30 +05:30 |
|
lasantha
|
43f2f15c5f
|
#395: Resolved current device owner incorrectly selecting and processing issue when the same device is enrolled to multiple users
|
2017-05-01 15:48:25 +05:30 |
|
warunalakshitha
|
3938064210
|
Add opeerations mapping map for tenants and fixes for code review
|
2017-04-30 14:29:30 +05:30 |
|
warunalakshitha
|
a5759f9818
|
Add tenant based operation mappings
|
2017-04-30 13:56:06 +05:30 |
|
warunalakshitha
|
76f8d963f7
|
Improve push notifications for request with device list less than batch size
|
2017-04-27 12:23:01 +05:30 |
|
warunalakshitha
|
97a53a7387
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2017-04-25 19:08:36 +05:30 |
|
warunalakshitha
|
9fa4eedca5
|
Add Scheduled for push notification sending
|
2017-04-25 19:07:37 +05:30 |
|
warunalakshitha
|
3c1e4ba205
|
Add new classes for improve Performance of push notifications
|
2017-04-25 18:55:31 +05:30 |
|
megala21
|
32ea2e52c4
|
Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370
|
2017-04-21 15:18:20 +05:30 |
|
Harshan Liyanage
|
9e4d84dfb2
|
Fix for Advanced Search Issue #670
|
2017-03-28 12:37:28 +05:30 |
|
lakshani
|
5c7cfda487
|
Fixed jira IOTS-438
|
2017-03-24 15:42:54 +05:30 |
|
Harshan Liyanage
|
75486b3bb8
|
Fixed Device renaming issue.
|
2017-03-14 13:42:32 +05:30 |
|
Susinda
|
e23aaa6647
|
Adding Hasunie's fix on initialOperations implementation
|
2017-03-10 11:54:43 +05:30 |
|
Megala
|
a2d0c59e17
|
Revert 2988357eb9
|
2017-03-02 15:18:34 +05:30 |
|
Megala
|
4fdeec89cc
|
Revert f3f7635d3b
|
2017-03-02 15:11:59 +05:30 |
|
madhawap
|
f1b761d987
|
Minor code formating
|
2017-02-28 21:16:56 +05:30 |
|
lakshani
|
eb12e5b9f1
|
Adding commit 'added java doc comments'
|
2017-02-28 21:11:15 +05:30 |
|
lakshani
|
9e5574dccc
|
Adding commit 'added change device status to device view page'
|
2017-02-28 21:09:05 +05:30 |
|
lakshani
|
3f90b403c0
|
Adding lakshani's commit 'updated device status button'
|
2017-02-28 21:03:53 +05:30 |
|
geethkokila
|
e90dc8b6c1
|
Fixing the compile error
|
2017-02-24 12:32:00 +05:30 |
|
geethkokila
|
d8303356cd
|
Fixing the conflicts
|
2017-02-24 12:16:14 +05:30 |
|
Hasunie
|
476e439fe2
|
Fixing the task to get the only device registered tenants
|
2017-02-14 22:16:55 +05:30 |
|
geethkokila
|
f3f7635d3b
|
Fixing the task to get the only the device enrolled tenants
|
2017-02-13 12:34:09 +05:30 |
|
geethkokila
|
275f413652
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
2017-02-03 16:20:11 +05:30 |
|
Milan Perera
|
a5f41ef734
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
|
2017-02-01 12:14:59 +05:30 |
|
lakshani
|
3b32635cf9
|
removed unwanted new lines
|
2017-01-30 15:48:15 +05:30 |
|
lakshani
|
bbcdf7aeda
|
removed unwanted new line
|
2017-01-30 07:54:43 +05:30 |
|
lakshani
|
26f2e2d2ae
|
added role query param to getdevices restapis
|
2017-01-30 07:50:10 +05:30 |
|
Milan Perera
|
2b4a3cde61
|
Fixed conflicts and merged
|
2017-01-26 14:59:05 +05:30 |
|
Milan Perera
|
21d8d14b7e
|
Fixed multy tenancy issues related to android device type
|
2017-01-26 14:50:12 +05:30 |
|
geethkokila
|
713ddbf416
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
2017-01-26 12:08:10 +05:30 |
|
geethkokila
|
2988357eb9
|
Changing the task to run for all the tenants
|
2017-01-26 12:07:29 +05:30 |
|
ayyoob
|
3423ef025d
|
merged with upstream
|
2017-01-24 19:39:49 +05:30 |
|
ayyoob
|
e74b4e23c4
|
removed apim dependency from cdmf
|
2017-01-24 19:32:59 +05:30 |
|
geethkokila
|
2743bf9458
|
Fixing the security issue due to not using prepared statement
|
2017-01-19 17:51:42 +05:30 |
|
geethkokila
|
7359b4c536
|
Fixing the security issue due to not using prepared statement
|
2017-01-19 17:51:32 +05:30 |
|
ayyoob
|
44d09e09ea
|
few changes after testing the gateway
|
2017-01-13 04:49:17 +05:30 |
|
ayyoob
|
5b3a8091ec
|
fixed Null pointer exception
|
2017-01-12 23:18:54 +05:30 |
|
Milan Perera
|
21c50c9a55
|
Fixed NPE occurred due to scope mapping
|
2017-01-12 19:01:57 +05:30 |
|
Milan Perera
|
f25e82f4ec
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2017-01-11 14:42:08 +05:30 |
|
Milan Perera
|
98ea97d890
|
Fixed permissions adding issue
|
2017-01-11 14:41:54 +05:30 |
|
ayyoob
|
471e634790
|
merged with upstream
|
2017-01-10 12:11:03 +05:30 |
|
ayyoob
|
06977295ea
|
merged with upstream
|
2017-01-10 12:00:13 +05:30 |
|
charitha
|
cb7ff7f66a
|
Change package name to lower case
|
2017-01-10 10:18:28 +05:30 |
|
ayyoob
|
9d5061230c
|
fixing test failures
(cherry picked from commit ac8dae7)
|
2017-01-10 10:15:14 +05:30 |
|
ayyoob
|
ac8dae7ed0
|
fixing test failures
|
2017-01-10 09:27:10 +05:30 |
|
Rasika Perera
|
0acd273ae1
|
Fixing merge conflicts
|
2017-01-08 12:41:09 +05:30 |
|
Rasika Perera
|
83aea1fd01
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-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.webapp.publisher/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
# 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.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/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.dashboard/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
# 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/dao/DeviceDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
# 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/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.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.push.notification.provider.gcm.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.dashboard.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.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/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
# features/dynamic-client-registration/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
|
2017-01-08 11:45:46 +05:30 |
|