Commit Graph

3413 Commits

Author SHA1 Message Date
ayyoob
c46cbfafe5 Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt into devicetype-3.1.0 2017-06-01 17:23:42 +05:30
ayyoob
4dc0f69e28 updated version 2017-06-01 17:23:18 +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
ayyoob
8a56161a43 Implemented Pull Notification Support 2017-06-01 17:19:14 +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
Rasika Perera
aa0f9e0510 Merge pull request #744 from ayyoob/new-master
auto healing in case of app deletion and added device scope to handle to handle multiple session
2017-06-01 05:29:27 +05:30
Malintha Fernando
07f2cb608b Fix : Store device type names as it is 2017-05-31 10:16: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
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
ayyoob
f03155a702 fixed missing import package issue 2017-05-29 11:36:09 +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
warunalakshitha
1a26595472 Fix issue with using enrollment id for device id 2017-05-26 14:54:04 +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
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
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
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
Megala Uthayakumar
47bdbc7c14 Merge pull request #751 from sinthuja/master
adding the if condition for only newRoles list iteration.
2017-05-18 16:03:06 +05:30
sinthuja
3340d94acf adding the if condition for only newRoles list iteration. 2017-05-18 16:00:25 +05:30
megala21
f41a692bf3 Reformatting code 2017-05-18 14:21:24 +05:30
megala21
25e0b989d2 Fixing issues in group sharing 2017-05-18 14:17:03 +05:30
Madawa Soysa
20999f4cd5 Fixing wso2/product-iots##467 2017-05-18 10:54:54 +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
Megala Uthayakumar
39439c5c50 Merge pull request #748 from sinthuja/master
Fixing issues in editing policy
2017-05-17 18:38:31 +05:30
sinthuja
e7490dd278 Fixing https://github.com/wso2/product-iots/issues/443. 2017-05-17 17:24:37 +05:30
Megala Uthayakumar
8830d627e9 Merge pull request #747 from sinthuja/master
Fixing some issues reported for product-iots.
2017-05-17 16:18:32 +05:30
sinthuja
9c110bb59c Fixing https://github.com/wso2/product-iots/issues/444. 2017-05-16 18:41:07 +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
sinthuja
4df590caa1 Fixing https://github.com/wso2/product-iots/issues/447. 2017-05-16 18:17:45 +05:30
Madawa Soysa
c7d002a6a9 Fix for https://github.com/wso2/product-iots/issues/449 2017-05-16 17:18:16 +05:30
ayyoob
1955b028d2 add tenancy to property table 2017-05-15 20:08:03 +05:30
ayyoob
fbb5f5ae88 merged with origin 2017-05-15 18:15:24 +05:30