turcy
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4055 Commits
17 Branches
426 Tags
166 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '4654a4db45'
${ noResults }
Commit Graph

3206 Commits (4654a4db450be223d0f8968489f10c9cf769fadb)

Author SHA1 Message Date
inoshperera c4a2ba0cea adding http api publisher for Android agent to work out of the box
8 years ago
charitha f6f99ed06a Fixed following issues:
8 years ago
Milan Perera b860be0150 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
geethkokila 65cb12b5ac Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
charitha 295921b289 Fixed following issues:
8 years ago
Milan Perera 02d75b757c Fixed conflicts and merged
8 years ago
GPrathap f508bcfd0e corrected method name
8 years ago
GPrathap 4c9578ebe2 resized buffer size to 0 for each scope
8 years ago
GPrathap 649879f998 removed setting APIs secured as default.
8 years ago
WSO2 Builder 6aea6195e9 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3db5b289ac [maven-release-plugin] prepare release v2.0.5
8 years ago
Rasika Perera acb2c38799 Fixing user is not authorized to view devices
8 years ago
WSO2 Builder ed47094964 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 8d409a7248 [maven-release-plugin] prepare release v2.0.4
8 years ago
charitha 1a93868424 Fixed https://wso2.org/jira/browse/IOTS-335
8 years ago
charitha 61d1710614 Fixed https://wso2.org/jira/browse/IOTS-341
8 years ago
Ace 674048ab27 Coorecting version import ranges
8 years ago
Rasika Perera d001cf2ee1 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera fea128d29e Fixing grid-view cropped on group view
8 years ago
Ace d6770c261a updating appm dependencies to relased version
8 years ago
Ayyoob Hamza 4960fd0d05 Merge pull request #499 from charithag/release-2.0.x-IOTS-342
8 years ago
charitha a625ccecf0 Fixed https://wso2.org/jira/browse/IOTS-342
8 years ago
Ruwan 46c3b015fa Merge pull request #498 from charithag/release-2.0.x-email-invites
8 years ago
charitha 58a9ea80c7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Charitha Goonetilleke 5318601df0 Add license header
8 years ago
charitha 2b1d46f45f Finalized enrollment invitations
8 years ago
Charitha Goonetilleke af8902f392 Merge pull request #497 from rasika/release-2.0.x
8 years ago
Rasika Perera b0d32a140e Adding context for anchor links
8 years ago
Rasika Perera ad92a5278e Adding on-image anchor links instead of separate btn for device-view
8 years ago
Rasika Perera 6f7d87a590 Merge pull request #496 from madhawap/release-2.0.x
8 years ago
madhawap d486ad14fd Task operation config related changes
8 years ago
Ace 64da9479a1 Bumping identity dependencies
8 years ago
Ruwan 7619eabc87 Merge pull request #495 from rasika/release-2.0.x
8 years ago
Ace 1d2a5dc9ef Updating identity/auth-saml dependencies to latest
8 years ago
Rasika Perera 4cd2b94303 IOTS-325: Fixing cannot delete a policy associated with a group
8 years ago
Geeth 6eb8beaa2a Merge pull request #493 from Supun94/release-2.0.x
8 years ago
charitha 795ccb740c Add backend support for enrollment invitations
8 years ago
geethkokila 83b9fd46cd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Rasika Perera a633547d19 IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext
8 years ago
geethkokila 1b4857b7fd Fixing conflicts
8 years ago
geethkokila 51c46095a4 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Supun94 a831dc6a9a Changing cdm-config file
8 years ago
Supun94 3d6f5ee64d Changing policy compliance view
8 years ago
Supun94 09572a9977 Removed redundant classes
8 years ago
Supun94 89410dfae4 Changing getEffectiveFeatures method
8 years ago
Supun94 d82a70f841 Changing simple policy decision point
8 years ago
Supun94 2751d4b856 Code refactoring
8 years ago
Supun94 eb1575126f Minor refactoring on policy merging
8 years ago
Supun94 451b2fd1dc Minor refactoring on policy evaluation
8 years ago
Supun94 02fb952cc0 Minor refactoring on policy decision point
8 years ago
Supun94 35f3fcc8f9 Changed policy evaluation point
8 years ago
Supun94 62acc2ebf2 Adding merged policy evaluation service component
8 years ago
Supun94 6565e14051 Adding simple policy evaluation decision point
8 years ago
Supun94 936e71a743 Adding configurations for different policy evaluation service components
8 years ago
Supun94 272ba7b012 Changed getEffectiveFeatures method
8 years ago
Supun94 367fa927b0 Changed policy decision point package structure
8 years ago
Supun94 652d776672 Adding effective policy details
8 years ago
Supun94 5a1c73b119 Adding cdmf effective policy unit
8 years ago
Supun94 2847ff2095 Adding cdmf effective policy page
8 years ago
Supun94 33b79dcbba Adding effective policy service
8 years ago
Supun94 c91da9219d fixed policy conflicts
8 years ago
Supun94 cc5d9012c1 Created simple evaluation point
8 years ago
Supun94 21bc812281 Minor refactoring on Policy Eval service comp
8 years ago
charitha 7acbc5cd0b Moved qr modal to device mgt core
8 years ago
geethkokila 8ca28fa1fd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
Charitha Goonetilleke f4b3313ad7 Merge pull request #491 from DimalChandrasiri/release-2.0.x
8 years ago
Charitha Goonetilleke 8216ea3a79 Merge pull request #488 from madawas/IOTS-296
8 years ago
Rasika Perera 1465c56822 Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
8 years ago
Ace 47d8baccf7 upgrading to latest version of identity
8 years ago
Imesh Chandrasiri 765f97f5a0 email invite sender changes
8 years ago
Imesh Chandrasiri e696b5bd0c Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
geethkokila 8e2432c47b Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
geethkokila 200740eca6 Partial commit for the git update
8 years ago
WSO2 Builder f9b6939cb7 [WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4
8 years ago
Rasika Perera 42930fe8c4 Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
8 years ago
Harshan Liyanage a2a03a523e Refactored RoleMgtServiceImpl.
8 years ago
Harshan Liyanage de2f85de2e IOTS-337:Fixed permission remove issue when updating role permissions.
8 years ago
WSO2 Builder 78b9052c37 [WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
8 years ago
Imesh Chandrasiri f70be13bf2 Common unit for email invite modal for devices screens
8 years ago
Megala d4e9c43ff1 Fixing race condition in creating and subscribing application in api-manager side
8 years ago
Madawa Soysa 5b1a68280c Moving codemirror to a lib unit
8 years ago
Madawa Soysa 0f291d5d04 Fixing generic policy saving issues
8 years ago
geethkokila 2b7d5fd66b Fixing the null pointer issue in policy manager
8 years ago
Vishanth 1714328db0 datasource access for multi tenancy
8 years ago
amalhub 7e90fde461 IOTS-292: Adding new filter configs
8 years ago
amalhub 0bd298e6d7 IOTS-292: Code refactoring
8 years ago
amalhub 871970002a IOTS-292: Adding android cert verification for gateway handler
8 years ago
amalhub 610163d705 IOTS-292: Adding IOS synapse config for gatway change
8 years ago
amalhub d00817268e IOTS-292: Adding the api-mgt handler for gateway change
8 years ago
amalhub fe2b6b5993 IOTS-292: Adding verification services needed for gataway handler
8 years ago
Milan Perera bcbf61a886 Fixed conflicts
8 years ago
Milan Perera 36ee55f493 Implemented permission-scope mapping for IoTs
8 years ago
Rasika Perera 9f615916d0 Fixing analyticsEnabled and groupingEnabled not working
8 years ago
Rasika Perera 1bee155d9a Fixing formatting issue
8 years ago
Rasika Perera 91437ff81c Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Rasika Perera c284732192 Displaying SSO auth failure messages
8 years ago
Rasika Perera 9fd6145605 Fixing SSO issue
8 years ago
Milan Perera dd353e1bfb Commiting permission-scope mapping improvements
8 years ago
WSO2 Builder a59edee410 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 8f9b21b41b [maven-release-plugin] prepare release v2.0.3
8 years ago
charitha d8881244fd Fix issue in task operation
8 years ago
charitha 0a7f8ac22c Update error pages and CsrfGuard property file.
8 years ago
charitha 78dfddbbed Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x
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 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
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 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
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 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
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
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
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 7807ed77da removed hardcoded validity period while creating application in APIM
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 a8fff3736a Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha 1c8e4b8de7 Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x
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
geethkokila fbfbed7060 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
geethkokila 20ca76640d Adding changes for the grouping and ownership changes
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
Hasunie 1d6bf23d67 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
Hasunie 529bde822c fixing property string mapper issue
8 years ago
Hasunie 1b5bae3e46 adding required authorization property
8 years ago
charitha efb2695286 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
geethkokila 0879a75f7b Fixing the serializing issue of device groups.
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 3cb13e18a5 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
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
GPrathap c969013ca2 added new property : validity Period
8 years ago
charitha a8e4a5f6fc Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
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
charitha 4c60c90537 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
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
charitha 431ce58c65 Merge with release-2.0.x branch
8 years ago
charitha 1bcea7cc1b Move components with org.wso2.mdm group id to org.wso2.carbon.devicemgt group
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 415fae8007 fixed update issue
8 years ago
ayyoob 0f66c90660 preload db queries
8 years ago
ayyoob 44ac6b13b5 changes in UI after refactoring
8 years ago
ayyoob 4292442aa5 refactored device type deployer
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 202e0d5619 merged with origin
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
charitha 5f68953b11 Merge branch 'master' into IoTS-1.0.0
8 years ago
ayyoob 3140c36f7b added missing license headers
8 years ago
Harshan Liyanage 1ba2e2f768 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Harshan Liyanage f961b57f9f EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
8 years ago
Madawa Soysa 774eaadb71 EMM-1298: Extracting serial number from the certificate itself when adding a certificate
8 years ago
kamidu 65ed6c2f6e include owner for the operations api
8 years ago
sinthuja a6203845c9 Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
8 years ago
sinthuja 00e57bd800 Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
8 years ago
ayyoob 8293ed43ae added missing imports
8 years ago
ayyoob 16f6a62dca refactored DAO handler
8 years ago
ayyoob fbfb86c53e refactored DAO handler
8 years ago
ayyoob d17241e51e added comments and license
8 years ago
ayyoob 45c0d2d2f5 added logs if device type registration failed
8 years ago
ayyoob c48f879205 added XmlAccessorType to root pom
8 years ago
ayyoob e3ef66aa1a added deployer feature
8 years ago
ayyoob eeea1c372f updated configs and Dao
8 years ago
ayyoob d6090dd812 added device type deployer initial commit
8 years ago
Madawa Soysa f6ee6aeb8d Refactoring pages to use new modal unit
8 years ago
Saad Sahibjan 1cb969eb6d Fix incorrect spacing
8 years ago
Megala 35d6d311a7 Fixing EMM-1763
8 years ago
WSO2 Builder 27a2c9b979 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder eae935f91c [maven-release-plugin] prepare release v1.2.5
8 years ago
harshanl 370f6de260 Removed applied policy upon removal of the last policy applicable for a device
8 years ago
Kamidu Sachith Punchihewa fa7c8e85ce Merge pull request #393 from thusithak/master
8 years ago
Kamidu Sachith Punchihewa 7666bbfd05 Merge pull request #395 from Megala21/master
8 years ago
WSO2 Builder 6a55e1be83 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 11c2e59f61 [maven-release-plugin] prepare release v1.2.4
8 years ago
Megala 3416ae78c4 Fixing the problems in displaying user list when the user names has special chracters
8 years ago
Megala 1ff86289fd Fixing the problems that happend when we have special chracters in roles
8 years ago
Megala 4ec6883ec8 Merge remote-tracking branch 'upstream/master'
8 years ago
Kamidu Sachith Punchihewa 0d6364d77a Merge pull request #394 from shavidissa/master
8 years ago
Megala 4a71be850c Refactoring code
8 years ago
Shavindri 28cb653b06 Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
8 years ago
Rasika Perera b8f623e04a Supporting custom contentTypes for service invoker
8 years ago
Megala d9ec203727 Fixing EMM-1755
8 years ago
Megala d5c62f74dc Merge remote-tracking branch 'upstream/master'
8 years ago
harshanl 036ed6fe41 Added POLICY_REVOKE operation upon deletion of the last policy
8 years ago
thusithakalugamage 521a30c260 Fixing modal dialog markup defects in unit
8 years ago
harshanl 73539362d4 Refactored PolicyAdministratorPointImpl
8 years ago
harshanl 6e1fdabaad EMM-1342:Added policy revoke operation
8 years ago
Megala d90d51d412 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala e55b3a6d5f Fixes related to having special characters in role name
8 years ago
kamidu 39bc2e6747 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 1af8184889 positioning modal content
8 years ago
thusithakalugamage 3aae81d9e4 resolving conflicts - removing deprecated modal related methods
8 years ago
thusithakalugamage 47ca8942b6 resolving conflicts - removing deprecated modal related methods
8 years ago
thusithakalugamage 308eeb6cf8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl a89b50197f EMM-1757:Fixed admin device-detail view issue
8 years ago
Megala a04f91cddb Fixing issues related to mapping users and roles from different user stores
8 years ago
harshanl 954a2eb870 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Megala 87150f5074 Fixing secondary role deletion
8 years ago
Megala 2195a164e5 Merge remote-tracking branch 'upstream/master'
8 years ago
kamidu 6886233bb9 removing unnecessary   and improving styling in modal unit
8 years ago
thusithakalugamage 6667a41378 resolving conflicts
8 years ago
harshanl 24c38602b8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 51910ee67a EMM-1675:Added policy revoke operation
8 years ago
Megala 0756294724 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala d8555c34ab Fixing issues related with roles of secondary user store
8 years ago
kamidu bbfa1c334d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu ed70cb02b6 Sample implimentation using the new cdmf.ui.modal unit
8 years ago
Kamidu Sachith Punchihewa cce4428a9d Merge pull request #390 from shavidissa/master
8 years ago
Shavindri c64581dc59 Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
8 years ago
Kamidu Sachith Punchihewa cb825a7f26 Merge pull request #389 from susinda/master
8 years ago
kamidu 2ea21a6fdc renaming public js to match the unit structure
8 years ago
susinda ca68181541 Fixing NPE of EMM-1715
8 years ago
susinda eb20d1fc1c Device delete implemented (only in api level) for iot
8 years ago
kamidu 959e3a63af Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu bfc04a7f16 Fixing EMM-EMM-1753
8 years ago
hasuniea 2128f08658 fixing EMM-1750
8 years ago
Rasika Perera 790ca36443 Removed unnecessary debug log
8 years ago
Rasika Perera 135b6e8881 Fixing device view page
8 years ago
kamidu c4a0ac4bf3 Enable centralized modal handling unit for cdmf
8 years ago
kamidu 6605a86bf7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 43b1a9f278 Fix for EMM-1651
8 years ago
charitha 528687bde3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha 0498c68ca5 Add validation to maximum limit value
8 years ago
Megala 4999b84169 Reformatting code
8 years ago
Megala 5b96e1b849 Fixing EMM-1333
8 years ago
thusithakalugamage fa3db47400 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage 48337ee16c [EMM-1618] - related improvements on remaining occurences
8 years ago
Rasika Perera 2340611a9b Removing mdm specific dependencies from CDMF
8 years ago
Milan Perera da4a558d87 Merge pull request #387 from ayyoob/st2
8 years ago
ayyoob 2f58e0ba15 added gateway mode to decide to which oauth app to use.
8 years ago
Kamidu Sachith Punchihewa ecc70ead08 Merge pull request #385 from hastef88/emm1726
8 years ago
Kamidu Sachith Punchihewa af4989e56d Merge pull request #384 from shavidissa/master
8 years ago
Hasitha Amal De Silva 4555819211 EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button.
8 years ago
Shavindri 0842dcb2bb swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
8 years ago
Milan Perera bb60caa171 Merge pull request #383 from ayyoob/st2
8 years ago
ayyoob 93c1725e32 fixed api name for device type
8 years ago
charitha e53b0c3860 Fix group count listing in dashboard
8 years ago
kamidu 8c94e83431 Fix for Jira : EMM-1682 and EMM-1653
8 years ago
kamidu 2f852d84f4 Fix for the issue : EMM policy updating issue
8 years ago
charitha a2c0526b40 Fix typo
8 years ago
charitha 670ca7c228 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 836ed2bc1c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 3223e29df9 Fix for EMM-1185 , EMM- 1619
8 years ago
Megala 235e9797d4 Fixing EMM-1717
8 years ago
ayyoob 852ea00403 refactored method name
8 years ago
ayyoob 5727886ea1 few changes after apimgt integration
8 years ago
hasuniea 05e95e2675 fix the EMM-1702
8 years ago
Imesh Chandrasiri 125b827f4f Fix for modal popup overlay bug
8 years ago
Kamidu Sachith Punchihewa a8e7396589 Merge pull request #377 from DimalChandrasiri/master
8 years ago
Kamidu Sachith Punchihewa 6dafd11ca9 Merge pull request #379 from thusithak/master
8 years ago
harshanl 4ce9c95044 Changed getOperations API to return operation list of removed devices
8 years ago
thusithakalugamage 84a7d5517f EMM-1685] - fix and few other related improvements
8 years ago
Imesh Chandrasiri bce1d9e060 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Imesh Chandrasiri 3e4c1f9121 Parametarized datatable sorting function
8 years ago
Kamidu Sachith Punchihewa 5e6d8e667d Merge pull request #376 from thusithak/master
8 years ago
kamidu 131bcd48f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu cc6922bfad Fix for EMM-1680
8 years ago
charitha 664b3d4d43 Fix issue in duplicate mapping
8 years ago
harshanl 4bcf350236 EMM-1678:Updated the oauth component versions
8 years ago
thusithakalugamage 1a1f79b1b4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage ac27349dae Header nav menu responsiveness improvements
8 years ago
kamidu fc902ba602 fix database extended issue
8 years ago
thusithakalugamage a56aac7b87 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage 909e7836ca Header nav menu responsiveness improvements
8 years ago
kamidu fc50b851bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 4bbb378d26 conicting solving
8 years ago
charitha 94a50584f4 Improve group listing with pagination
8 years ago
Megala c022f51467 Fixing EMM-1587
8 years ago
kamidu e2ee797462 Fix for EMM-1700
8 years ago
madhawap 16b334b0b3 changes to swagger SecurityDefinitionConfigurator and annotations
8 years ago
madhawap 7b8518a9db changes to swagger SecurityDefinitionConfigurator and annotations
8 years ago
charitha ce5d63925a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha e89b4015b6 Introduced pagination
8 years ago
Kamidu Sachith Punchihewa 06e70c8326 Merge pull request #373 from shavidissa/master
8 years ago
Shavindri f0164b5a01 swagger annotations and definitions changes for role management, configuration management and application management(admin)
8 years ago
thusithakalugamage 2ae60cc415 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage 88ec5246ec [EMM-1694] - Header responsive issues fix
8 years ago
kamidu 1fe74905f2 Fix for the redirection and ui related issues
8 years ago
Imesh Chandrasiri ebad678bab Datatables serverside paging redirection bug fix
8 years ago
kamidu 8c98accd18 Fixing conflitcs
8 years ago
kamidu c6fffb0b3a Fixies for the ui issues in EMM -beta
8 years ago
charitha 06176898d0 Exposed group id to API level
8 years ago
Megala e77d8b8b29 Adding isEmpty check
8 years ago
Megala 0642cc10d7 Reformatting code
8 years ago
Megala f9204add08 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala 42a9ba92a6 Fixing EMM-1683
8 years ago
charitha f22d392978 Upgrade to comply with latest CDMF changes
8 years ago
Megala b7990b9146 Fixing problems in retriveing data from secondary user store
8 years ago
Kamidu Sachith Punchihewa c7bd0de033 Merge pull request #369 from thusithak/master
8 years ago
Dilan U. Ariyaratne 2d7506d9b8 Merge pull request #368 from amalhub/master
8 years ago
dilanua dff32af832 Adding initial swagger annotations and permissions to Dashboard APIs
8 years ago
dilanua 1ca5762c44 Uncommenting Dashboard APIs
8 years ago
thusithakalugamage f664749c1f platform configuration style defect fixes
8 years ago
Shavindri 3d383b0414 test push reverse
8 years ago
Shavindri b77aefa02c test push
8 years ago
kamidu f32caf1833 UI fixes in 2.2.0-beta
8 years ago
charitha a0050d8f4d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 7898a7475c UI fixes in 2.2.0-beta
8 years ago
charitha d1d6eefd17 Upgrading grouping backend
8 years ago
amalhub c87c5a8322 Fixing issue: EMM-1537
8 years ago
harshanl f0f0182d20 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl a4538a6d6c Removed unnecessary params from paginated queries
8 years ago
Rasika Perera 35c23174be Fixing android sense download issue
8 years ago
Rasika Perera 0290c710e1 Fixing enrollment url for device types
8 years ago
Harshan Liyanage 13d9bdfb53 Merge pull request #367 from Megala21/master
8 years ago
Megala 359bd8f317 Fixing tenant loading problem
8 years ago
harshanl 672de3a09e Device status change fix for iOS
8 years ago
Megala e8eb0123c7 Fixing the tenant loading problem when sso is enabled
8 years ago
harshanl befb5b0ad8 EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.
8 years ago
amalhub 8b4649b4e5 Fixing issue: EMM-1537
8 years ago
Megala a0586ca977 Adding comment
8 years ago
Megala e5870e1306 Fixing the problem of common log out
8 years ago
Megala b10c323582 Fixing the problem in login
8 years ago
Megala bacd7ccfd2 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala 4af2a37d9d Fixing SSO problem
8 years ago
harshanl 406d49ad61 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 399ef2fc06 Windows getOpending operations fix
8 years ago
kamidu 5595100cc2 UI fixes in role and policy management
8 years ago
harshanl 9d31590e83 Windows getPending operations fix
8 years ago
harshanl 10f8b12b88 OperationManagerImpl Code refactored
8 years ago
harshanl f9ba45f439 Fixed the device status changing issue when there are multiple enrollments for the same device
8 years ago
harshanl b1e140b58e Removed unnecessary imports
8 years ago
Chatura Dilan Perera c16cc4cae1 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera ed4bca7032 [maven-release-plugin] prepare release v1.2.2
8 years ago
warunalakshitha 25ed0cf370 Fix build issue with swagger version
8 years ago
Rasika Perera 3b68ccb4ba Merge pull request #365 from rasika/iots-ga
8 years ago
Megala 400199e965 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala 38677f84e8 Fixing SQL syntax problem
8 years ago
Harshan Liyanage cd06637546 Merge pull request #364 from Megala21/master
8 years ago
Megala 12aed521e5 Refactoring code
8 years ago
Megala 2cdaf5aa21 Reverting changes made to generic implementations and moving them to oracle specific ones
8 years ago
Megala ecc87f370c Fixing oracle error
8 years ago
Rasika Perera b2eb715fb7 REsolving conflicts
8 years ago
Rasika Perera 5c8c28d28c Merge pull request #1 from warunalakshitha/master
8 years ago
charitha e6c4053135 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha da0977bd85 Fix SQL error when could happen due to large response payloads
8 years ago
Megala 47d6268c9e Correcting the problem related with oracle syntax
8 years ago
warunalakshitha 397c1daa2a Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle
8 years ago
Rasika Perera 237b9a7078 Creating api endpoint to retrieve features of a device-type
8 years ago
Rasika Perera b2f31be1d6 Fixing iot operation bar not listing operations
8 years ago
Megala cd50fe88bc Reformatting the code
8 years ago
Megala 45cda92082 Merge remote-tracking branch 'upstream/master'
8 years ago
Megala 82be4ef5a8 Fixing oracle script issues
8 years ago
dilanua 7596f7876d Improving device view info.retrieval - UI
8 years ago
Rasika Perera 6d4ddf7b54 Removed info log on view device
8 years ago
Rasika Perera 1bae3d2213 Fixing policy retrieve api
8 years ago
Rasika Perera 99fee36f2c Fixing error when properties is null
8 years ago
amalhub 428ce25b6f Fixing issue: https://wso2.org/jira/browse/EMM-1646
8 years ago
harshanl 9467efe0f6 Fixed notification issue
8 years ago
kamidu 1a9ca2d59e Fix for Jira issue: EMM-1635
8 years ago
Rasika Perera 12c8483b4b Changes to devices policy
8 years ago
kamidu 174555b387 Fix for EMM-1627
8 years ago
Rasika Perera 056f6d2f4e Adding proper error message when no device type is avaialble
8 years ago
Imesh Chandrasiri de63beaaa6 Roles listing icon resize fix
8 years ago
Imesh Chandrasiri 5e7d3a00ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
dilanua 8232bf7484 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633
8 years ago
Imesh Chandrasiri 5954fd9070 EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode
8 years ago
Imesh Chandrasiri 2c0df21491 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Rasika Perera 56a81e431c Removed extra license headers
8 years ago
Rasika Perera 6bfe166b5d Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username
8 years ago
Rasika Perera 54c518a4fd Making datatables-extended to get context path from global js variable
8 years ago
Rasika Perera 77720dd61a Fixing devices listing page styling issue.
8 years ago
Rasika Perera 1bef7a38ef Minor style fix for wr-hidden-operations
8 years ago
kamidu 225268bd78 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 0ab9db2afd Fix for EMM-1575
8 years ago
dilanua 378dd4084c FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585
8 years ago
harshanl 1a12838b7c Fixed issue in NotificationDAO due to invalid column name
8 years ago