Commit Graph

2826 Commits (819074833f88520a245db67f57d38eb846771ac8)

Author SHA1 Message Date
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