charitha
|
78dfddbbed
|
Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x
|
8 years ago |
Ruwan
|
dfd0b881a3
|
Merge pull request #478 from madhawap/release-2.0.x
Adding separate tasks to carry out device monitoring for each device type
|
8 years ago |
madhawap
|
fa171ef079
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
madhawap
|
d62a9c8b83
|
resolving conflicts
|
8 years ago |
Madawa Soysa
|
938352266a
|
Merge pull request #477 from madawas/IOTS-296
Fixing generic policy payload
|
8 years ago |
Madawa Soysa
|
ea1371a008
|
Fixing generic policy payload
|
8 years ago |
madhawap
|
b889f6e384
|
adding separate tasks for each device type
|
8 years ago |
charitha
|
0b3183e3be
|
Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x
|
8 years ago |
charitha
|
312098b1de
|
Fix issues in generic policy editor
|
8 years ago |
Harshan Liyanage
|
0c9c82ddca
|
Merge pull request #476 from hasuniea/release-2.0.x
Fixing windows Device Name issue
|
8 years ago |
Hasunie
|
9a1c12d730
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Hasunie
|
60d1281949
|
fixing windows device name issue
|
8 years ago |
Charitha Goonetilleke
|
78bef05e11
|
Merge pull request #474 from madawas/IOTS-296
IOTS-296: Refactoring generic policy unit code
|
8 years ago |
geethkokila
|
b9d104e9b2
|
Fixing the certificate mgt issue
|
8 years ago |
geethkokila
|
87b2fb3603
|
Fixing the login issue
|
8 years ago |
geethkokila
|
9def8aa609
|
Fixing the login issue
|
8 years ago |
geethkokila
|
a0615d3d63
|
Merge branch 'release-2.0.x' into merge-master
|
8 years ago |
geethkokila
|
d911281ad1
|
Merging master branch with release-2.0.x
|
8 years ago |
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.
|
8 years ago |
Ruwan
|
a0c842c6c6
|
Merge pull request #473 from charithag/release-2.0.x
Update the way we are checking existence of policy operations.
|
8 years ago |
Rasika Perera
|
6edbb8330f
|
Merge pull request #472 from rasika/release-2.0.x
Fixing enrollment broken issue
|
8 years ago |
charitha
|
4b5c69d2d7
|
Update the way we are checking existence of policy operations.
|
8 years ago |
Rasika Perera
|
641cc58bbf
|
Fixing enrollment broken issue
|
8 years ago |
Charitha Goonetilleke
|
f4ffacc2c6
|
Merge pull request #471 from DimalChandrasiri/release-2.0.x
Fix for datatable icon not showing issue
|
8 years ago |
Imesh Chandrasiri
|
da2fd787c4
|
Fix for datatable icon not showing issue
|
8 years ago |
Ruwan
|
f2f304ccc4
|
Merge pull request #470 from rasika/release-2.0.x
Fixing device identifier is null and Throwing exception when device not found
|
8 years ago |
Rasika Perera
|
4e0730f50c
|
Fixing device identifier is null issue
|
8 years ago |
Rasika Perera
|
289987db8e
|
Throwing exception on getDevice when device is not found
|
8 years ago |
Hasunie
|
40d8488466
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Ruwan
|
4bda6d89cb
|
Merge pull request #469 from menakaj/release-2.0.x
Android sense stabilization
|
8 years ago |
Hasunie
|
b9e0b099a1
|
fixing device update issue
|
8 years ago |
charitha
|
7368b2cf64
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
charitha
|
8348002f66
|
Merge branch 'release-2.0.x' of https://github.com/ruwany/carbon-device-mgt into release-2.0.x
|
8 years ago |
Charitha Goonetilleke
|
e137644677
|
Merge pull request #467 from madawas/IOTS-296
IOTS-296: Genaralizing policy view UI
|
8 years ago |
charitha
|
161fe62a08
|
Fix for https://wso2.org/jira/browse/IOTS-323
|
8 years ago |
Ace
|
34225bd9da
|
fixing operations loading spinner and other ui issues
|
8 years ago |
Menaka Jayawardena
|
84a0b398fe
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Menaka Jayawardena
|
ca2a79a001
|
Added entries for portal app in config files.
|
8 years ago |
Rasika Perera
|
9fa4775ec6
|
Merge pull request #466 from ruwany/release-2.0.x
Changes to descriptor
|
8 years ago |
Ace
|
872bd88c6e
|
Merging with upstream
|
8 years ago |
Ace
|
8cc0ba56c1
|
Adding changes to descriptor
|
8 years ago |
Madawa Soysa
|
de95c99ea7
|
IOTS-296: Genaralizing policy view UI
This commit inclued the generic policy view UI unit
|
8 years ago |
Hasunie
|
631ea6e80f
|
Merge pull request #465 from harshanL/release-2.0.x
Added security filters to devicemgt jaggery app
|
8 years ago |
Harshan Liyanage
|
24c0966dce
|
Merge pull request #462 from madawas/IOTS-322
IOTS-322: Infroming users when device types are not installed
|
8 years ago |
Harshan Liyanage
|
cd191bcfaf
|
Merge pull request #464 from rasika/release-2.0.x
Fixing sso infinite redirection
|
8 years ago |
Harshan Liyanage
|
b4eb86e985
|
Added security filters to devicemgt jaggery app
|
8 years ago |
Rasika Perera
|
e8d8373d46
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Rasika Perera
|
4c1fb558d3
|
Fixing sso infinite redirection
|
8 years ago |
Ruwan
|
6a0246d493
|
Merge pull request #463 from harshanL/release-2.0.x
Updated carbon component versions to include security fixes
|
8 years ago |
Harshan Liyanage
|
5b1f97fee3
|
Updated carbon component versions to include security fixes
|
8 years ago |