Commit Graph

5010 Commits

Author SHA1 Message Date
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
dunithd
b3642730ad Adding refresh button for the operations log tab 2017-06-22 16:49:01 +05:30
inoshperera
ae8452adcb Merge pull request #801 from geethkokila/master
Fixing the task for all the tenants
2017-06-22 15:56:08 +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
Geeth
e41b60eee9 Merge pull request #800 from ruwany/master
Adding fixes for https://github.com/wso2/product-iots/issues/997
2017-06-22 15:32:57 +05:30
Ace
ac01fef7be Adding import enhancements 2017-06-22 15:34:03 +05:30
Ace
dcbffac198 Adding fixes for https://github.com/wso2/product-iots/issues/997 2017-06-22 15:12:40 +05:30
Harshan Liyanage
d07098ae1d Merge pull request #799 from hasuniea/master
Fixing permission issue which resolves wso2/product-iots#430
2017-06-22 13:54:28 +05:30
Hasunie
b2c6bc5453 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-22 10:50:51 +05:30
ayyoob
9f4037b7e1 few changes to ui 2017-06-22 06:50:20 +05:30
ayyoob
3a87c4bd41 mssql table updates 2017-06-22 05:47:24 +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
Geeth
a47d2a6672 Merge pull request #797 from sinthuja/master
Fixing issues in IoT core with MSSQL.
2017-06-21 23:02:46 +05:30
Kamidu Sachith Punchihewa
a895c1f4dd Merge pull request #795 from janakamarasena/high-priority-fixes-2
Added bottom margin to 'Show All Notifications' button
2017-06-21 19:34:50 +05:30
inoshperera
4cc9222226 Merge pull request #796 from Kamidu/master
fixing the password reset issue
2017-06-21 18:59:51 +05:30
kamidu
525c0958d9 fixing the password reset issue 2017-06-21 18:53:56 +05:30
Janak Amarasena
db98663c78 Added bottom margin to Show All Notifications button 2017-06-21 18:04:11 +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
Geeth
d6fcdf500b Merge pull request #794 from milanperera/iot-master
Changing error logs to debug
2017-06-21 14:31:31 +05:30
Milan Perera
cda5a0b216 Changing error logs to debug 2017-06-21 13:10:24 +05:30
Harshan Liyanage
4ed4de7b4c Merge pull request #793 from DimalChandrasiri/master
Fix for multiple event occurring in device listing page
2017-06-21 12:40:40 +05:30
Imesh Chandrasiri
66d9ea4bde Merge branch 'master' of https://github.com/DimalChandrasiri/carbon-device-mgt 2017-06-21 12:36:46 +05:30
Ruwan
ad07cbec45 Merge pull request #792 from rasika/master
Changing artifact uploader admin service resource path
2017-06-21 11:02:37 +05:30
Rasika Perera
fc4576082c Changing artifact uploader admin service resource path 2017-06-21 10:57:50 +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
Imesh Chandrasiri
1546411814 Fixed Multiple ajax calls when filtering 2017-06-20 20:25:57 +05:30
dunithd
d0058b982c Adding new UX styles CSS 2017-06-20 19:40:58 +05:30
dunithd
c832f1b5a9 Applying new UX design for device details default unit 2017-06-20 19:39:52 +05:30
ayyoob
3224f3a50c few changes in dbscript 2017-06-20 19:33:24 +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
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
Chatura Dilan
10f1158c45 Refactor code 2017-06-20 15:21:50 +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