Commit Graph

757 Commits (8e033e86e9cb6ab9163a93a311c7f8d72b41c38a)

Author SHA1 Message Date
Rasika Perera c7d489cf2c Merge pull request #538 from madawas/IOTS-377
8 years ago
Madawa Soysa a28458cf13 Refactoring policy view and edit units
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
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 06977295ea merged with upstream
8 years ago
Milan Perera 562631cc1d Fixed scopes related issue in SAML Granttype
8 years ago
charitha c909144589 Add select2 controller to select roles to share a group
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 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
Ace 6a69d8cf4b merging with upstream
8 years ago
Ace b83479b214 Fixing device listing issue
8 years ago
Rasika Perera 25a35dcf20 Changing title [WSO2 IoT] into [WSO2 IoT Server]
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
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
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
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 61d1710614 Fixed https://wso2.org/jira/browse/IOTS-341
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
charitha a625ccecf0 Fixed https://wso2.org/jira/browse/IOTS-342
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 2b1d46f45f Finalized enrollment invitations
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
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 2751d4b856 Code refactoring
8 years ago
Supun94 eb1575126f Minor refactoring on policy merging
8 years ago
Supun94 5a1c73b119 Adding cdmf effective policy unit
8 years ago
Supun94 2847ff2095 Adding cdmf effective policy page
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
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
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
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
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 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
Madawa Soysa ea1371a008 Fixing generic policy payload
8 years ago
charitha 312098b1de Fix issues in generic policy editor
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
charitha 4b5c69d2d7 Update the way we are checking existence of policy operations.
8 years ago
Imesh Chandrasiri da2fd787c4 Fix for datatable icon not showing issue
8 years ago
Ruwan 4bda6d89cb Merge pull request #469 from menakaj/release-2.0.x
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
Megala ed325ee576 Adding dashboard feature
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
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