Commit Graph

2016 Commits

Author SHA1 Message Date
Rasika Perera
8a09e44c3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1624 2018-01-23 18:48:26 +05:30
WSO2 Builder
774c20a09a [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare for next development iteration 2018-01-23 12:48:12 +00:00
WSO2 Builder
4d35797a55 [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare release v3.0.208 2018-01-23 12:47:55 +00:00
Rasika Perera
f3860e42f7 Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:08:20 +05:30
Rasika Perera
a406dd0540
Merge pull request #1163 from rasika/fix-1611
Isolating Geo Location Enabling Configuration
2018-01-23 17:59:57 +05:30
Rasika Perera
3a9261536e Renamed isEnabled into Enabled for the consistency 2018-01-23 14:59:52 +05:30
Rasika Perera
08f4f04101 Fixing a typo 2018-01-23 14:39:33 +05:30
WSO2 Builder
8776317dfe [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare for next development iteration 2018-01-22 11:14:43 +00:00
WSO2 Builder
21c406fe01 [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare release v3.0.207 2018-01-22 11:14:29 +00:00
Rasika Perera
394f45f4bd Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-22 15:43:07 +05:30
geethkokila
ca92c5029f Changing the variable name 2018-01-22 15:25:40 +05:30
geethkokila
1a957666e3 Improvements to policy monitoring framework
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
2018-01-22 14:39:16 +05:30
WSO2 Builder
d8caf3baea [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare for next development iteration 2018-01-22 04:26:32 +00:00
WSO2 Builder
944d640d5f [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare release v3.0.206 2018-01-22 04:26:17 +00:00
Madhawa Perera
e56fb5f4de
New Activity Info Provider API resource which accept an array of activity IDs to get activity information (#1161)
* New Activity Info Provider API resource which accept an array of activity IDs to get activity information

* Modifications to the new activity info provider api

* Add acceptable activity list count validation

* Modifications to the new activity provider API resource

* Added license header to the test class

* Modifications to the new activity provider api
2018-01-22 09:38:51 +05:30
WSO2 Builder
15bea25074 [WSO2 Release] [Jenkins #2865] [Release 3.0.205] prepare for next development iteration 2018-01-17 10:53:13 +00:00
WSO2 Builder
f9484f286f [WSO2 Release] [Jenkins #2865] [Release 3.0.205] prepare release v3.0.205 2018-01-17 10:52:58 +00:00
WSO2 Builder
955de2159c [WSO2 Release] [Jenkins #2864] [Release 3.0.204] prepare for next development iteration 2018-01-17 10:13:09 +00:00
WSO2 Builder
d7c66d1d67 [WSO2 Release] [Jenkins #2864] [Release 3.0.204] prepare release v3.0.204 2018-01-17 10:12:51 +00:00
WSO2 Builder
4883a5779d [WSO2 Release] [Jenkins #2862] [Release 3.0.203] prepare for next development iteration 2018-01-17 05:51:08 +00:00
WSO2 Builder
4546e323cf [WSO2 Release] [Jenkins #2862] [Release 3.0.203] prepare release v3.0.203 2018-01-17 05:50:53 +00:00
WSO2 Builder
eae50efeee [WSO2 Release] [Jenkins #2860] [Release 3.0.202] prepare for next development iteration 2018-01-17 03:07:14 +00:00
WSO2 Builder
6646a2f445 [WSO2 Release] [Jenkins #2860] [Release 3.0.202] prepare release v3.0.202 2018-01-17 03:07:00 +00:00
WSO2 Builder
086eeecb01 [WSO2 Release] [Jenkins #2858] [Release 3.0.201] prepare for next development iteration 2018-01-15 10:15:25 +00:00
WSO2 Builder
74d5a5b469 [WSO2 Release] [Jenkins #2858] [Release 3.0.201] prepare release v3.0.201 2018-01-15 10:15:11 +00:00
geethkokila
0e3069b0da Changing the generic application retrieval to get the application ids
This fixes the issue caused due to retrieving the application details by submiting the device id, becasue at the first storing of the application, they are not stored agaist a device. It get's mapped later with the device. Hence it caused a null pointer
2018-01-15 15:24:27 +05:30
WSO2 Builder
c57dec9f30 [WSO2 Release] [Jenkins #2856] [Release 3.0.200] prepare for next development iteration 2018-01-15 09:01:23 +00:00
WSO2 Builder
b51c9e9d4c [WSO2 Release] [Jenkins #2856] [Release 3.0.200] prepare release v3.0.200 2018-01-15 09:01:09 +00:00
geethkokila
b652d025c8 This commits fixes the issues of having the Application memory info and is-active flag with the DM_APPLICATION table, because those values should go to to DM_APPLICATION_MAPPING table. Change of the tables has happened. 2018-01-15 13:56:05 +05:30
WSO2 Builder
531f209b2c [WSO2 Release] [Jenkins #2854] [Release 3.0.199] prepare for next development iteration 2018-01-11 06:25:59 +00:00
WSO2 Builder
2415a8d7fa [WSO2 Release] [Jenkins #2854] [Release 3.0.199] prepare release v3.0.199 2018-01-11 06:25:44 +00:00
WSO2 Builder
ae743d0fbd [WSO2 Release] [Jenkins #2852] [Release 3.0.198] prepare for next development iteration 2018-01-10 08:33:28 +00:00
WSO2 Builder
7691579570 [WSO2 Release] [Jenkins #2852] [Release 3.0.198] prepare release v3.0.198 2018-01-10 08:33:14 +00:00
WSO2 Builder
ffedebe554 [WSO2 Release] [Jenkins #2850] [Release 3.0.197] prepare for next development iteration 2018-01-10 07:47:13 +00:00
WSO2 Builder
63ebfd7837 [WSO2 Release] [Jenkins #2850] [Release 3.0.197] prepare release v3.0.197 2018-01-10 07:46:58 +00:00
Ruwan
b6792f89f1
Merge pull request #1152 from ruwany/master
Fixing https://github.com/wso2/product-iots/issues/1579
2018-01-10 12:58:29 +05:30
Ace
e054a49aea Adding fix for https://github.com/wso2/product-iots/issues/1579 2018-01-10 12:26:52 +05:30
WSO2 Builder
8531895e67 [WSO2 Release] [Jenkins #2848] [Release 3.0.196] prepare for next development iteration 2018-01-10 02:17:21 +00:00
WSO2 Builder
c5e9ae3c1a [WSO2 Release] [Jenkins #2848] [Release 3.0.196] prepare release v3.0.196 2018-01-10 02:17:06 +00:00
WSO2 Builder
17abcc8192 [WSO2 Release] [Jenkins #2846] [Release 3.0.195] prepare for next development iteration 2018-01-09 10:22:08 +00:00
WSO2 Builder
c4dfe974f1 [WSO2 Release] [Jenkins #2846] [Release 3.0.195] prepare release v3.0.195 2018-01-09 10:21:51 +00:00
WSO2 Builder
becdfba15e [WSO2 Release] [Jenkins #2845] [Release 3.0.194] prepare for next development iteration 2018-01-09 09:45:57 +00:00
WSO2 Builder
b70504bc8b [WSO2 Release] [Jenkins #2845] [Release 3.0.194] prepare release v3.0.194 2018-01-09 09:45:38 +00:00
WSO2 Builder
36d1839ce2 [WSO2 Release] [Jenkins #2843] [Release 3.0.193] prepare for next development iteration 2018-01-09 08:43:08 +00:00
WSO2 Builder
a67433442e [WSO2 Release] [Jenkins #2843] [Release 3.0.193] prepare release v3.0.193 2018-01-09 08:42:54 +00:00
Rasika Perera
83ae57a044
Merge pull request #1147 from rasika/fix-1553
Fixing cannot publish policies without enrolling a device
2018-01-09 13:58:24 +05:30
WSO2 Builder
8d26327a9d [WSO2 Release] [Jenkins #2841] [Release 3.0.192] prepare for next development iteration 2018-01-04 17:13:30 +00:00
WSO2 Builder
4d16377ddf [WSO2 Release] [Jenkins #2841] [Release 3.0.192] prepare release v3.0.192 2018-01-04 17:13:14 +00:00
Rasika Perera
e254d4ccc8 Fixing https://github.com/wso2/product-iots/issues/1553 and https://github.com/wso2/product-iots/issues/1546 2018-01-04 00:29:23 +05:30
kamidu
6daf95b78d Change the config placement for improve the separatability 2018-01-03 16:27:09 +05:30