Commit Graph

5910 Commits

Author SHA1 Message Date
WSO2 Builder
28195c7f77 [WSO2 Release] [Jenkins #2812] [Release 3.0.183] prepare release v3.0.183 2017-11-29 15:51:55 +00:00
Charitha Goonetilleke
2c9e9e2eab
Merge pull request #1127 from sameeragunarathne/master
added update device properties functionality for device types
https://github.com/wso2/product-iots/issues/1505
2017-11-29 20:50:59 +05:30
sameera910409
c8d56f66ea added update device properties functionality for device types 2017-11-29 19:33:51 +05:30
lasantha
aa4f7c13c5 Fixing issue in get device API 2017-11-29 10:05:50 +05:30
Gathika94
d67877cfb1 unit tests for geo device locations api- minor changes 2017-11-28 20:26:03 +05:30
Gathika94
5308108899 unit tests- minor changes 2017-11-28 20:22:40 +05:30
Gathika94
fd5ada61af unit tests for geo device locations api 2017-11-28 20:18:05 +05:30
lasantha
0e2f473a51 fetching upstream changes to pom file 2017-11-28 11:24:09 +05:30
lasantha
fe576c0aac Adding required API endpoints to mograte from prior verisons of IoTS 3.1.0 to IoTS 3.1.0 2017-11-28 10:51:52 +05:30
lasantha
7ec652a910 resolved merging conflicts 2017-11-24 17:06:55 +05:30
WSO2 Builder
6603015614 [WSO2 Release] [Jenkins #2808] [Release 3.0.182] prepare for next development iteration 2017-11-23 11:38:00 +00:00
WSO2 Builder
bb731cb264 [WSO2 Release] [Jenkins #2808] [Release 3.0.182] prepare release v3.0.182 2017-11-23 11:37:44 +00:00
Rasika Perera
092ae30738
Merge pull request #1123 from charithag/master
OSGi improvement for #977
2017-11-23 16:45:47 +05:30
charitha
6cb3ffa3ca Fixed build failure due to incorrect class name 2017-11-23 16:40:53 +05:30
charitha
3c23a3cf5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-23 16:33:28 +05:30
charitha
1449698a3c OSGi improvement to #977 2017-11-23 16:33:14 +05:30
Ruwan
b15b1cc7b3
Merge pull request #1120 from Gathika94/add-emm-analytics
Clustering devices based on geo location
2017-11-23 16:16:43 +05:30
Gathika94
7a2fc90a15 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics 2017-11-23 15:58:17 +05:30
Gathika94
c22a7f1882 minor ui changes 2017-11-23 15:57:54 +05:30
charitha
b28e0822c7 Move archival DB script to correct place (missed from #977) 2017-11-23 14:44:33 +05:30
Gathika94
356063a247 removed warnings created in geo deivice locations dashboard 2017-11-23 10:51:22 +05:30
WSO2 Builder
b2fc6b4cad [WSO2 Release] [Jenkins #2805] [Release 3.0.181] prepare for next development iteration 2017-11-23 05:14:07 +00:00
WSO2 Builder
a55619b333 [WSO2 Release] [Jenkins #2805] [Release 3.0.181] prepare release v3.0.181 2017-11-23 05:13:51 +00:00
Gathika94
89eff7b7bd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics 2017-11-23 10:25:19 +05:30
Gathika94
81b036678a minor changes in device locations UI 2017-11-23 10:22:31 +05:30
WSO2 Builder
3d522e7c62 [WSO2 Release] [Jenkins #2804] [Release 3.0.180] prepare for next development iteration 2017-11-23 04:38:38 +00:00
WSO2 Builder
08382cc965 [WSO2 Release] [Jenkins #2804] [Release 3.0.180] prepare release v3.0.180 2017-11-23 04:38:24 +00:00
Charitha Goonetilleke
c05f1c4c6e
Merge pull request #1121 from charithag/master
Adding data archival configurations (missed from #977)
2017-11-23 09:43:19 +05:30
Charitha Goonetilleke
61f88b54ff
Merge pull request #1122 from warunalakshitha/remote-control
Add remote control configurations as remove unused methods
2017-11-23 09:40:11 +05:30
Gathika94
cec1e1393e removed unnecessary files 2017-11-22 23:34:08 +05:30
Gathika94
dcac19480f removed unnecessary files 2017-11-22 23:26:09 +05:30
warunalakshitha
2313928741 Add remote control configurations as remove unused methods 2017-11-22 22:52:11 +05:30
charitha
3c85e21c79 Adding data archival configurations (missed from #977) 2017-11-22 22:40:20 +05:30
Gathika94
f4af47fae4 added unit and page 2017-11-22 21:42:54 +05:30
Gathika94
2e082fbbb7 removed unnecessary classes 2017-11-22 16:32:14 +05:30
WSO2 Builder
4c68ddd752 [WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare for next development iteration 2017-11-22 10:42:23 +00:00
WSO2 Builder
f28b740e9c [WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare release v3.0.179 2017-11-22 10:42:08 +00:00
Gathika94
ad061d09a6 device details can be get through the api 2017-11-22 16:06:31 +05:30
Gathika94
f5d1ab7403 backend api working properly 2017-11-22 16:06:31 +05:30
Gathika94
c74a56cb45 geo hash algorithm 2017-11-22 16:06:31 +05:30
Gathika94
d3eb32b5cc working on ui features 2017-11-22 16:06:31 +05:30
Gathika94
4eb66f4e6b api for getting devices in geo grid working fine 2017-11-22 16:06:31 +05:30
Ruwan
bde0965efe
Merge pull request #1119 from charithag/master
Merging PR https://github.com/wso2/carbon-device-mgt/pull/761 offline
2017-11-22 15:47:47 +05:30
charitha
f2fbf97b91 Reverting to column name based return of the generated keys as Statement.RETURN_GENERATED_KEYS are not handled consistently by H2 engine 2017-11-22 15:41:23 +05:30
charitha
a966dc2655 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-22 15:40:34 +05:30
WSO2 Builder
16750a6f96 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare for next development iteration 2017-11-22 09:19:46 +00:00
WSO2 Builder
46c732a2a9 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare release v3.0.178 2017-11-22 09:19:31 +00:00
charitha
0f7e8b6435 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-22 14:43:50 +05:30
charitha
713c6a6755 Merge branch 'patch-1' of https://github.com/thomsonimjd/carbon-device-mgt
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
2017-11-22 14:43:29 +05:30
Charitha Goonetilleke
c281374d95
Merge pull request #977 from dunithd/master
Data archival task implementation to prune CDM transnational tables.
2017-11-22 14:23:02 +05:30