Commit Graph

3081 Commits (abdffdbf392b09ae348d3ddfe3ccea02f7fd730b)

Author SHA1 Message Date
Imesh Chandrasiri 6e1e801ea0 Fix for multiple popup issue 8 years ago
WSO2 Builder 585b9bde4d [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder d206148841 [maven-release-plugin] prepare release v2.0.7 8 years ago
Rasika Perera b9c1141f79 Added missing utility module import 8 years ago
Rasika Perera 24a7179c4b Merge pull request from geethkokila/release-2.0.x 8 years ago
Rasika Perera 0227d5ccbb Fixing https://wso2.org/jira/browse/IOTS-381 8 years ago
Rasika Perera 4549a34083 changed [fw-ok] with [fw-success] 8 years ago
geethkokila bf8ab0da11 Adding support for identifying the device type from the url 8 years ago
ayyoob 44d09e09ea few changes after testing the gateway 8 years ago
ayyoob 671d931d3e merged with origin after resolving conflicts 8 years ago
ayyoob 5b3a8091ec fixed Null pointer exception 8 years ago
Rasika Perera 864020f20e Adding ability to add deviceType level scopes 8 years ago
Rasika Perera f57de670ea Adding devices:update into /devices scopes list 8 years ago
Rasika Perera e11d2244f5 Fixing scope annotation /enrollment-invite 8 years ago
Rasika Perera 63cb0e1fde Adding swagger annotations and scope for /effective-policy 8 years ago
Rasika Perera 3cc176c121 Fixing permission for certificates:verify 8 years ago
Rasika Perera 09aae93fc1 Adding perm:admin:certificates:verify scope 8 years ago
Milan Perera d9ea6af775 Changed logs to warn 8 years ago
ayyoob d4ec0705e7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
ayyoob cdd144237f removed unused parameter 8 years ago
Milan Perera 311fe7810f Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
Milan Perera 21c50c9a55 Fixed NPE occurred due to scope mapping 8 years ago
ayyoob 2fbaf31b93 fixed permission and assigned environment variables for url context 8 years ago
ayyoob 93ae646c50 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
ayyoob de957bec29 few changes after testing the cluster 8 years ago
Rasika Perera e05600607a Merge pull request from madawas/release-2.0.x 8 years ago
Rasika Perera c7d489cf2c Merge pull request from madawas/IOTS-377 8 years ago
Rasika Perera 9bd409e502 Merge pull request from DimalChandrasiri/release-2.0.x 8 years ago
Madawa Soysa a28458cf13 Refactoring policy view and edit units 8 years ago
Milan Perera f25e82f4ec Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
Milan Perera 98ea97d890 Fixed permissions adding issue 8 years ago
Imesh Chandrasiri 957224b905 Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x 8 years ago
Imesh Chandrasiri d686a9ea57 Updating font wso2 to version 1.2.1 - Commit 2 8 years ago
Madawa Soysa 8a7d0bb3aa IOTS-377 : Fixing VFA icon not visible issue 8 years ago
Rasika Perera 83868303dd Merge branch 'release-2.0.x' into release-2.0.x 8 years ago
Rasika Perera 8311828c5d Merge pull request from ayyoob/release-2.0.x 8 years ago
Imesh Chandrasiri f1954c4f10 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
ayyoob 0d721a226b updated ui config 8 years ago
Imesh Chandrasiri 3230a4e269 Updating font wso2 to version 1.2.1 8 years ago
Rasika Perera ef2a1b84a2 IOTS-376 : Fixing cannot delete a device 8 years ago
kamidu 4588cfbed4 Fixing the permission management issue in EMM console 8 years ago
Ace c6d186aa1a Adding missing fix 8 years ago
Ace bd45b27cc9 Merging with upstream 8 years ago
Ace 643acd7827 Adding api for renaming devices 8 years ago
ayyoob 471e634790 merged with upstream 8 years ago
ayyoob 06977295ea merged with upstream 8 years ago
Milan Perera 562631cc1d Fixed scopes related issue in SAML Granttype 8 years ago
charitha cb7ff7f66a Change package name to lower case 8 years ago
ayyoob 9d5061230c fixing test failures 8 years ago
charitha c909144589 Add select2 controller to select roles to share a group 8 years ago
ayyoob ac8dae7ed0 fixing test failures 8 years ago
Rasika Perera e1228b408a Removed [httpsWebURL] from config.json 8 years ago
Rasika Perera 9afffc6571 Merge pull request from charithag/release-2.0.x 8 years ago
charitha 1ad9439162 Add select2 controller to select roles to share a group 8 years ago
Rasika Perera 250984f438 Merge pull request from rasika/merge-master 8 years ago
charitha 5caa688014 Fixed issue in populating server.ip property. 8 years ago
Rasika Perera 0acd273ae1 Fixing merge conflicts 8 years ago
Rasika Perera 83aea1fd01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master 8 years ago
ayyoob c718d723c0 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
ayyoob ea31637223 added scr reference to datasource for deployer and few fixes after the changes in the plugin 8 years ago
WSO2 Builder 5411d93103 [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder 3ea83b925a [maven-release-plugin] prepare release v2.0.6 8 years ago
geethkokila 7059ad1243 Changing the package name 8 years ago
geethkokila 2881079b27 Removing two unnecessary classes from the project and adding java documentation to class 8 years ago
Rasika Perera 08ab946e88 Added doc comments 8 years ago
Rasika Perera a16052431c Corrected a typo on [APIMCertificateMGTException] 8 years ago
Rasika Perera c2490347b6 Corrected a typo 8 years ago
Rasika Perera ebdba19041 IOTS-120 : Fixing firstName and lastName cannot contain whitespaces 8 years ago
Rasika Perera b4ed33bcd0 IOTS-171 : Register form validation message corrected 8 years ago
Rasika Perera 4de481e501 Merge pull request from rasika/release-2.0.x 8 years ago
Rasika Perera d826ba81d0 UI improvement for Datatables 8 years ago
Joseph Fonseka a5640f48b5 Changed auth type on API resources as configured in web.xml 8 years ago
Rasika Perera 78c413c1ba Merge pull request from hasuniea/release-2.0.x 8 years ago
Rasika Perera dfcf72cae0 Merge pull request from geethkokila/mutual_ssl_feature 8 years ago
Rasika Perera 8397b688e9 Merge branch 'release-2.0.x' into mutual_ssl_feature 8 years ago
Rasika Perera bc93d48927 Merge pull request from madhawap/release-2.0.x 8 years ago
madhawap d22de197a1 fix to WebappPublisherConfig 8 years ago
Rasika Perera b4a649bdfa Merge pull request from milanperera/release-2.0.x 8 years ago
Hasunie 45a543d3ed getting SkippedEndpoint path from URL 8 years ago
geethkokila 3795a7e30f Removing the hardcoded apis 8 years ago
geethkokila 739a8bdb69 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 8 years ago
geethkokila 44c7383b15 Adding support to send ios request the synapse gateway 8 years ago
Rasika Perera 1c1da1f5cd Merge pull request from rasika/release-2.0.x 8 years ago
Rasika Perera ab28d596e7 Fixing CDMF version in footer 8 years ago
Milan Perera d51ee711fc Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
Rasika Perera 79e98a592b Merge pull request from rasika/release-2.0.x 8 years ago
Milan Perera 228848075c Fixed conflicts and merged 8 years ago
Rasika Perera e501724c3c Replaced [EMM] with [IoT Server] 8 years ago
Rasika Perera 7af63522f2 Fixed quick startup guide doc url 8 years ago
Milan Perera 42a587904f Fixed issues in permission-scope mapping 8 years ago
geethkokila 9200adebed Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 8 years ago
charitha d65557e03e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
charitha e6e39532b7 Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements 8 years ago
Rasika Perera 3472090d1b Merge pull request from ruwany/wip 8 years ago
Rasika Perera 8706636b51 Merge pull request from ayyoob/release-2.0.x 8 years ago
Ace 6a69d8cf4b merging with upstream 8 years ago
Ace b83479b214 Fixing device listing issue 8 years ago
inoshperera e6a70b2394 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
inoshperera 11d2ecac10 removing basic auth headers from API definitions. 8 years ago
Milan Perera 637c014866 Refactored scope strings 8 years ago
Milan Perera 157ef998a6 Resolved conflicts and merged 8 years ago
Milan Perera e0ee2fc1e5 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
ayyoob 20c3940ca4 made MonitoringTask to get config from device management service 8 years ago
ayyoob 09a148d476 disabled ui and capp deployers 8 years ago
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