Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(v1.6.0): add allowedFileFormat properties for signature fields #260

Merged
merged 3 commits into from
Sep 17, 2024

Conversation

github-actions[bot]
Copy link

Automated PR to merge changes from develop to release-v1.6.0

I failed to cherry-pick the changes automatically because of the following:

Auto-merging src/form/types/types.ts
[auto-pr-release-v1.6.0-259-10769 e4ff42a8] chore: add allowedFileFormat properties for signature fields
Author: Md. Ashikul Alam <[email protected]>
Date: Wed Sep 11 13:33:59 2024 +0600
3 files changed, 11 insertions(+), 1 deletion(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply 9225eb53... docs: update changelog for updating allowed file format for signatures

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-259-10769:auto-pr-release-v1.6.0-259-10769
git fetch origin ocrvs-6821-fix:ocrvs-6821-fix

git checkout auto-pr-release-v1.6.0-259-10769
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 00b3c284 9225eb53

@Nil20 Nil20 force-pushed the auto-pr-release-v1.6.0-259-10769 branch from bfbf19f to 4e1a8df Compare September 12, 2024 08:53
Comment on lines +19 to +24
### New features

- The select options in DOCUMENT_UPLOADER_WITH_OPTION field can now be hidden using the new `optionCondition` property. It works similarly to the same property available in SELECT_WITH_OPTIONS field

## 1.5.0

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are in the original CHANGELOG.md of the release-v1.6.0. Not sure how it comes in the diff. Here is the CHANGELOG.md of 1.6

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll clean up the changelogs

@Zangetsu101 Zangetsu101 merged commit e64ee74 into release-v1.6.0 Sep 17, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants