M2-6268: Merge backend feature-multiinformant #1300
Closed
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
Release/1.3.19
Release 1.3.20
Release/1.3.21
Release/1.3.22
Release/1.3.23
Release/1.3.24
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.25.2 to 20.25.3. - [Release notes](https://github.com/pypa/virtualenv/releases) - [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst) - [Commits](pypa/virtualenv@20.25.2...20.25.3) --- updated-dependencies: - dependency-name: virtualenv dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [asyncpg](https://github.com/MagicStack/asyncpg) from 0.27.0 to 0.29.0. - [Release notes](https://github.com/MagicStack/asyncpg/releases) - [Commits](MagicStack/asyncpg@v0.27.0...v0.29.0) --- updated-dependencies: - dependency-name: asyncpg dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* M2-6355: Add command to reencrypt data * M2-6358: reencrypt data using encrypt_internal function * M2-6358: Replace comment with orm registry to get all encrypted columns * M2-6358: Add check do not reencrypt data if answers or answers_items table
Bumps [pyld](https://github.com/digitalbazaar/pyld) from 2.0.3 to 2.0.4. - [Changelog](https://github.com/digitalbazaar/pyld/blob/master/CHANGELOG.md) - [Commits](digitalbazaar/pyld@2.0.3...v2.0.4) --- updated-dependencies: - dependency-name: pyld dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* M2-5539: Add missing tests for answers API
…ndents with the same secretUserId (#1286)
Actualize develop from release
#1283) * M2-6389: Fix invitation for shell without nickname and source data for respondents * fix: Remove duplicated data for respondent invitations FirstName and LastName has been removed from respondent invitations this data moved to subject already
…end-workflow M2 6353 develop backend workflow
…nt-development-merge-240513 Feature/multiinformant development merge 240513
…ulti-informant-source-branch-Sprint-9-wk-1
rcmerlo
deleted the
M2-6268-BE-Merge-backend-multi-informant-source-branch-Sprint-9-wk-1
branch
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.
📝 Description
Merge backend feature-multiinformant, this merge comes after merge 'dev' branch into feature-multiinformant, so we are bringing all production changes in our branch
Had fix some conflicts and did some manual changes because of some classes renames and class hierarchy changes
🔗 Jira Ticket M2-6268