Commit Graph

3604 Commits

Author SHA1 Message Date
Madhawa Perera
6adc8e6aef Merge pull request #809 from janakamarasena/high-priority-fixes-2
Fixes NPE when using Access Token grant handler
2017-06-23 18:00:42 +05:30
Janak Amarasena
0f41dce394 Fixed spacing 2017-06-23 17:53:32 +05:30
Janak Amarasena
88bdad18b1 Fixes NPE 2017-06-23 17:50:42 +05:30
Harshan Liyanage
188c80f52a Merge pull request #808 from hasuniea/master
Fixing issue wso2/product-iot#527
2017-06-23 17:49:23 +05:30
Hasunie
9206f74790 Fixing issue wso2/product-iot##527 2017-06-23 17:39:42 +05:30
Kamidu Sachith Punchihewa
e556193647 Merge pull request #807 from DimalChandrasiri/master
Fix for application listing app name clipping issue
2017-06-23 17:30:31 +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
Imesh Chandrasiri
930dccaa4d fix for application listing app name clipping issue 2017-06-23 17:09:21 +05:30
Ayyoob Hamza
bd65b1d73b Merge pull request #806 from rasika/master
Fixing android geo fencing ui
2017-06-23 16:48:52 +05:30
Rasika Perera
fcf41d6511 Reducing the map height 2017-06-23 16:43:13 +05:30
Rasika Perera
bfbaf00e34 Fixing android geo fencing ui 2017-06-23 16:37:22 +05:30
Rasika Perera
139bc99cc7 Adding error logs when unexpected error from gateway 2017-06-23 16:37:08 +05:30
lasantha
88328b6be3 Adding latest Font WSO2 2017-06-23 14:58:39 +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
Geeth
63c8e87d98 Merge pull request #803 from ayyoob/devicetype-3.1.0
Adding Device type API Implementation
2017-06-22 19:46:33 +05:30
ayyoob
d70cea2e46 fixed commit issues 2017-06-22 19:29:04 +05:30
ayyoob
536d100fd6 fixed comment issues 2017-06-22 17:44:54 +05:30
ayyoob
abacc0ce2a fixed comment issues 2017-06-22 17:28:37 +05:30
Kamidu Sachith Punchihewa
f868fa2d35 Merge pull request #804 from DimalChandrasiri/master
Fix for removed device selection in Data Table
2017-06-22 17:13:59 +05:30
Imesh Chandrasiri
cba8f5243e Fix for removed device selection in datatable 2017-06-22 17:07:59 +05:30
Kamidu Sachith Punchihewa
3c5e65c047 Merge pull request #802 from dunithd/master
Adding refresh button for the operations log tab
2017-06-22 17:00:22 +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
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
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
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
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
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
Imesh Chandrasiri
66d9ea4bde Merge branch 'master' of https://github.com/DimalChandrasiri/carbon-device-mgt 2017-06-21 12:36:46 +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