resolve conflict #2165
Merged
resolve conflict #2165
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…17-UI-issues FWF-3217:[BUGFIX] Fixed ui fixes
…gfix/FWF-3383-Delete-form-and-path-collision FWF-3383:[Bugfix]- Name must be unique Validation.
…gfix/FWF-3422-form-focus-indicator-input-tag FWF-3422:[Bugfix]-Visible FF update for input tag.
…3370-BPM-Vault-support FWF-3370: [Feature] Added conditional property to Vault Config
…438-filter-fix fixed the initial count and also fixed deletion of filter issue
…7-keycloak-login-responsiveness FWF-3447: [Bugfix] keycloak login page mobile responsiveness fixed
…F-3438-count-fix added fix for default filter count
…3357-redirect-to-defaultPage-multitenant FWF-3357: [Bugfix] Resolved redirect to default page issue in multitenancy
…dated-tenant-validate-api-response Modified validate tenant key response
…s in both cluster mode and single node. (AOT-Technologies#2110) * Redis cluster Mode connetion string modification * Updated redis connection string to access cluster mode and single node redis
…T-Technologies#2138) * Redis cluster Mode connetion string modification * Updated redis connection string to access cluster mode and single node redis * keycloak environment varibales updated for latest version * Update docker-compose.yml
…ature/FWF-3450-Task-filter-creator-name FWF-3450:[Feature]- Displayed Name of the creator in task filter.
…43-Fix-search-results-clear 🐛 FWF:3443 [Bugfix] Fixed invalid search results clearing issue
…57-Filter-getting-reset FWF-3457:[BUGFIX]Fixed filter getting reset issue
…OT-Technologies#2144) * FWF-3222: [Bugfix] Handle service-account in application history * FWF-3222: [Bugfix] Added Testcase & pylint fix
…om/AOT-Technologies/forms-flow-ai into feature/FWF-3316-permission-matrix
…55-form-not-published FWF-3255:[BUGFIX] Fixed showing form not published issue
…om/AOT-Technologies/forms-flow-ai into Feature/FWF-3316-permission-matrix
…low-ai into Feature/FWF-3316-permission-matrix
shuhaib-aot
merged commit 78249e7
into
AOT-Technologies:feature/FWF-3316-permission-matrix
3 of 4 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue Tracking
JIRA:
Issue Type: BUG/ FEATURE
Changes
Screenshots (if applicable)
Notes
Checklist