Commit Graph

2939 Commits (233d14edbdbd37b81ef481e9ccfd79af4a9e08a7)

Author SHA1 Message Date
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 #530 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 #529 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 #521 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 #519 from hasuniea/release-2.0.x
8 years ago
Rasika Perera dfcf72cae0 Merge pull request #518 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 #520 from madhawap/release-2.0.x
8 years ago
madhawap d22de197a1 fix to WebappPublisherConfig
8 years ago
Rasika Perera b4a649bdfa Merge pull request #516 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 #517 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 #515 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 #513 from ruwany/wip
8 years ago
Rasika Perera 8706636b51 Merge pull request #511 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 #509 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 #1 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 #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