Commit Graph

579 Commits

Author SHA1 Message Date
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
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
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
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
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
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
madhawap
b78a11d3d9 reformatting code 2017-06-16 13:16:29 +05:30
Rasika Perera
0cea35647f Removed location stream copy 2017-06-16 11:03: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
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
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
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
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
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
Harshan Liyanage
43ba1e1b43 Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005 2017-06-13 17:08:26 +05:30
Rasika Perera
6d02075a99 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-12 15:11:14 +05:30
Harshan Liyanage
951cd7b001 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-12 10:36:51 +05:30
WSO2 Builder
8927158086 [WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare for next development iteration 2017-06-09 12:57:29 +05:30
WSO2 Builder
28423c45bc [WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare release v2.0.74 2017-06-09 12:57:15 +05:30
Harshan Liyanage
f215b5ee44 Added comments to the device status configs. 2017-06-07 17:34:06 +05:30
WSO2 Builder
e3dfbdfdbd [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
WSO2 Builder
598332b640 [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare release v2.0.73 2017-06-07 13:44:15 +05:30
WSO2 Builder
73fa026eeb [WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare for next development iteration 2017-06-06 12:33:06 +05:30
WSO2 Builder
2415762ccb [WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare release v2.0.72 2017-06-06 12:32:53 +05:30
Rasika Perera
ec343cef1a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-05 10:26:10 +05:30
Rasika Perera
d37aafff48 iot location stream added for event publishing 2017-06-05 10:08:09 +05:30
WSO2 Builder
39a7037821 [WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare for next development iteration 2017-06-02 16:44:55 +05:30
WSO2 Builder
22782ec125 [WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare release v2.0.71 2017-06-02 16:44:41 +05:30
Harshan Liyanage
fda9410a2a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-02 15:07:48 +05:30
WSO2 Builder
c7fd70145d [WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare for next development iteration 2017-06-01 08:58:27 +05:30
WSO2 Builder
0c9d104401 [WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare release v2.0.70 2017-06-01 08:58:13 +05:30
Harshan Liyanage
4ec139608e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-05-30 17:00:52 +05:30
Harshan Liyanage
35d1c9897e Resolves harshanl/product-iots#518 2017-05-30 17:00:23 +05:30
WSO2 Builder
69a63baa43 [WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare for next development iteration 2017-05-30 11:24:51 +05:30
WSO2 Builder
713b948ea9 [WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare release v2.0.69 2017-05-30 11:24:37 +05:30
WSO2 Builder
7e83b53bb4 [WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare for next development iteration 2017-05-22 15:33:56 +05:30
WSO2 Builder
768073ea51 [WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare release v2.0.68 2017-05-22 15:33:42 +05:30
WSO2 Builder
88bab85750 [WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare for next development iteration 2017-05-18 17:33:39 +05:30