Commit Graph

3348 Commits

Author SHA1 Message Date
Geeth
29bf6f25cf Merge pull request #487 from geethkokila/release-2.0.x
Fixing the null pointer issue in policy manager
2016-12-15 11:00:56 +05:30
geethkokila
2b7d5fd66b Fixing the null pointer issue in policy manager 2016-12-15 10:57:48 +05:30
Vishanth
c42260feb6 Merge pull request #486 from Vishanth/release-2.0.x
Fixing some multi tenancy issues
2016-12-15 10:35:41 +05:30
Vishanth
1714328db0 datasource access for multi tenancy 2016-12-15 10:32:26 +05:30
Vishanth
ebc896ccd4 removing the device type from constraint to support multi tenancy since it is not unique 2016-12-15 10:30:56 +05:30
Geeth
099fc99bce Merge pull request #482 from rasika/release-2.0.x
Fixing IOTS-333: Devices listing page doesn't honor analyticsEnabled and groupingEnabled configs
2016-12-11 18:52:17 +05:30
Rasika Perera
9e17e36fe7 Merge pull request #481 from rasika/release-2.0.x
Now SSO login page is /devicemgt/login
2016-12-11 15:02:18 +05:30
Rasika Perera
9f615916d0 Fixing analyticsEnabled and groupingEnabled not working 2016-12-11 14:56:31 +05:30
Rasika Perera
1bee155d9a Fixing formatting issue 2016-12-09 19:06:00 +05:30
Rasika Perera
91437ff81c Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-09 18:39:39 +05:30
Rasika Perera
c284732192 Displaying SSO auth failure messages 2016-12-09 18:22:09 +05:30
Rasika Perera
9fd6145605 Fixing SSO issue 2016-12-09 17:34:56 +05:30
Charitha Goonetilleke
b61ffda8f6 Merge pull request #479 from wso2/release-2.0.3
Release 2.0.3
2016-12-09 12:21:48 +05:30
WSO2 Builder
a59edee410 [maven-release-plugin] prepare for next development iteration 2016-12-08 14:39:00 +00:00
WSO2 Builder
8f9b21b41b [maven-release-plugin] prepare release v2.0.3 2016-12-08 14:37:11 +00:00
charitha
d8881244fd Fix issue in task operation 2016-12-08 20:03:54 +05:30
charitha
0a7f8ac22c Update error pages and CsrfGuard property file. 2016-12-08 19:41:43 +05:30
charitha
78dfddbbed Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x 2016-12-08 18:58:47 +05:30
Ruwan
dfd0b881a3 Merge pull request #478 from madhawap/release-2.0.x
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 18:12:52 +05:30
madhawap
fa171ef079 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-08 17:38:24 +05:30
madhawap
d62a9c8b83 resolving conflicts 2016-12-08 17:38:12 +05:30
Madawa Soysa
938352266a Merge pull request #477 from madawas/IOTS-296
Fixing generic policy payload
2016-12-08 17:32:53 +05:30
Madawa Soysa
ea1371a008 Fixing generic policy payload 2016-12-08 17:31:50 +05:30
madhawap
b889f6e384 adding separate tasks for each device type 2016-12-08 17:21:07 +05:30
charitha
0b3183e3be Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x 2016-12-08 17:19:27 +05:30
charitha
312098b1de Fix issues in generic policy editor 2016-12-08 17:19:12 +05:30
Harshan Liyanage
0c9c82ddca Merge pull request #476 from hasuniea/release-2.0.x
Fixing windows Device Name issue
2016-12-08 16:26:27 +05:30
Hasunie
9a1c12d730 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-08 15:59:30 +05:30
Hasunie
60d1281949 fixing windows device name issue 2016-12-08 15:58:32 +05:30
Charitha Goonetilleke
78bef05e11 Merge pull request #474 from madawas/IOTS-296
IOTS-296: Refactoring generic policy unit code
2016-12-08 15:09:07 +05:30
geethkokila
b9d104e9b2 Fixing the certificate mgt issue 2016-12-08 14:38:42 +05:30
geethkokila
87b2fb3603 Fixing the login issue 2016-12-08 14:28:33 +05:30
geethkokila
9def8aa609 Fixing the login issue 2016-12-08 14:08:46 +05:30
geethkokila
a0615d3d63 Merge branch 'release-2.0.x' into merge-master 2016-12-08 12:36:53 +05:30
geethkokila
d911281ad1 Merging master branch with release-2.0.x 2016-12-08 12:34:50 +05:30
Madawa Soysa
630a1105a9 IOTS-296: Refactoring generic policy unit code
This code is refactored to use the device type specific operation mod functions (payload generation etc.)  in the device type plugins.
2016-12-08 10:29:12 +05:30
Ruwan
a0c842c6c6 Merge pull request #473 from charithag/release-2.0.x
Update the way we are checking existence of policy operations.
2016-12-07 14:52:47 +05:30
Rasika Perera
6edbb8330f Merge pull request #472 from rasika/release-2.0.x
Fixing enrollment broken issue
2016-12-07 14:45:13 +05:30
charitha
4b5c69d2d7 Update the way we are checking existence of policy operations. 2016-12-07 14:40:56 +05:30
Rasika Perera
641cc58bbf Fixing enrollment broken issue 2016-12-07 14:37:10 +05:30
Charitha Goonetilleke
f4ffacc2c6 Merge pull request #471 from DimalChandrasiri/release-2.0.x
Fix for datatable icon not showing issue
2016-12-07 13:20:56 +05:30
Imesh Chandrasiri
da2fd787c4 Fix for datatable icon not showing issue 2016-12-07 12:50:23 +05:30
Ruwan
f2f304ccc4 Merge pull request #470 from rasika/release-2.0.x
Fixing device identifier is null and Throwing exception when device not found
2016-12-07 12:15:17 +05:30
Rasika Perera
4e0730f50c Fixing device identifier is null issue 2016-12-07 12:06:22 +05:30
Rasika Perera
289987db8e Throwing exception on getDevice when device is not found 2016-12-07 12:05:48 +05:30
Hasunie
40d8488466 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-07 09:08:10 +05:30
Ruwan
4bda6d89cb Merge pull request #469 from menakaj/release-2.0.x
Android sense stabilization
2016-12-07 08:55:22 +05:30
Hasunie
b9e0b099a1 fixing device update issue 2016-12-07 08:37:00 +05:30
charitha
7368b2cf64 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-06 19:09:24 +05:30
charitha
8348002f66 Merge branch 'release-2.0.x' of https://github.com/ruwany/carbon-device-mgt into release-2.0.x 2016-12-06 19:07:21 +05:30