community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,826 Commits 31 Branches 461 Tags 183 MiB
eda5b5909c
Commit Graph

853 Commits

Author SHA1 Message Date
WSO2 Builder
d0f52c48ef [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare release v3.0.7 2017-06-20 22:37:45 +05:30
ayyoob
3224f3a50c few changes in dbscript 2017-06-20 19:33:24 +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
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
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
f4605a5cfb disabling pullnotification in default pack 2017-06-17 19:00:10 +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
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
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
ayyoob
1600426951 updated tenant id 2017-06-15 09:47:24 +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
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
9bc23a927d Fixed the mysql script for app management 2017-06-14 12:47:52 +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
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
ayyoob
22a4716443 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-12 11:35:43 +05:30
ayyoob
c93410eb92 added few changes after review 2017-06-12 11:35:33 +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
ayyoob
6c7f911cbc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
 2017-06-08 14:39:51 +05:30
ayyoob
7ab52af66e add http pushnotification 2017-06-08 14:24:33 +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
Madawa Soysa
f9b759ddf7 Parameterizing the iot-api-config file 
Fixes wso2/product-iots#449
 2017-06-05 15:17:45 +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
ayyoob
a7ebc96cb7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-03 18:06:32 +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
ayyoob
04b8b74e4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-01 17:22:33 +05:30
ayyoob
a0d7518cbe Implemented Pull Notification Support 2017-06-01 17:19:25 +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
sinthuja
8d6e4cfa01 Fixing issues in resolving the configuration resolving. 2017-05-31 18:01:07 +05:30
sinthuja
fd18ab711c Fixing issues in resolving the configuration resolving. 2017-05-31 16:03:37 +05:30
sinthuja
242cf06f42 Refactoring the APP manager code, second phase. 2017-05-31 13:50:03 +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
Chatura Dilan
9343032c88 Changes to App Management Externsions Framework 2017-05-29 18:35:37 +05:30
Chatura Dilan
c89491b93e Changes to schema 2017-05-29 10:22:17 +05:30
Chatura Dilan
dd07101e3d Fixed MySQL script 2017-05-26 14:25:49 +05:30
Chatura Dilan
43ef32b37c Refactor services 2017-05-25 14:37:16 +05:30
ayyoob
75d6813d8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-05-24 00:43:02 +05:30
Harshan Liyanage
d5ba266583 Fixed H2 database issue in App-Mgr. 2017-05-22 18:10:58 +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
ayyoob
dd1c2e4338 Added few fixes after testing and added default UI for device type management 2017-05-22 02:51:35 +05:30
Chatura Dilan
fa88673ac4 Changed lifecycle management to application from release 2017-05-19 10:22:31 +05:30
ayyoob
f945da194d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-05-19 01:56:40 +05:30
ayyoob
abc9315f95 Added Pluggable Device Type 2017-05-19 01:49:10 +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
WSO2 Builder
4e506a547e [WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare release v2.0.67 2017-05-18 17:33:25 +05:30
Harshan Liyanage
36d82c85ef Fixed issues in APPM DB scripts. 2017-05-18 15:27:49 +05:30
WSO2 Builder
3092423d4d [WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare for next development iteration 2017-05-17 19:11:50 +05:30
WSO2 Builder
e21520392c [WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare release v2.0.66 2017-05-17 19:11:36 +05:30
WSO2 Builder
d4baa72328 [WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare for next development iteration 2017-05-16 18:34:27 +05:30
WSO2 Builder
7b549f623d [WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare release v2.0.65 2017-05-16 18:34:13 +05:30
Chatura Dilan
5e1be78ced Updated mysql dbscript 2017-05-16 15:34:39 +05:30
Harshan Liyanage
5361ad2025 Refactored Application-Mgt code. 2017-05-16 15:20:08 +05:30
ayyoob
fbb5f5ae88 merged with origin 2017-05-15 18:15:24 +05:30
Harshan Liyanage
2128c3f13e Added application-mgt UI feature 2017-05-15 14:52:50 +05:30
Harshan Liyanage
345c786328 Fixed APP Mgmt Features. 2017-05-12 19:14:34 +05:30
WSO2 Builder
84d305dcd4 [WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare for next development iteration 2017-05-11 09:15:49 +05:30
WSO2 Builder
3bf945fe95 [WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare release v2.0.64 2017-05-11 09:15:33 +05:30
Harshan Liyanage
ff211708a1 Added application-mgt features. 2017-05-09 19:07:35 +05:30
WSO2 Builder
f7300645a5 [WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare for next development iteration 2017-05-09 15:05:26 +05:30
WSO2 Builder
ca83609703 [WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare release v2.0.63 2017-05-09 15:05:11 +05:30
Chatura Dilan
9d5e912d11 Added MySQL DAO 2017-05-09 11:30:53 +05:30
WSO2 Builder
964eae6f92 [WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare for next development iteration 2017-05-08 17:42:41 +05:30
WSO2 Builder
31f91f80b9 [WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare release v2.0.62 2017-05-08 17:42:28 +05:30
WSO2 Builder
639eeb225a [WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare for next development iteration 2017-05-05 11:41:19 +05:30
WSO2 Builder
7d3025a25b [WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare release v2.0.61 2017-05-05 11:41:03 +05:30
WSO2 Builder
a546355cf3 [WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare for next development iteration 2017-05-04 15:42:27 +05:30
WSO2 Builder
eb6b1db3fe [WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare release v2.0.60 2017-05-04 15:42:14 +05:30
WSO2 Builder
4797fc9600 [WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare for next development iteration 2017-05-03 20:29:05 +05:30
WSO2 Builder
896bc24f21 [WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare release v2.0.59 2017-05-03 20:28:51 +05:30
WSO2 Builder
98991fe89b [WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare for next development iteration 2017-05-03 15:28:16 +05:30
WSO2 Builder
8b31b93181 [WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare release v2.0.58 2017-05-03 15:28:02 +05:30
WSO2 Builder
6fddf9c8d0 [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare for next development iteration 2017-05-03 08:28:19 +05:30
WSO2 Builder
2f4051019c [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare release v2.0.57 2017-05-03 08:28:05 +05:30
WSO2 Builder
80bf3c8fbd [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare for next development iteration 2017-05-02 18:01:00 +05:30
WSO2 Builder
2a7173c66d [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare release v2.0.56 2017-05-02 18:00:46 +05:30
WSO2 Builder
95a80301e9 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare for next development iteration 2017-05-02 17:15:09 +05:30
WSO2 Builder
236db75700 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare release v2.0.55 2017-05-02 17:14:54 +05:30
Geeth
6798dea68a Merge pull request #725 from warunalakshitha/master 
Add Scheduler Task for Sending Push Notification
 2017-05-02 17:04:03 +05:30
WSO2 Builder
43e76e4678 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare for next development iteration 2017-05-02 09:37:33 +05:30
WSO2 Builder
34865f0d25 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare release v2.0.54 2017-05-02 09:37:16 +05:30
warunalakshitha
1470abeb0b Add initial thread delay config for cdm-config.xml 2017-05-01 20:43:32 +05:30
warunalakshitha
8df87b23bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-30 13:56:12 +05:30
WSO2 Builder
3a9986d054 [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare for next development iteration 2017-04-28 10:29:44 +05:30
WSO2 Builder
b53610ff8b [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare release v2.0.53 2017-04-28 10:29:35 +05:30
warunalakshitha
003c9c5907 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-27 12:23:17 +05:30
WSO2 Builder
726422dc81 [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare for next development iteration 2017-04-26 21:31:21 +05:30
WSO2 Builder
4bf6bf73cc [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare release v2.0.52 2017-04-26 21:31:08 +05:30
WSO2 Builder
4429482a29 [WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare for next development iteration 2017-04-26 15:26:48 +05:30
WSO2 Builder
1bbd982e1f [WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare release v2.0.51 2017-04-26 15:26:35 +05:30
WSO2 Builder
52b0165275 [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare for next development iteration 2017-04-26 11:16:14 +05:30
WSO2 Builder
ada2669ecf [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare release v2.0.50 2017-04-26 11:15:58 +05:30
warunalakshitha
97a53a7387 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-25 19:08:36 +05:30
warunalakshitha
642f64c2d4 Add new push notification scheduler 2017-04-25 18:51:44 +05:30
warunalakshitha
eecb0a0a31 Add push notification status column to DM_ENROLMENT_OP_MAPPING 2017-04-25 18:50:59 +05:30
WSO2 Builder
543e603298 [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare for next development iteration 2017-04-25 10:14:34 +05:30
WSO2 Builder
5010a3eebf [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare release v2.0.49 2017-04-25 10:14:21 +05:30
WSO2 Builder
eb8ba53092 [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare for next development iteration 2017-04-25 08:58:47 +05:30
WSO2 Builder
4764bff47e [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare release v2.0.48 2017-04-25 08:58:32 +05:30
ayyoob
f834001d22 merged with origin 2017-04-22 01:24:24 +05:30
WSO2 Builder
c1b5a649f6 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare for next development iteration 2017-04-21 16:06:53 +05:30
WSO2 Builder
6ccccb67b4 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare release v2.0.47 2017-04-21 16:06:39 +05:30
Harshan Liyanage
0dc15324ad Merge pull request #701 from amalhub/master 
Merging Cloud updates to master
 2017-04-21 15:59:00 +05:30
Jasintha
e6b38fbdb4 Implemeting dynamic recivers and streams deployment into DAS 2017-04-21 15:51:24 +05:30
WSO2 Builder
1ecb4edbd7 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare for next development iteration 2017-04-21 15:31:09 +05:30
WSO2 Builder
48a8f43cb3 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare release v2.0.46 2017-04-21 15:30:57 +05:30
WSO2 Builder
16d97d62be [WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare for next development iteration 2017-04-20 14:41:55 +05:30
WSO2 Builder
8891784b99 [WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare release v2.0.45 2017-04-20 14:41:41 +05:30
ayyoob
ea6afee772 added device properties to a single table 2017-04-19 21:04:56 +05:30
WSO2 Builder
f7d1a7cf99 [WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare for next development iteration 2017-04-18 10:40:31 +05:30
WSO2 Builder
4b85af950c [WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare release v2.0.44 2017-04-18 10:40:22 +05:30
WSO2 Builder
b9e614e383 [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration 2017-04-17 16:39:50 +05:30