Commit Graph

4903 Commits

Author SHA1 Message Date
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
Geeth
c7a8f83f54 Merge pull request #789 from harshanL/master
Updated title bar app name to IoT Server.
2017-06-20 17:37:56 +05:30
Harshan Liyanage
eebbcbb6fa Merge pull request #782 from janakamarasena/high-priority-fixes
UI fixes
2017-06-20 17:04:03 +05:30
Geeth
2ce5b0ae2b Merge pull request #788 from sinthuja/master
Fixes for Oracle database
2017-06-20 16:36:38 +05:30
sinthuja
4018d582ed Adding comments to the batch size config. 2017-06-20 16:17:07 +05:30
sinthuja
f2ea96efde Reverting the changes done to GenericFeatureDAOImpl. 2017-06-20 16:16:10 +05:30
sinthuja
ce5ca09e51 Adding oracle server specific impl. 2017-06-20 16:15:12 +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
Hasunie
19495321d2 removing unnecessary lines 2017-06-19 19:23:01 +05:30
Hasunie
3333ed0381 Fixing permission issue which resolves wso2/product-iots#430 2017-06-19 19:18:34 +05:30
Harshan Liyanage
50e82eb80d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-19 17:34:45 +05:30
Harshan Liyanage
fecc5e1b72 Changed devicemgt app name to IoT Server. 2017-06-19 17:33:43 +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
1ba90eaa7b Merge pull request #787 from harshanL/master
Added null checks for device cache in-case cache is disabled.
2017-06-19 17:07:35 +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
Geeth
11cd14321f Merge pull request #786 from harshanL/master
Fixed wso2/product-iots#406
2017-06-19 13:04:23 +05:30
Harshan Liyanage
a21c374b00 Code refactoring. 2017-06-19 12:52:31 +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
Geeth
75728ce151 Merge pull request #785 from inoshperera/master
Removing non-compliance action.
2017-06-19 12:07:47 +05:30
inoshperera
88054f9075 removing non-compliance action. 2017-06-19 12:04:59 +05:30
inoshperera
c2d5df9cd4 Merge pull request #784 from geethkokila/master
Fixing the build failure
2017-06-19 11:52:15 +05:30
geethkokila
0eca5a0152 Fixing the build failure 2017-06-19 11:44:47 +05:30
ayyoob
6dffac4191 fixes in ui 2017-06-18 16:41:38 +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
f4605a5cfb disabling pullnotification in default pack 2017-06-17 19:00:10 +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
Geeth
ee254c6448 Merge pull request #783 from harshanL/master
Fixed issues in Postgre SQL which resolves wso2/product-iots#494
2017-06-16 17:02:06 +05:30
Janak Amarasena
3f17e66e8c UI fixes 2017-06-16 16:51:49 +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
0c041c3556 Fixed issues in Postgre SQL script which resolves wso2/product-iots#494 2017-06-16 16:48:17 +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
Rasika Perera
a5c18b3c26 Geo Fencing UI fixes 2017-06-16 14:42:05 +05:30