ayyoob
|
2dab109ad3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
geethkokila
|
1655b512b0
|
Fixing formating issues
|
8 years ago |
geethkokila
|
5f71313af1
|
Fixing formating issues
|
8 years ago |
geethkokila
|
07357124b0
|
Fixing the task for all the tenants
|
8 years ago |
ayyoob
|
6c041c7b6a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
sinthuja
|
ee8f29503d
|
Merge branch 'wso2-master'
|
8 years ago |
sinthuja
|
8197547383
|
Fixing MSSQL related issues, and dbscript issues.
|
8 years ago |
ayyoob
|
80cc690a42
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
Geeth
|
3deffa99dd
|
Merge pull request #790 from dunithd/master
Adding an API method to retrieve an activity by it's ID and a device ID
|
8 years ago |
sinthuja
|
4bfd35cc74
|
Fixing issue in mssql database issue in processor.
|
8 years ago |
sinthuja
|
5570349cd1
|
Reverting back the other databases to use the arrays.
|
8 years ago |
dunithd
|
4cf3e2d421
|
Adding an API method to retrieve an activity by it's ID and a device ID
|
8 years ago |
sinthuja
|
f59202c0c3
|
Reverting back to the debug logs.
|
8 years ago |
sinthuja
|
ade596d3c4
|
Merging the AS clause removal queries with generic DAO from oracle.
|
8 years ago |
sinthuja
|
9398e7ee0b
|
Merge branch 'wso2-master'
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationMappingDAOImpl.java
|
8 years ago |
sinthuja
|
124c0b4cf8
|
Fixing issues related to oracle database.
|
8 years ago |
Harshan Liyanage
|
b8f085da20
|
Added null checks for device cache in-case cache is disabled.
|
8 years ago |
Harshan Liyanage
|
074ceeb0c7
|
Merged with master
|
8 years ago |
Harshan Liyanage
|
967efa1fee
|
Fixed user enrolled device showing problem which resolves wso2/product-iots#406
|
8 years ago |
ayyoob
|
3b7d4d8966
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
ayyoob
|
ca33f035df
|
merge ui fixes
|
8 years ago |
Ayyoob Hamza
|
2875fb2ca0
|
Merge pull request #755 from rasika/geo-fencing
Added Geo Service into Device Mgt Core
|
8 years ago |
Harshan Liyanage
|
d8b756df3d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Harshan Liyanage
|
8b9420766f
|
Fixed SQL syntax issue in DeviceStatusMonitoring Task when running on PostgreSQL.
|
8 years ago |
Harshan Liyanage
|
51c18d2108
|
Added pagination support for group-management for major db engines.
|
8 years ago |
Rasika Perera
|
8da1f62cd9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
|
8 years ago |
Madawa Soysa
|
98e8dfea68
|
Merge pull request #781 from inoshperera/master
fixing the agent unable to enroll issue
|
8 years ago |
inoshperera
|
58b2bf8b3c
|
fixing the agent unable to enroll issue
|
8 years ago |
madhawap
|
a115cff4db
|
reformatting code
|
8 years ago |
sinthuja
|
1c13269fc8
|
Fixing https://github.com/wso2/product-iots/issues/495.
|
8 years ago |
Harshan Liyanage
|
de9beb1f5b
|
Code refatcored.
|
8 years ago |
ayyoob
|
07bdd5cb6c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
ayyoob
|
da68f8fac1
|
fixed on config operation flow
|
8 years ago |
Chatura Dilan
|
38b7689e28
|
Merge pull request #773 from harshanL/master
Fixed java-doc comments issues and added comments to the configs.
|
8 years ago |
Harshan Liyanage
|
b510a422b4
|
Fixed java-doc comments issues and added comments to the configs.
|
8 years ago |
Geeth
|
115ccb739a
|
Merge pull request #765 from harshanL/master
Added comments to the device status configs.
|
8 years ago |
Rasika Perera
|
798e551673
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
|
8 years ago |
Harshan Liyanage
|
43ba1e1b43
|
Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005
|
8 years ago |
Vishanth
|
7da1067d68
|
fixing sql queries to compare owner in lowercase
|
8 years ago |
Rasika Perera
|
ce6ab9b354
|
Refactoring "executionPlanType" -> "alertType"
|
8 years ago |
Rasika Perera
|
6d02075a99
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
|
8 years ago |
ayyoob
|
6c7f911cbc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
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.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
|
8 years ago |
ayyoob
|
7ab52af66e
|
add http pushnotification
|
8 years ago |
Harshan Liyanage
|
3766ba0349
|
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
|
8 years ago |
Rasika Perera
|
05b11a5099
|
Adding Exit Alerts feature
|
8 years ago |
ayyoob
|
f3393080ba
|
fixed few issues after testing
|
8 years ago |
Rasika Perera
|
8548e911aa
|
Added an error message when gpl siddhi extension is not configured
|
8 years ago |
Rasika Perera
|
ec343cef1a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
|
8 years ago |
Rasika Perera
|
fb368caae4
|
Removed unused gson initization
|
8 years ago |
Rasika Perera
|
9865a260d4
|
Publishing location operation response into iot location event stream
|
8 years ago |