Commit Graph

3874 Commits

Author SHA1 Message Date
WSO2 Builder
0cc8f902ae [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare release v3.0.20 2017-07-05 14:59:38 +05:30
Imesh Chandrasiri
c17b2fbd98 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-05 12:10:26 +05:30
Imesh Chandrasiri
d38714b7e6 fixes wso2/product-iots#1113 2017-07-05 12:08:45 +05:30
Rasika Perera
5e87ce2d66 Merge pull request #824 from rasika/monetize-cloud
Fixing https://github.com/wso2/product-iots/issues/1119: monetization
2017-07-05 11:10:11 +05:30
Rasika Perera
f8fa314359 Fixing https://github.com/wso2/product-iots/issues/1096: Hiding table when no alerts avaialble 2017-07-05 10:49:55 +05:30
Rasika Perera
7bc3ab7bec Fixing https://github.com/wso2/product-iots/issues/1096: Stationery -> Stationary 2017-07-05 07:17:52 +05:30
Rasika Perera
fb12c3cb04 Fixing https://github.com/wso2/product-iots/issues/1096: i.e. colombo -> e.g. colombo 2017-07-05 07:17:26 +05:30
Rasika Perera
8223588e82 Fixing https://github.com/wso2/product-iots/issues/1119: monetization 2017-07-05 06:27:42 +05:30
WSO2 Builder
09bf240ff6 [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare for next development iteration 2017-07-04 19:13:38 +05:30
WSO2 Builder
3c63162f7a [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare release v3.0.19 2017-07-04 19:13:23 +05:30
Imesh Chandrasiri
73d4a213c6 fix for issue [#1112] 2017-07-04 17:13:52 +05:30
WSO2 Builder
e65f0b1afa [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare for next development iteration 2017-07-03 18:31:48 +05:30
WSO2 Builder
e1bbc9fe47 [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare release v3.0.18 2017-07-03 18:31:35 +05:30
Nirothipan
ce741c3993 Security policy updated, allowing to autofill password if users have saved it 2017-07-03 14:15:07 +05:30
WSO2 Builder
7a02ecbe68 [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare for next development iteration 2017-07-01 12:47:09 +05:30
WSO2 Builder
5b32f7813a [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare release v3.0.17 2017-07-01 12:46:54 +05:30
Madhawa Perera
96c650f699 Merge pull request #820 from janakamarasena/bug-fixes-2
Added tenant domain to username in AccessToken grant
2017-07-01 08:04:58 +05:30
Madhawa Perera
031c648a2e Merge pull request #816 from dunithd/master
Checking whether the geo location service has been enabled before reading stats from analytics server
2017-07-01 08:04:39 +05:30
WSO2 Builder
c376208943 [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare for next development iteration 2017-06-30 17:44:28 +05:30
WSO2 Builder
5c013a3abd [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare release v3.0.16 2017-06-30 17:44:14 +05:30
Janak Amarasena
7218174d46 Add tenant domain to username 2017-06-30 16:13:41 +05:30
WSO2 Builder
4396704616 Merge commit 'cc13b1446e3465b67a1bf7aea681102cabb96412' into 5c4b0f95-b6c1-4250-9ab6-e420a526a091 2017-06-30 15:54:00 +05:30
Ayyoob Hamza
83fc26b722 Merge pull request #819 from lasanthaDLPDS/master
Fixing UI issues in device type API
2017-06-30 15:47:35 +05:30
WSO2 Builder
cc13b1446e [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare for next development iteration 2017-06-30 15:46:09 +05:30
WSO2 Builder
08831cb9f4 [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare release v3.0.15 2017-06-30 15:45:56 +05:30
lasantha
8f225bc623 Fixing minor UI issues 2017-06-30 15:38:06 +05:30
Madhawa Perera
b503b531bd Merge pull request #818 from rasika/master
When user removed, all associated devices are removed now
2017-06-30 15:15:10 +05:30
Rasika Perera
186b49395e Fixing https://github.com/wso2/product-iots/issues/685: When user removed, all associated devices removed 2017-06-30 14:59:24 +05:30
lasantha
d5fac0c569 Removing device type clicking option 2017-06-30 14:36:08 +05:30
Imesh Chandrasiri
eda30cbf3c adding chevron arrow when clicking op.log 2017-06-30 14:24:25 +05:30
lasantha
70138c3c6e removing select bar in device types page 2017-06-30 10:49:25 +05:30
dunithd
cffecfaf3a Removing the warning message and changing the HTTP response status code to 400 2017-06-30 10:45:40 +05:30
dunithd
07c525667c Removing an unused import 2017-06-29 18:27:04 +05:30
dunithd
0d3701be88 Checking whether the geo location service has been enabled before reading stats from analytics server 2017-06-29 18:25:28 +05:30
Imesh Chandrasiri
131bf2d3b4 Fix for long length device name 2017-06-29 15:22:24 +05:30
WSO2 Builder
6330164676 [WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare for next development iteration 2017-06-29 14:54:03 +05:30
WSO2 Builder
153fb3984e [WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare release v3.0.14 2017-06-29 14:53:50 +05:30
Imesh Chandrasiri
f35fb92668 Fixes #437 issue where propper validation message is needed 2017-06-29 12:03:36 +05:30
Imesh Chandrasiri
b9cc3c73cd Fix for github issue #1064 2017-06-29 11:32:36 +05:30
WSO2 Builder
fc41a165a8 [WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare for next development iteration 2017-06-28 19:26:16 +05:30
WSO2 Builder
7acd8e70c4 [WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare release v3.0.13 2017-06-28 19:26:02 +05:30
Geeth
63a7a2bb28 Merge pull request #813 from milanperera/iot-master
Fixed issue wso2/product-iots#427
2017-06-28 18:35:43 +05:30
Milan Perera
4994fddfd8 Fixed issue wso2/product-iots#427 2017-06-28 18:32:21 +05:30
WSO2 Builder
cb078fbb0f [WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare for next development iteration 2017-06-28 18:26:18 +05:30
WSO2 Builder
8e874b2ef0 [WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare release v3.0.12 2017-06-28 18:26:05 +05:30
Milan Perera
c605ffbd58 Fixed issue wso2/product-iots#475 2017-06-28 17:56:50 +05:30
Milan Perera
a60566a417 Removed DCR dependancies 2017-06-28 12:19:09 +05:30
Milan Perera
72a19085ad Removed DCR feature 2017-06-28 08:41:41 +05:30
Milan Perera
eb89aa4ff4 Removed DCR feature 2017-06-27 23:20:04 +05:30
WSO2 Builder
c03e1ec1d1 [WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare for next development iteration 2017-06-27 12:15:35 +05:30
WSO2 Builder
997affda65 [WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare release v3.0.11 2017-06-27 12:15:21 +05:30
Janak Amarasena
21a9df97bb Add proper handling when invalid token is received 2017-06-26 18:37:01 +05:30
warunalakshitha
ad9ec1f994 Add multiple push notification support and transport config for features 2017-06-26 11:45:15 +05:30
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
Madhawa Perera
25aaf92641 Merge pull request #810 from sinthuja/master
Updating source/target versions to jdk 1.8.
2017-06-23 18:12:45 +05:30
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
sinthuja
fce84b9942 Updating source/target versions to jdk 1.8. 2017-06-23 18:00:06 +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
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
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
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
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
Chatura Dilan
d3f87a30ed Refactor edit apps functionality 2017-06-19 12:58:09 +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
inoshperera
88054f9075 removing non-compliance action. 2017-06-19 12:04:59 +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
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
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
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
madhawap
648659a781 Sets values taken from system varibales to iot-api-config.xml
iot-api-config.xml consists with system varibales like iot.core.host, iot.keymanager.host etc. But values set to those varibales were not pass into these places. This commit fixes that
2017-06-16 13:16:29 +05:30
madhawap
a115cff4db reformatting code 2017-06-16 13:16:29 +05:30
Rasika Perera
d3f24bb8ba Making alert danger into alert info in stationary alerts 2017-06-16 12:48:03 +05:30
Rasika Perera
c8d41c7b3e Few more improvements into geo-dashboard 2017-06-16 12:45:29 +05:30
Rasika Perera
3fd2c6b705 Adding deploy geo analytics button into platform configuration 2017-06-16 12:30:24 +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
Rasika Perera
d0a1132060 Improving geo fence ui 2017-06-16 10:10:57 +05:30
Ayyoob Hamza
0551598988 Merge pull request #779 from janakamarasena/oauth-token-grant-refractor
Access token grant handler
2017-06-16 06:52:36 +05:30
ayyoob
f47d0deb1a few changes after testing. 2017-06-16 03:48:08 +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
WSO2 Builder
bae931f3c5 [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare release v3.0.1 2017-06-15 16:22:51 +05:30
Ruwan
5d4c85b61e Merge pull request #778 from harshanL/master
Code refactored.
2017-06-15 15:20:37 +05:30
Janak Amarasena
b2bdc0b6c8 Add token validation classes to the same bundle 2017-06-15 15:04:59 +05:30
Harshan Liyanage
de9beb1f5b Code refatcored. 2017-06-15 14:49:40 +05:30
inoshperera
d63ef44e7b Merge pull request #777 from harshanL/master
Fixed wso2/product-iots#473
2017-06-15 12:03:01 +05:30
Harshan Liyanage
3857be50b9 Fixed wso2/product-iots#473 2017-06-15 11:58:22 +05:30
Ruwan
477608613e Merge pull request #776 from rasika/master
Fixing https://github.com/wso2/product-iots/issues/431
2017-06-15 11:31:19 +05:30
Rasika Perera
61c4db07a3 Fixing https://github.com/wso2/product-iots/issues/431 2017-06-15 11:27:37 +05:30
ayyoob
0d08c42f5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-15 09:48:00 +05:30
WSO2 Builder
69d2cff7bd [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare for next development iteration 2017-06-14 18:08:46 +05:30
WSO2 Builder
3795011895 [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare release v3.0.0 2017-06-14 18:08:31 +05:30
Chatura Dilan
58eab35123 Merge branch 'application-mgt' of github.com:wso2/carbon-device-mgt into application-mgt 2017-06-14 17:27:14 +05:30
Chatura Dilan
6d6aa50b2a Added functionailty to update app 2017-06-14 17:27:01 +05:30
sinthuja
fe3325ebf2 Merge remote-tracking branch 'wso2/application-mgt' into wso2-application-mgt
# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/PlatformDAO.java
#	components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/platform/GenericPlatformDAOImpl.java
2017-06-14 16:13:38 +05:30
sinthuja
e5704ac05d Using the platformManger service instead of using the DAO. 2017-06-14 16:10:54 +05:30
sinthuja
a7569456ce fixing the build issue due to removing the method in platform manager. 2017-06-14 16:09:08 +05:30
sinthuja
59f43886cf Adding the update platform API. 2017-06-14 16:07:16 +05:30
Harshan Liyanage
9e24338660 Added javadoc comments. 2017-06-14 14:55:25 +05:30
ayyoob
07bdd5cb6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-14 13:19:07 +05:30
Chatura Dilan
d7b784b073 Removed published from platforms 2017-06-14 12:45:15 +05:30
Chatura Dilan
ac871fdbce Fixed exception class to PlatformDAOException 2017-06-14 12:40:11 +05:30
ayyoob
da68f8fac1 fixed on config operation flow 2017-06-14 12:38:56 +05:30
Chatura Dilan
38b7689e28 Merge pull request #773 from harshanL/master
Fixed java-doc comments issues and added comments to the configs.
2017-06-14 12:35:39 +05:30
Harshan Liyanage
b510a422b4 Fixed java-doc comments issues and added comments to the configs. 2017-06-14 12:28:16 +05:30
Chatura Dilan
52b2739bee Refactoring DAOs 2017-06-14 12:28:13 +05:30
Chatura Dilan
6a18d7ab4c Fixed conflicts 2017-06-14 12:15:49 +05:30
Chatura Dilan
2b0ae8c5a4 Added creating app functionality 2017-06-14 11:59:06 +05:30
Geeth
115ccb739a Merge pull request #765 from harshanL/master
Added comments to the device status configs.
2017-06-14 11:42:21 +05:30
Rasika Perera
798e551673 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-14 10:43:19 +05:30
Rasika Perera
68d9b2d310 Adding focus on geo map 2017-06-14 07:48:57 +05:30
Rasika Perera
10c8bf7f42 Capilizing notification title 2017-06-14 07:47:01 +05:30
sinthuja
6020b3fb65 Adding platform manager first API. 2017-06-13 18:15:58 +05:30
WSO2 Builder
16420433b5 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare for next development iteration 2017-06-13 17:26:56 +05:30
WSO2 Builder
5c06b9dcb2 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare release v2.0.75 2017-06-13 17:26:42 +05:30