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
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
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
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
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
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
Charitha Goonetilleke
e137644677
Merge pull request #467 from madawas/IOTS-296
...
IOTS-296: Genaralizing policy view UI
2016-12-06 19:06:19 +05:30
charitha
161fe62a08
Fix for https://wso2.org/jira/browse/IOTS-323
2016-12-06 18:59:43 +05:30
Ace
34225bd9da
fixing operations loading spinner and other ui issues
2016-12-06 17:13:56 +05:30
Menaka Jayawardena
84a0b398fe
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-06 14:44:05 +05:30
Menaka Jayawardena
ca2a79a001
Added entries for portal app in config files.
2016-12-06 14:43:05 +05:30
Ace
872bd88c6e
Merging with upstream
2016-12-06 13:34:48 +05:30
Ace
8cc0ba56c1
Adding changes to descriptor
2016-12-06 13:29:59 +05:30
Madawa Soysa
de95c99ea7
IOTS-296: Genaralizing policy view UI
...
This commit inclued the generic policy view UI unit
2016-12-06 12:17:46 +05:30
Hasunie
631ea6e80f
Merge pull request #465 from harshanL/release-2.0.x
...
Added security filters to devicemgt jaggery app
2016-12-06 12:12:14 +05:30
Harshan Liyanage
24c0966dce
Merge pull request #462 from madawas/IOTS-322
...
IOTS-322: Infroming users when device types are not installed
2016-12-06 12:06:21 +05:30
Harshan Liyanage
b4eb86e985
Added security filters to devicemgt jaggery app
2016-12-06 11:54:31 +05:30
Rasika Perera
e8d8373d46
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-06 11:36:18 +05:30
Rasika Perera
4c1fb558d3
Fixing sso infinite redirection
2016-12-06 10:50:46 +05:30
Madawa Soysa
1d1f399477
IOTS-322: Infroming users when device types are not installed
...
Currently policy platfom selection page is empty if no device types are installed. This will add an meaningful message to user if no device types are added.
This commit resolves IOTS-322
2016-12-05 16:59:25 +05:30
Imesh Chandrasiri
f8d03e992e
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-05 14:35:59 +05:30
Imesh Chandrasiri
09fa48c4c2
Removed fade-edge class from template markups for better listing readability
2016-12-05 14:35:36 +05:30
Charitha Goonetilleke
22990087a0
Merge pull request #459 from GPrathap/release-2.0.x
...
removed hardcoded validity period while creating application in APIM
2016-12-05 12:50:33 +05:30
charitha
78d0172d5d
Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x
2016-12-05 12:35:58 +05:30
charitha
ee5459dc79
Fix for https://wso2.org/jira/browse/IOTS-321
2016-12-05 12:35:33 +05:30
Rasika Perera
2cfff85ee2
Merge pull request #458 from ruwany/release-2.0.x
...
Adding content-type to descriptor
2016-12-05 10:51:22 +05:30
Ace
7eaee141e0
Adding content-type to descriptor
2016-12-05 10:34:11 +05:30
GPrathap
7807ed77da
removed hardcoded validity period while creating application in APIM
2016-12-05 09:50:10 +05:30
