Commit Graph

4839 Commits

Author SHA1 Message Date
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
Rasika Perera
ddfecba1a6 Added geo fencing unit 2017-05-31 10:58:51 +05:30
Ayyoob Hamza
658cefd539 Merge pull request #7 from Malintha/devicetype-3.1.0
Fix : Store device type names as it is
2017-05-31 10:31:59 +05:30
Malintha Fernando
07f2cb608b Fix : Store device type names as it is 2017-05-31 10:16:24 +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
Rasika Perera
0a8929c7ee Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-05-30 16:35:36 +05:30
sinthuja
e6703f47a2 Merge pull request #754 from sinthuja/app-mgt-refactoring
First cut of refactoring the code.
2017-05-30 12:54:44 +05:30
sinthuja
810c0383a8 Fixing the compilation failure issues. 2017-05-30 12:41:23 +05:30
sinthuja
d882a05833 Reverting back to runtime exceptions. 2017-05-30 12:03:56 +05:30
sinthuja
dd6e70ce86 First cut of refactoring the code. 2017-05-30 11:44:24 +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
Ayyoob Hamza
756ba08073 Merge pull request #753 from madhawap/master
Fix for disabling reboot and upgrade-firmware operations on UI
2017-05-30 09:06:06 +05:30
madhawap
c4d433a1a0 Fix for disabling reboot and upgrade-firmware operations on UI and Code formatting
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled. In addition change a c-style for loop to a foreach loop in PolicyManagementServiceImpl.java
2017-05-29 20:13:51 +05:30
Chatura Dilan
9343032c88 Changes to App Management Externsions Framework 2017-05-29 18:35:37 +05:30
Rasika Perera
f864506f62 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-05-29 13:09:21 +05:30
Rasika Perera
7b0295ff01 Added geo-fencing to the devicemgt app 2017-05-29 12:58:06 +05:30
Rasika Perera
ea3ed9c444 Added Geo Service into Device Mgt Core 2017-05-29 11:51:41 +05:30
ayyoob
f03155a702 fixed missing import package issue 2017-05-29 11:36:09 +05:30
Chatura Dilan
c89491b93e Changes to schema 2017-05-29 10:22:17 +05:30
ayyoob
dbdaa5a0e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-05-29 05:44:36 +05:30
ayyoob
c3f23fa564 fixed multi tenant issues after testing custom device type impl 2017-05-29 01:00:16 +05:30
Amal Gunatilake
2ac5a56ad0 Merge pull request #749 from madawas/master
Fixing wso2/product-iots##467
2017-05-26 15:25:25 +05:30
Amal Gunatilake
0341c09ad3 Merge pull request #752 from warunalakshitha/master
Fix issues with scheduler task to use device id
2017-05-26 15:21:54 +05:30
Chatura Dilan
23ea67deb1 Fixes for filter properties 2017-05-26 15:15:36 +05:30
warunalakshitha
1a26595472 Fix issue with using enrollment id for device id 2017-05-26 14:54:04 +05:30
Chatura Dilan
dd07101e3d Fixed MySQL script 2017-05-26 14:25:49 +05:30
Chatura Dilan
69ace64091 Refactoring services classes 2017-05-26 14:21:54 +05:30
Chatura Dilan
43ef32b37c Refactor services 2017-05-25 14:37:16 +05:30
ayyoob
56faa75861 fixed analytics issues 2017-05-25 03:07:19 +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
ayyoob
5acf5912e4 added comment 2017-05-24 00:41:21 +05:30
ayyoob
a037f91f56 removed task Config from template 2017-05-24 00:27:13 +05:30
ayyoob
4d22bc7064 fixed UI Issues 2017-05-24 00:26:02 +05:30
warunalakshitha
bea8111739 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-05-22 19:12:07 +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
Amal Gunatilake
3f7543bee8 Merge pull request #742 from milanperera/iot-master
Removed unnecessary interace methods from Device Manager
2017-05-22 15:27:41 +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
warunalakshitha
ca934e222d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-05-19 13:54:06 +05:30
Chatura Dilan
fa88673ac4 Changed lifecycle management to application from release 2017-05-19 10:22:31 +05:30
ayyoob
6004ee7264 Adding back the sample definition file 2017-05-19 02:06:08 +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
ayyoob
ed366867d1 Added Pluggable Device Type 2017-05-19 01:48:54 +05:30
ayyoob
6ab219c9dd Added Pluggable Device Type 2017-05-19 01:48:36 +05:30