Commit Graph

2977 Commits (d344ab2e001538ba3661cd75058331a63a2f1a78)

Author SHA1 Message Date
ayyoob b20a2e0997 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
ayyoob c69513e0f5 removed tenant domain from the web.xml 8 years ago
Chatura Dilan e0627bf748 Merge pull request from rasika/release-2.0.x 8 years ago
GPrathap 5d1435c7bc renamed permission string 8 years ago
Rasika Perera 25a35dcf20 Changing title [WSO2 IoT] into [WSO2 IoT Server] 8 years ago
Rasika Perera 7612f064fe Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
Maninda 0a6ef8daf7 Added some security fixes for issues reported by FindBugs 8 years ago
Maninda 00a5a07373 Fixed some security issues found after running FindBugs security scan. 8 years ago
Milan Perera f3409adc21 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
Milan Perera 2a4a636eb4 Resolved conflicts and merged 8 years ago
Milan Perera d13dadff08 Renamed prefix of scopes 8 years ago
GPrathap 0bd7b90e9a added scope annotation 8 years ago
ayyoob db2ddc7bed policy manager refactored to support tenancy 8 years ago
ayyoob 9995f4293e Default values set for push notification dynamic configuration 8 years ago
Milan Perera 7b8a7c0b52 Merge pull request from GPrathap/release-2.0.x 8 years ago
Maninda 0fb5a577b8 Fixed some issues found in FindBugs security analysis. 8 years ago
ayyoob f511dc2bce device type deployer for UI and plugin 8 years ago
Rasika Perera 235b41c9df config.json [usernameLength] moved to [userValidationConfig][usernameLength] 8 years ago
Rasika Perera 2a7e62f857 config.json [apimgt-gateway] renamed to [gatewayEnabled] 8 years ago
Rasika Perera e5062abcc2 Removed unneccesary configs 8 years ago
inoshperera 148c8046fe Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
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 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 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 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 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 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 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 from DimalChandrasiri/release-2.0.x 8 years ago
Charitha Goonetilleke 8216ea3a79 Merge pull request from madawas/IOTS-296 8 years ago
Rasika Perera 1465c56822 Revert "[WSO2 Release] [Jenkins ] [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 ] [Release 2.0.4] prepare release v2.0.4 8 years ago
Rasika Perera 42930fe8c4 Revert "[WSO2 Release] [Jenkins ] [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 ] [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 from charithag/release-2.0.x 8 years ago
Rasika Perera 6edbb8330f Merge pull request 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 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 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 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 from harshanL/release-2.0.x 8 years ago
Harshan Liyanage 24c0966dce Merge pull request 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 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 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 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 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 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 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 from DimalChandrasiri/release-2.0.x 8 years ago
Charitha Goonetilleke c84d7fd13d Merge pull request 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 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 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