Commit Graph

1323 Commits

Author SHA1 Message Date
WSO2 Builder
e23ef52e61 [maven-release-plugin]prepare for next development iteration 2017-06-23 20:27:17 +05:30
WSO2 Builder
c333f28461 [maven-release-plugin]prepare release v3.0.10 2017-06-23 20:27:03 +05:30
WSO2 Builder
27e494f153 [WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare for next development iteration 2017-06-23 17:22:32 +05:30
WSO2 Builder
21ab65e6d5 [WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare release v3.0.9 2017-06-23 17:22:20 +05:30
WSO2 Builder
54d25522ba [WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare for next development iteration 2017-06-22 20:09:55 +05:30
WSO2 Builder
69b168f3b2 [WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare release v3.0.8 2017-06-22 20:09:41 +05:30
ayyoob
2dab109ad3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-22 16:56:34 +05:30
geethkokila
1655b512b0 Fixing formating issues 2017-06-22 15:55:22 +05:30
geethkokila
5f71313af1 Fixing formating issues 2017-06-22 15:53:11 +05:30
geethkokila
07357124b0 Fixing the task for all the tenants 2017-06-22 15:45:11 +05:30
ayyoob
6c041c7b6a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-22 04:34:45 +05:30
sinthuja
ee8f29503d Merge branch 'wso2-master' 2017-06-21 16:31:06 +05:30
sinthuja
8197547383 Fixing MSSQL related issues, and dbscript issues. 2017-06-21 16:30:19 +05:30
ayyoob
80cc690a42 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-21 04:11:40 +05:30
WSO2 Builder
68cb8d3f81 [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare for next development iteration 2017-06-20 22:37:58 +05:30
WSO2 Builder
d0f52c48ef [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare release v3.0.7 2017-06-20 22:37:45 +05:30
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
2017-06-20 22:27:42 +05:30
Megala Uthayakumar
7431ed4997 Merge pull request #791 from sinthuja/master
Fixing mssql related issue.
2017-06-20 19:03:44 +05:30
sinthuja
4bfd35cc74 Fixing issue in mssql database issue in processor. 2017-06-20 18:54:36 +05:30
sinthuja
5570349cd1 Reverting back the other databases to use the arrays. 2017-06-20 18:05:39 +05:30
WSO2 Builder
2896b55f5e [WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare for next development iteration 2017-06-20 18:03:42 +05:30
WSO2 Builder
bdb57383b1 [WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare release v3.0.6 2017-06-20 18:03:28 +05:30
dunithd
4cf3e2d421 Adding an API method to retrieve an activity by it's ID and a device ID 2017-06-20 17:44:22 +05:30
sinthuja
f59202c0c3 Reverting back to the debug logs. 2017-06-20 13:46:39 +05:30
sinthuja
ade596d3c4 Merging the AS clause removal queries with generic DAO from oracle. 2017-06-20 13:17:03 +05:30
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
2017-06-19 23:10:15 +05:30
sinthuja
124c0b4cf8 Fixing issues related to oracle database. 2017-06-19 23:05:05 +05:30
WSO2 Builder
8badc2bc37 [WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare for next development iteration 2017-06-19 17:23:13 +05:30
WSO2 Builder
43182aede9 [WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare release v3.0.5 2017-06-19 17:22:58 +05:30
Harshan Liyanage
b8f085da20 Added null checks for device cache in-case cache is disabled. 2017-06-19 16:58:42 +05:30
WSO2 Builder
f70535ed20 [WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare for next development iteration 2017-06-19 16:22:55 +05:30
WSO2 Builder
c3d154ee65 [WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare release v3.0.4 2017-06-19 16:22:42 +05:30
Harshan Liyanage
074ceeb0c7 Merged with master 2017-06-19 12:46:22 +05:30
Harshan Liyanage
967efa1fee Fixed user enrolled device showing problem which resolves wso2/product-iots#406 2017-06-19 12:41:22 +05:30
ayyoob
3b7d4d8966 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-17 19:17:42 +05:30
ayyoob
ca33f035df merge ui fixes 2017-06-17 18:52:25 +05:30
Ayyoob Hamza
2875fb2ca0 Merge pull request #755 from rasika/geo-fencing
Added Geo Service into Device Mgt Core
2017-06-17 12:20:10 +05:30
WSO2 Builder
e924a86d73 [WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare for next development iteration 2017-06-16 17:40:41 +05:30
WSO2 Builder
b35aaab992 [WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare release v3.0.3 2017-06-16 17:40:27 +05:30
Harshan Liyanage
d8b756df3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-16 16:48:30 +05:30
Harshan Liyanage
8b9420766f Fixed SQL syntax issue in DeviceStatusMonitoring Task when running on PostgreSQL. 2017-06-16 16:47:34 +05:30
Harshan Liyanage
51c18d2108 Added pagination support for group-management for major db engines. 2017-06-16 16:46:30 +05:30
Rasika Perera
8da1f62cd9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-16 15:50:45 +05:30
Madawa Soysa
98e8dfea68 Merge pull request #781 from inoshperera/master
fixing the agent unable to enroll issue
2017-06-16 15:29:22 +05:30
inoshperera
58b2bf8b3c fixing the agent unable to enroll issue 2017-06-16 15:23:41 +05:30
madhawap
a115cff4db reformatting code 2017-06-16 13:16:29 +05:30
sinthuja
1c13269fc8 Fixing https://github.com/wso2/product-iots/issues/495. 2017-06-16 11:50:54 +05:30
WSO2 Builder
2b76317f40 [WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare for next development iteration 2017-06-16 11:00:40 +05:30
WSO2 Builder
02bc10e6d2 [WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare release v3.0.2 2017-06-16 11:00:26 +05:30
WSO2 Builder
1e58f762da [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare for next development iteration 2017-06-15 16:23:05 +05:30