Commit Graph

3062 Commits (9949209364631f8b9844a6c69c43fb6c187e0ef8)

Author SHA1 Message Date
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 09aae93fc1 Adding perm:admin:certificates:verify scope
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 #540 from madawas/release-2.0.x
8 years ago
Rasika Perera c7d489cf2c Merge pull request #538 from madawas/IOTS-377
8 years ago
Rasika Perera 9bd409e502 Merge pull request #536 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 #537 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 #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
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
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
Rasika Perera 8397b688e9 Merge branch 'release-2.0.x' into mutual_ssl_feature
8 years ago
Rasika Perera b4a649bdfa Merge pull request #516 from milanperera/release-2.0.x
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
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
Ace 6a69d8cf4b merging with upstream
8 years ago
Ace b83479b214 Fixing device listing issue
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 b20a2e0997 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
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 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
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
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
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 4c9578ebe2 resized buffer size to 0 for each scope
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
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
Ace 1d2a5dc9ef Updating identity/auth-saml dependencies to latest
8 years ago
charitha 795ccb740c Add backend support for enrollment invitations
8 years ago
geethkokila 1b4857b7fd Fixing conflicts
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 2751d4b856 Code refactoring
8 years ago
Supun94 eb1575126f Minor refactoring on policy merging
8 years ago
Supun94 35f3fcc8f9 Changed policy evaluation point
8 years ago
Supun94 936e71a743 Adding configurations for different policy evaluation service components
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
charitha 7acbc5cd0b Moved qr modal to device mgt core
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
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
Madawa Soysa 5b1a68280c Moving codemirror to a lib unit
8 years ago
Madawa Soysa 0f291d5d04 Fixing generic policy saving issues
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 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 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
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 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 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
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
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 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
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
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
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 44ac6b13b5 changes in UI after refactoring
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 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
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
ayyoob 8293ed43ae added missing imports
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 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
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
thusithakalugamage 521a30c260 Fixing modal dialog markup defects in unit
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 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
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 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 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
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
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
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
Rasika Perera 4c4eba93d8 Returning correct representation of the device to template.
8 years ago
Rasika Perera cef865f53a Parsing deviceType configs with %https.ip% and %http.ip%
8 years ago
Rasika Perera a61be7a7ec Enable group management api
8 years ago
Rasika Perera b5b4f508b0 Fixing NPE when fetching opeartion
8 years ago
Rasika Perera f2af4bd078 Fixing undefined exception when device properties not available
8 years ago
harshanl 27a9eeb692 Removed unnecessary DM service
8 years ago
harshanl f24242fb8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl dd03d0b740 Added device status change upon inactivity mechanism
8 years ago
Ruwan 0c92f80e68 Merge pull request #361 from ruwany/carbon-kernel-4.4.7
8 years ago
Rasika Perera ccf4b6492c Fixing devices listing issue
8 years ago
Rasika Perera 3e2731a772 Fixing invoker service return nothing on httpClient requests.
8 years ago
dilanua ebead1249c Fix for jira: https://wso2.org/jira/browse/EMM-1617
8 years ago
dilanua 87a03e8312 Fix for jira: https://wso2.org/jira/browse/EMM-1617
8 years ago
dilanua 71424c4bb7 Fix for JIRA: https://wso2.org/jira/browse/EMM-1613
8 years ago
dilanua e3256417a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua a4b39f92e5 Fix for JIRA: https://wso2.org/jira/browse/EMM-1593
8 years ago
harshanl 5a6120d6fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 92aa413773 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua f7a38b2313 Fix for JIRA: https://wso2.org/jira/browse/EMM-1612
8 years ago
Ace 154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
harshanl 17127c3846 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Rasika Perera 98ab29fe94 Fixing virtual firealarm device agent download
8 years ago
Rasika Perera eb5a36ef42 Supporting stream download on service invoker
8 years ago
Rasika Perera 4691bedbc5 Fixes to devices listing
8 years ago
Rasika Perera 1d3f5f39a7 Adding custom headers support to invoker util
8 years ago
Imesh Chandrasiri f8b08849cd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri 3d5b6cd89f Removing unwanted url params from datatable serverside search
8 years ago
harshanl 12713f3301 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Rasika Perera e71d3947cb Adding intuitive error when specified notification provider is not found
8 years ago
Rasika Perera 513015c1b5 Changing context path /emm into /devicemgt on cdmf base app
8 years ago
Rasika Perera 0fb87f3aa2 Fixing device types not shown issue
8 years ago
Rasika Perera 9148c3baea Fixing dashboard styling issues
8 years ago
harshanl 108ea98677 Refactor policy mgt components and fixed add operations for invalid devices from task service
8 years ago
harshanl c967fc34d0 Fixed EMM-1513
8 years ago
Ace 5f90587564 Synching with master
8 years ago
Chatura Dilan Perera 7395c76408 Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Ace 33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
dilanua 81c684be50 Refactoring user-menu - UI
8 years ago
dilanua d8e057abdd Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
8 years ago
dilanua 6fea974c90 Refactoring notifications side-pane - UI
8 years ago
dilanua ce1a063688 Refactoring notifications side-pane - UI
8 years ago
dilanua 9a095fa670 Refactoring change password modal - UI
8 years ago
Ace 87ad1e0e71 Fixing intermittent jackson bind issue
8 years ago
dilanua b16f0fd592 Refactoring change password modal - UI
8 years ago
Ace 099ffd6a74 Updating velocity dependencies to OSGI enabled bundle version
8 years ago
Chatura Dilan Perera 50d8885f8b [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera a00d6aafd4 [maven-release-plugin] prepare release v1.2.1
8 years ago
harshanl 75df243a33 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace 6a8a5cbd5a Merging with master
8 years ago
harshanl 4169d3b2bd Fixed EMM-1554
8 years ago
dilanua b4e4b114a5 Updating dashboard title
8 years ago
dilanua e8571b7b65 Updating operation-mod with windows operation apis
8 years ago
dilanua 408e10a890 Changing admin dashboard name to 'Navigating Dashboard' - UI
8 years ago
dilanua 713c8ac4d8 Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
dilanua cd66f64945 Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI
8 years ago
dilanua 37131afb4a Adding radio:checked and input[type=hidden] support to operation mod - UI
8 years ago
dilanua e4dae67fea Changing permissions - /devices/any to /devices/any-device
8 years ago
dilanua 58f8656e94 Changing permissions - /devices/owning to /devices/owning-device
8 years ago
Rasika Perera d9b25eda08 Adding deviceName into notifications
8 years ago
Dilan U. Ariyaratne 1651ade4a7 Merge pull request #357 from thusithak/master
8 years ago
Dilan U. Ariyaratne df7c54b1af Merge pull request #356 from DimalChandrasiri/theme-migration
8 years ago
thusithakalugamage 2f5d90cb6c [EMM-1571] Add policies page wizard styling and layout defects
8 years ago
harshanl 5b0e99aeff Fixed EMM-1562
8 years ago
harshanl 78cab76101 Fixed EMM-1531
8 years ago
Imesh Chandrasiri 1599b84e54 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri e2576b21a8 Adding default button class to modal popups
8 years ago
kamidu a448959fe0 Fix for EMM-1548
8 years ago
Ace 1dfb8e22e1 Updating to latest appm/apim/identity dependencies
8 years ago
kamidu e2d0f7d040 Fix for EMM-1559
8 years ago
Imesh Chandrasiri 3e5064feed Fix for datatable icon size change on pagination
8 years ago
Imesh Chandrasiri 9573bce48f Fix for datatable icon size change on pagination
8 years ago
Imesh Chandrasiri 317252ebb0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Rasika Perera 1d7546916c Changes to the policiesCount, rolesCount, usersCount methods
8 years ago
Rasika Perera 0fab418187 Fixing invalid device count and group count
8 years ago
Imesh Chandrasiri b56fb667b7 Modal fixes
8 years ago
kamidu d7c7315f16 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 70dd5ded77 Fix for the policy edit internal server issue
8 years ago
Dilan U. Ariyaratne 3cbaecfbbf Merge pull request #355 from DimalChandrasiri/theme-migration
8 years ago
thusithakalugamage 144dd92c47 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage d2a44647dd [EMM-1549] - Heading defect fix
8 years ago
dilanua 00d79c9ece Changing certificates breadcrumb name from certificate to certificates - UI
8 years ago
Imesh Chandrasiri 7a452d09ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri e3b230937e Remove data table styles
8 years ago
thusithakalugamage 4cb5238112 [EMM-1543] styling defect fix
8 years ago
thusithakalugamage 3b3962b772 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage 0273a6e369 responsive tab panel component - markup rewrite for uuf
8 years ago
dilanua 6aa01d2e7a Fixing NPE issue in token-protected-service-invokers - UI
8 years ago
Chatura Dilan Perera de23a8cf27 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 8905fae0d9 [maven-release-plugin] prepare release v1.2.0
8 years ago
Rasika Perera ae7f4b8373 Adding permission update error message box
8 years ago
Rasika Perera 7edc7f29db Fixing role add permission update issue
8 years ago
harshanl 0eaf33aa5c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 87a5b09266 Added users/count API
8 years ago
thusithakalugamage 6825a87bb9 button component - active and focus style defect fix
8 years ago
thusithakalugamage c871fbcdad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage b2cde2228f wizard component - layout defect fixes
8 years ago
thusithakalugamage 0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri b08aeefbbc Modal Changes
8 years ago
kamidu 2ec2600471 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Imesh Chandrasiri 8f68a3658e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri f908738659 Modal Changes
8 years ago
Rasika Perera 8e247bda62 Fixing font warning on page load
8 years ago
Rasika Perera 4d0fd67539 Adding missing woff2 fonts
8 years ago
kamidu 0fdcbae817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 878daae5c5 Permission modifications
8 years ago
Imesh Chandrasiri 47b46c50b0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage 42c6500a31 adding responsive, date addition and version number update
8 years ago
Chatura Dilan Perera 2d5262e21e [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 5ccd752404 [maven-release-plugin] prepare release v1.2.0
8 years ago
thusithakalugamage ef646800fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage dc23e55444 responsive tab panel component - style changes
8 years ago
Imesh Chandrasiri d182c194ed removing data table css from custom.desktop.css
8 years ago
harshanl 2f1c03ae1f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 7a0e52e8f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 6a9225d249 Updating device module for permissions - Ui
8 years ago
harshanl 97cb3cc015 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 7dc93ff010 MSSQL script fixes and added the /users/count REST API
8 years ago
Imesh Chandrasiri 690bd7de5c modal popup changes
8 years ago
Rasika Perera 940f2aaede Merge pull request #348 from DimalChandrasiri/theme-migration
8 years ago
harshanl d60daae97f MSSQL fixes to dbscrpits and DAO layer
8 years ago
Imesh Chandrasiri 613d0ff7be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri f42215a926 Adding modal code changes
8 years ago
kamidu c2471fc2bb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 2cd5a0e659 Enable permission check according to the new permissions
8 years ago
Rasika Perera 432c46601b Fixing breadcrumb height issue
8 years ago
Rasika Perera cfa32cf75c Fixing icons background color issue
8 years ago
dilanua 2d864bf02e Removing unnecessary spacing provided for operation-bar - UI
8 years ago
harshanl 1e00a012a8 Removed unnecessary import statements
8 years ago
harshanl 0ee6110b3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu ce1f5c5701 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu 115099c8fe Implemented permission based authorization
8 years ago
dilanua 4fe79be5f8 Updating datatables server-side-paging module
8 years ago
dilanua 9e9f3e859a Updating custom-desktop.css to remove unnecessary bottom border of operation-bar
8 years ago
kamidu f5e1fee561 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 411641bc57 Enable permission check according to the new permissions
8 years ago
charitha de6f2558c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha 2fde165b7c Fix SQL error when could happen due to duplicate enrollments.
8 years ago
Rasika Perera 5157cb81f8 Merge pull request #345 from thusithak/theme-migration
8 years ago
thusithakalugamage e80daf7709 responsive small device view defect fixes
8 years ago
harshanl e72d3147f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua d24ba98643 Updating activate and deactivate policy endpoints from PUT to POST
8 years ago
harshanl b7ffaf0b0f Fixed issues in DAO implementations and MSSQL db script
8 years ago
dilanua a74862d73b Updating policy module - UI
8 years ago
Rasika Perera f37c2c6de8 Fixing requesting invalid url for Roboto-Regular web font
8 years ago
Rasika Perera 887322b716 Merge pull request #344 from DimalChandrasiri/theme-migration
8 years ago
dilanua 795fbcb366 Updating ios operation endpoints - UI
8 years ago
Imesh Chandrasiri 2786c576ea Merge Conflicts Fixed
8 years ago
mharindu 24930b3042 Partial commit of migration
8 years ago
Imesh Chandrasiri fe0bdb9ba6 Merge Conflicts Fixed
8 years ago
Imesh Chandrasiri d1acfe1503 Modal Changes added
8 years ago
harshanl bdb5b970fd Removed access modifiers from Interface APIs
8 years ago
harshanl 8e6c15acf2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua e881aa6da4 Fixing Role Editing UI
8 years ago
dilanua c57e9eba3a Updating Roles listing UI to dynamically fetch app-context
8 years ago
dilanua 0427a6dd4b Refactoring Role Create UI - moving units to page
8 years ago
dilanua 934c45cd95 Adding role creation UI
8 years ago
dilanua 746a4d4372 Refactoring roles listing UI - merging srcs in units to page
8 years ago
dilanua fd6ddf7a52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 677385920e Updating User Listing UI
8 years ago
Rasika Perera ad5c97e354 Temporary resolving WARN logs for css fonts on the theme.
8 years ago
dilanua 687efa97b1 Updating Role Listing UI
8 years ago
dilanua eedb66ec45 Updating User Listing UI
8 years ago
dilanua 6f28bf1d94 Updating User Listing UI
8 years ago
dilanua 32fc58c917 Updating User Listing UI
8 years ago
dilanua 54807b99ee Updating role listing UI
8 years ago
Rasika Perera 8148b5b06c Separating CDMF base app and uuf-template app
8 years ago
Imesh Chandrasiri 4a69e162b3 Modal Changes added
8 years ago
Imesh Chandrasiri 1ed6213916 Modal Changes added
8 years ago
harshanl 54112a3f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha 3575c9a33d Fix issue in get devices with since parameter.
8 years ago
Chatura Dilan Perera f29b9e84f2 Fixed 200 returns when activities are empty and since is a future date
8 years ago
harshanl 6554368bfa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl 551d77bd62 Refactored OperationMgr code
8 years ago
kamidu cd77ce692e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu abb3aea9a9 fixes for notification isses
8 years ago
harshanl 675843d7f7 Added Valid device list to Activity response
8 years ago
harshanl a77564ac2d Added status for each device in Activity response
8 years ago
Chatura Dilan Perera 9aa5f2793f return date format as UTC in APIs
8 years ago
Chatura Dilan Perera 475b832c59 Changed return date format to UTC date
8 years ago
Chatura Dilan Perera 83442b0bca Fixed issue in activity retrival
8 years ago
Chatura Dilan Perera 29d6b38d15 Fixed issue in activity getting with response
8 years ago
Chatura Dilan Perera 40cabd0064 Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Chatura Dilan Perera 549a2773f2 Fixed issue releated to activity api since
8 years ago
harshanl 624bf7c7b4 Fixed EMM-1518
8 years ago
harshanl 56f23a83fc changed comments
8 years ago
Imesh Chandrasiri e02264099b Adding user menu update
8 years ago
thusithakalugamage 00bf595cb2 moving wso2 theme to emm - removing duplicated styles for buttons and links, navbar style update
8 years ago
thusithakalugamage 42a3d5f7e5 moving wso2 theme to emm - modal window content positioning and background fixes
8 years ago
thusithakalugamage b5fda80377 emm login page layouts updated to wso2 theme markup
8 years ago
thusithakalugamage b67b34e831 cdmf navbar hamburger menu and menu open state icons correction
8 years ago
thusithakalugamage 6b5d884fd5 vertical tab component bottom margin defect fix
8 years ago
thusithakalugamage 333e05dcc5 Merge branch 'theme-migration' of https://github.com/DimalChandrasiri/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage ee856d6b8b moving wso2 theme to emm - link hover defect fix
8 years ago
thusithakalugamage cd6cf9f6b3 moving wso2 theme to emm - navbar cllapse color fixes
8 years ago
thusithakalugamage 849c2a4f55 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri 5cdafa04a6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri 802d5e5fe9 Markup change to suite the padding
8 years ago
thusithakalugamage aa23239f40 moving wso2 theme to emm - layout color update
8 years ago
Charitha Goonetilleke 9e0edf84ab Merge pull request #337 from charithag/master
8 years ago
harshanl 811d225bc3 Fixed adding operations to invalid devices
8 years ago
charitha 0fe827ca9f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha 579d91bd79 Fix issue in get devices with since parameter.
8 years ago
Imesh Chandrasiri 4bebb77d5f Merge branch 'theme-migration' of https://github.com/thusithak/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage 1a2c6ec8eb moving wso2 theme to emm - layout
8 years ago
Imesh Chandrasiri 8a17ec9e48 Changing the login button to new theme
8 years ago
charitha 9246cdcf30 Return empty array when results not found with since parameter
8 years ago
Chatura Dilan Perera 763993263c Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Chatura Dilan Perera 16e6e12436 Fixed issue in Activity API returning one activity
8 years ago
thusithakalugamage 1f7b618d5a moving wso2 theme to emm - layout
8 years ago
Saad Sahibjan a72b47f6f7 Fixing incorrect response for remove policy
8 years ago
harshanl f3aefcca77 Fixed EMM-1450
8 years ago
hasuniea e723761344 fixing code conflicts
8 years ago
Chatura Dilan Perera 8b17cbb339 Fix conflicts
8 years ago
hasuniea b3582f9d47 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 7bc927fbd0 Removing obsolete constants from constants.js - UI
8 years ago
dilanua fbd51e31c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 13e2381293 Updating OAuth Utils - UI
8 years ago
Chatura Dilan Perera 654e1d9938 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera aa24821667 [maven-release-plugin] prepare release v1.1.2
8 years ago
harshanl 67942d5c1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 0ba6edf36d Updating utility.js and removing unused config files - UI
8 years ago
dilanua e32c9c0bdb Updating init.js module - UI
8 years ago
dilanua f61b929bfd Updating data-tables API - UI
8 years ago
dilanua 78b5cf9fb3 Updating user APIs - UI
8 years ago
dilanua 4eaa3be491 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 83498b1039 Updating operation APIs
8 years ago
kamidu 8eeabcee2c Fix for Jira issue EMM-1418
8 years ago
hasuniea 1ba598a93e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 6b4ab635af Fixing jiras: EMM-1472, EMM-1505
8 years ago
charitha 3d19d9ed2e Add MySQLOperationDAOImpl for row locking.
8 years ago
hasuniea 6db619317c fixing app-install issue
8 years ago
harshanl 2cb8f0b313 Fixed EMM-1392
8 years ago
harshanl d81733a4d6 Removed unused class
8 years ago
kamidu 4506db3647 Fix notification view issue
8 years ago
kamidu 77a8fed7de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
hasuniea 5c57b664ad fixing getAllActivity H2 issue
8 years ago
Ruwan 6134f94e3c Merge pull request #332 from ayyoob/com
8 years ago
hasuniea 282f53bf09 Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3
8 years ago
hasuniea c269f35ef2 fixing getAllActivity H2 issue
8 years ago
harshanl d628699e8b Fixed repeating task operations.
8 years ago
mharindu af286b8aaf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu 7346313d27 Modified scope management service
8 years ago
harshanl 2bf6f562df Fixed repeating task operations.
8 years ago
kamidu 28760d2bee Enable advanced search for devices
8 years ago
dilanua b37687cb58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 8cb26b3264 Fixing no api resource found issue: changing user credentials
8 years ago
ayyoob 442c2b86da fixed formatting issues
8 years ago
harshanl a7d7c689e8 Removed unsupported roleName parameter from device API
8 years ago
harshanl 671ba46fae Removed unnecessary properties from EnrollmentInfo object
8 years ago
harshanl d401741d9b Fixed EMM-1492
8 years ago
Ace e5a4c0f795 Adding role add/update/delete related changes
8 years ago
ayyoob e45ba68a90 changing the context of device-types api
8 years ago
ayyoob 3b56668af0 merged with upstream
8 years ago
ayyoob c04edef151 Added Certificate Configuration
8 years ago
dilanua fcff1f0854 Fixing user menu reg exp issue
8 years ago
dilanua 106051a0a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua e07991174d Adding user password change UI
8 years ago
kamidu 83cbd56b03 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu 0be419d6cc Fix ui issues in device view section
8 years ago
dilanua f71106d011 Fixing issues on Password Reset UI
8 years ago
dilanua 0836b2c99e Fixing user create page QR-generation issues
8 years ago
kamidu 42b6882cc1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 73b4abc46b Updating user remove UI
8 years ago
dilanua 4acfde1511 Adding user edit UI and fixes
8 years ago
kamidu 3219ac2101 Fixing the notification listing ui
8 years ago
dilanua 312f9d3f26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 280c5e496d Adding user edit UI and fixes
8 years ago
Ace d8c6720857 Removing previous query
8 years ago
Ace 74b7af7be7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace aa01c7a52e Adding query improvements to activities retrieval query
8 years ago
madhawap ecfe94235f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap c6cc5e8df3 fixes to role updating endpoint
8 years ago
ayyoob 3edc68d204 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com
8 years ago
ayyoob 217f541991 added certificate units
8 years ago
dilanua b9efedfdbd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 632202899a Fixing issues in bulk user invitations
8 years ago
harshanl c448d915d8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
ayyoob 058f9e4cfa merged with origin
8 years ago
ayyoob 6f5d6abea3 updated device type label to defaul device type name
9 years ago
kamidu 9fde8c0442 Resolving conflicts
9 years ago
kamidu 120fe530ac Fix the device view related issues
9 years ago
dilanua d7eed8bc1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 0945c8f547 Adding user create UI
9 years ago
harshanl e80c2f4050 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea ed5e954194 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea 349c3bdb63 fixing App Version not updating in portal after being initially set
9 years ago
dilanua 390d929e70 Adding policy priority UI
9 years ago
dilanua 352643a421 Changing deactivate-policy api method to PUT
9 years ago
harshanl 34e97aeeae Removed device search using roleName parameter.
9 years ago
Ace e1c4305e73 Adding fixes to Activities retrival query
9 years ago
Ace 71709a800f Adding group by function when retrieving operations
9 years ago
dilanua 4549452634 Updating getAllPolicies UI function with icon key
9 years ago
prabathabey 4c3211b079 Fixing issues in acitivity retrieval
9 years ago
dilanua 6e2249419d Updating policy edit base UI
9 years ago
dilanua 0521f1a9dd Updating policy view Base UI
9 years ago
harshanl 8fa311e119 Removed unnecessary properties from EnrollmentInfo object
9 years ago
prabathabey 90889824e3 Further improving the performance of activity info retrieval
9 years ago
prabathabey c161d7b659 Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities
9 years ago
prabathabey 213836541f Fixing missing columns returned in the query that returns the list of acitivities
9 years ago
prabathabey 3abe837de3 Improving retrieval of activities
9 years ago
prabathabey fc5021a0d5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey c7730adbcb Improving the retrieval of activities
9 years ago
harshanl eb801696bf Fixed EMM-1492
9 years ago
harshanl f82ce82648 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 08ff70bb3c Refactored CertMgt component
9 years ago
Rasika Perera c01db9c773 Replaced emm specific unit implementation with old generalized cdmf unit
9 years ago
Rasika Perera bb526513e8 Removed enrollment url calculation
9 years ago
mharindu bd41e4f4fb Implemented scope based authorization in device-mgt UI module
9 years ago
Ace aa7d3385ce Adding missed role-listing changes
9 years ago
Ace c693a11d7c Fixing user,device,role listing pages
9 years ago
mharindu 5bdb4630af Fixed conflicts and merged
9 years ago
mharindu 734aaa8c9e Fixed null pointer exception
9 years ago
mharindu 886e2e08f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
hasuniea 48543862c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 952905c60d Adding Policy Edit UI
9 years ago
mharindu 2e79dd290e Modified scopes
9 years ago
hasuniea 1b07b18678 adding security fixes
9 years ago
dilanua fa0891d9a2 Adding Policy View UI
9 years ago
mharindu acf6d7ecd7 Fixed conflicts and merged
9 years ago
dilanua 13126fe398 Adding policy create UI
9 years ago
dilanua 87cdfa209e Updating policy management
9 years ago
harshanl f1c1c67656 Removed unused policy.mgt module from device core bundle
9 years ago
harshanl 657e4864fb Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
9 years ago
harshanl 35ea88b9de Fixed EMM-1476.
9 years ago
mharindu ed4c762bfd Refactored scopes
9 years ago
ayyoob a7074e2e4e refactored general configuration
9 years ago
Prabath Abeysekara cc90bef42b Merge pull request #318 from Securepoint/master
9 years ago
mharindu eb5216091e Fixed conflicts and merged
9 years ago
madhawap 5bd879545b fix for the iOS device operations blocker
9 years ago
madhawap 2e71c21378 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap d315e739e4 fix for the iOS device operations blocker
9 years ago
kamidu 23fe8b1fdb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
kamidu 160d8c2feb Fix the policy create wizard ui issues
9 years ago
dilanua 2ec9f68135 Removing the deprecation of operation.js as it seems to have one dependancy to plugins
9 years ago
Rasika Perera b8bf855378 Calculating enrollment url when generalConfig.host config exists
9 years ago
inoshperera 2e8df6a16a Merge pull request #322 from charithag/master
9 years ago
charitha efcd5272d2 Fix issues in sql statements
9 years ago
harshanl 01e2408ece Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 34f1d9ee38 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
kamidu 9510554f67 Fix the notification view internal server error issue
9 years ago
dilanua c7f4bba8bf Deprecating operation.js module from UI
9 years ago
dilanua e125871de0 Adding business-controllers to UI Modules
9 years ago
harshanl 06f72c014e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 6cc1bb088c Fixed EMM-1447, EMM-1424
9 years ago
dilanua ec7f8ccd1f disabling testing info logs at token-protected-service-invokers.js
9 years ago
dilanua 89cebcdb9e Updating UI oauth module with suppressed warnings for verified, but unresolved variables and functions
9 years ago
dilanua 39b14c9bc5 Adding conf-reader to UI modules
9 years ago
dilanua bbff93adcc Updating token-handler-utils with suppressed warnings for java packg imports
9 years ago
mharindu ccdcea0109 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
dilanua 303f16e747 Deprecating obsolete UI functions - device.js
9 years ago
dilanua bc4192280c Updating OAuth UI Module
9 years ago
dilanua 020f35cb4e Updating OAuth UI Module
9 years ago
dilanua 7017f6e32b Updating OAuth module dependants
9 years ago
dilanua 032b5d129a Adding OAUTH module to UI
9 years ago
dilanua b86be8375c Refactoring OAuth utilities at UI Layer
9 years ago
dilanua 70074e2f3e Refactoring OAuth utilities at UI Layer
9 years ago
dilanua a4c5aa5951 Refactoring OAuth utilities at UI Layer
9 years ago
dilanua f7509f698d Removing obsolete UI modules
9 years ago
dilanua 2efdc30177 Refactoring OAuth utilities at UI Layer
9 years ago
mharindu 84090fb16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
Milan Perera c49dc435e1 Merge pull request #319 from ayyoob/transport
9 years ago
dilanua 4b39a877ad Updating oauth token handlers
9 years ago
dilanua 1172e759ca Deprecating serverAdress.js
9 years ago
prabathabey 5ed3174a28 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 5adfab9f8a Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API
9 years ago
Ace 07b12fe4ea Bug fixes
9 years ago
Ace 0d94a293a4 Adding notification and fixing QR code
9 years ago
prabathabey c63818b78f Avoiding multiple device data getting retrieved upon the same id
9 years ago
prabathabey e27905792f Code cleanup
9 years ago
prabathabey 5bc7cf7c30 Simplifying operation management related implementations
9 years ago
dilanua 8550bcb145 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua d2ec81b12b Refactoring oauth token handling functions and dependants
9 years ago
Ace 1ed0481ec3 Changing nav-bar base-unit implementation
9 years ago
mharindu 6e742ee6ac Added scope beans
9 years ago
mharindu 564c2b280e Fixed conflicts and merged
9 years ago
Chatura Dilan 046cd6586c Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
Chatura Dilan 7af8ecc686 Added userstore for role listing
9 years ago
dilanua 34edbce1a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua c228f03481 Refactoring oauth token handling functions and dependants
9 years ago
prabathabey 89634a9c38 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey bd1322e801 Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl
9 years ago
dilanua b72d099641 Refactoring oauth token handling functions
9 years ago
dilanua d05c6e2170 Deprecating /api/token.jag (unused)
9 years ago
mharindu 3457bba4a3 Adding Annotation reading fix for device-mgt-extensions
9 years ago
dilanua 87dbb5f9e1 Refactoring ui token handling functions
9 years ago
dilanua 7facff4b58 Updating ui init logic
9 years ago
dilanua c57c75945c Deprecating invoker-request-wrapper (unused)
9 years ago