Commit Graph

2150 Commits (d51ee711fc7e3ea30a8cafad9fd7b8ae16c52915)

Author SHA1 Message Date
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
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
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
8 years ago
Ruwan a0c842c6c6 Merge pull request #473 from charithag/release-2.0.x
8 years ago
Rasika Perera 6edbb8330f Merge pull request #472 from rasika/release-2.0.x
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
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
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
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
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
Madawa Soysa de95c99ea7 IOTS-296: Genaralizing policy view UI
8 years ago
Hasunie 631ea6e80f Merge pull request #465 from harshanL/release-2.0.x
8 years ago
Harshan Liyanage 24c0966dce Merge pull request #462 from madawas/IOTS-322
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
Madawa Soysa 1d1f399477 IOTS-322: Infroming users when device types are not installed
8 years ago
Imesh Chandrasiri f8d03e992e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Imesh Chandrasiri 09fa48c4c2 Removed fade-edge class from template markups for better listing readability
8 years ago
Charitha Goonetilleke 22990087a0 Merge pull request #459 from GPrathap/release-2.0.x
8 years ago
charitha 78d0172d5d Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x
8 years ago
charitha ee5459dc79 Fix for https://wso2.org/jira/browse/IOTS-321
8 years ago
Rasika Perera 2cfff85ee2 Merge pull request #458 from ruwany/release-2.0.x
8 years ago
Ace 7eaee141e0 Adding content-type to descriptor
8 years ago
GPrathap 6e69fc8e84 changed application creation endpoint
8 years ago
Madawa Soysa 5c356914e8 IOTS-296: Commenting and refactoring
8 years ago
WSO2 Builder 228b24ca79 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 5dbb258f55 [maven-release-plugin] prepare release v2.0.2
8 years ago
Charitha Goonetilleke 67a73189e1 Merge pull request #456 from rasika/IoTS-1.0.0
8 years ago
Rasika Perera bec0f58e38 Adding semi-colon on context variable on service invoker Js
8 years ago
Rasika Perera 884bbe66b5 Adding iOS enrollment path into config.json
8 years ago
Rasika Perera 098ae372f7 Adding new css class for device type view image
8 years ago
charitha 3b97b3296e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Megala ed325ee576 Adding dashboard feature
8 years ago
Chatura Dilan 82d865b104 Merge pull request #453 from madhawap/release-2.0.x
8 years ago
madhawap 2b00645779 refactored code
8 years ago
charitha e718ab5504 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha cad686b43c Bug fixes & UI/UX improvements
8 years ago
madhawap bec4ae681d Seperate out task operations
8 years ago
Madawa Soysa b2650e439c Fix issue with policy wrapper group select
8 years ago
Madawa Soysa 345fdc0ced IOTS-296: Removing ownership selection when policy creation
8 years ago
charitha d9b670ef19 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha 564cece94b Bug fixes
8 years ago
Charitha Goonetilleke e1d2d8a73f Merge pull request #447 from ruwany/release-2.0.x
8 years ago
Ace 6126776fcf Adding android operations bar related changes
8 years ago
Madawa Soysa 8cdc8cfb24 IOTS-296: Refactoring Policy create/edit units
8 years ago
Charitha Goonetilleke d9763ff5b7 Merge pull request #445 from GPrathap/release-2.0.x
8 years ago
GPrathap 64ce41f571 added creating an application for WebSocket
8 years ago
Charitha Goonetilleke bf48f57f84 Merge pull request #442 from DimalChandrasiri/release-2.0.x
8 years ago
Charitha Goonetilleke c84d7fd13d Merge pull request #440 from DimalChandrasiri/IoTS-1.0.0
8 years ago
Madawa Soysa c61cd484a0 IOTS-296: Adding group selection capability when adding a policy
8 years ago
Imesh Chandrasiri a56b953fcb Validation error fix
8 years ago
Madawa Soysa a4ca74c6c0 IOTS-296: Generalizing policy UI for policy edit
8 years ago
Madawa Soysa 7aada58472 IOTS-296: Fixing issue with device type icon
8 years ago
Madawa Soysa 0dfde40b7c IOTS-296: Generalizing policy UI for policy create wizard
8 years ago
Imesh Chandrasiri d90c9ab68a Data table fix when list view
8 years ago
WSO2 Builder 8431b30ddc [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ae2e283f14 [maven-release-plugin] prepare release v2.0.1
8 years ago
Rasika Perera 4789aafd28 Minor ui changes to the group listing
8 years ago
Charitha Goonetilleke 027498895a Merge pull request #436 from DimalChandrasiri/IoTS-1.0.0
8 years ago
Imesh Chandrasiri 54bb91d428 IoT Build UI Fixes
8 years ago
Rasika Perera 03f965adf6 Decrease group listing page loading time with lazy roles listing
8 years ago
Imesh Chandrasiri 07a0dee2d9 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
Rasika Perera 05453e7379 Removed 'role' suffix from roles listing page
8 years ago
Rasika Perera ce4b389df0 Merge branch 'IoTS-1.0.0' of https://github.com/charithag/carbon-device-mgt into IoTS-1.0.0
8 years ago
Rasika Perera aaade2363c Adding new api to create combined roles
8 years ago
Rasika Perera 3fe18ba4bb Refactoring group sharing modal
8 years ago
charitha ca5d96df67 Add test cases to verify DAO functionality
8 years ago
Rasika Perera 54211bc3cc Fixing minor issues on GroupDAO
8 years ago
Imesh Chandrasiri 5525c42eae Removed Unneccsary title and added padding
8 years ago
charitha a2db592d69 Updated group management APIs and service
8 years ago
charitha 726bbcd35d Merged with upstream
8 years ago
Madawa Soysa 55bc5042bb Merge pull request #422 from madawas/grouping-policy
8 years ago
charitha c07d77b85d Updated group sharing model
8 years ago
ayyoob ec3dbd37dd fixed commit comments
8 years ago
Madawa Soysa 2f431504fe creating groups from ownership and changing group owner
8 years ago
ayyoob e3849ef21e removed feature lifecycle implementation
8 years ago
ayyoob 3fb42ef32e Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob fede8ec409 few changes after testing with authoriser
8 years ago
Madawa Soysa 8ab73ce07d fixing issue with javadocs
8 years ago
Madawa Soysa 2164a30f88 changing group owner to super user
8 years ago
Madawa Soysa c29bf24a75 Adding mobile devices to default groupes based on device ownership
8 years ago
GPrathap 6efc5bc1ed removed @API and @Permission annotations
8 years ago
ayyoob fe263efe60 changed device access verification approach
8 years ago
ayyoob 28faf53802 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob 59e2a33e4a exposed device access authorisation as a service
8 years ago
ayyoob 20e7dd9e86 picked icon from features config
8 years ago
ayyoob 8a6af051dc Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob a0c8aeb159 few changes after testing feature manager implementation
8 years ago
WSO2 Builder 19c1b3566d [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder cff6e242c8 [maven-release-plugin] prepare release v2.0.0
8 years ago
Ace 16d2a062da Adding android device-view changes
8 years ago
Ace a0616cf9a2 Adding config changes
8 years ago
charitha a6064d2561 Update component versions for IoTS-1.0.0 release
8 years ago
charitha 40c59c2f16 Fix issues in policy UI
8 years ago
charitha 589ba9c40b Add missing units
8 years ago
charitha b8d8b35847 Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0
8 years ago
sameera910409 02eec1033e add group sharing role create functionality
8 years ago
sinthuja 2f59f1566c Changing the port to the default port of the analytics pack.
8 years ago
ayyoob 44ac6b13b5 changes in UI after refactoring
8 years ago
Ace 5eaca0b1b1 merging with upstream
8 years ago
Ace 2aa1c98d0b bringing common features to cdmf
8 years ago
charitha bb60acd105 Fix device listing issue
8 years ago
ayyoob 33bb9b5a14 merged with IoTS-1.0.0 branch
8 years ago
sinthuja a5212213cf Changing the default wbsocket URL to DAS endpoint.
8 years ago
charitha d1a6353195 Synced with changes in master
8 years ago
charitha 4a115e5d3f Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
Charitha Goonetilleke e1a1f710a0 Merge pull request #406 from sameeragunarathne/IoTS-1.0.0
8 years ago
charitha ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
8 years ago
WSO2 Builder 9517a3d30f [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder a8568299b9 [maven-release-plugin] prepare release v1.2.6
8 years ago
kamidu 0867b3d075 updating the footer
8 years ago
Rasika Perera fbe423b824 Using permissionsUtil.hasPermission for clientside permission check
8 years ago
Rasika Perera b1b6b94570 Adding permissionsUtil
8 years ago
sameera910409 f8f7dd08cd fixed share groups and group analytics in device grouping
8 years ago
Harshan Liyanage 261e8c510c Fixed syntax issue in device.js file
8 years ago
Charitha Goonetilleke 353707c9c7 Merge pull request #404 from sameeragunarathne/IoTS-1.0.0
8 years ago
charitha 1bfba25c5e Remove user list and role list attributes from group object
8 years ago
kamidu 12e609c737 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 0c70c87406 fix for EMM-1673
8 years ago
Kamidu Sachith Punchihewa 02d3adf51e Merge pull request #401 from madawas/modal-refactor
8 years ago
Kamidu Sachith Punchihewa 33874f95b6 Merge pull request #399 from saadsahibjan/master
8 years ago
Kamidu Sachith Punchihewa 9d90411189 Merge pull request #402 from madawas/EMM-1298
8 years ago
Kamidu Sachith Punchihewa a295c88dc0 Merge pull request #405 from Megala21/master
8 years ago
sameera910409 204a0ed943 fixes for the comments of the PR#404
8 years ago
Megala a088392b2f Adding css for required fields
8 years ago
sameera910409 fef7c07cb2 add device group deleting and updating fixes
8 years ago
Harshan Liyanage 72522ad759 Fixed SQL syntax issue
8 years ago
Harshan Liyanage 9bf5ca94fb Fixed SQL syntax issue
8 years ago
sameera910409 41f367abfa add group listing and group device listing fixes
8 years ago
kamidu 1c2d339fed Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 7212e969d8 Fix for SQL query issue in mysql
8 years ago
Ruwan 072119d7df Merge pull request #403 from ayyoob/commit-fixes
8 years ago