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.

Sign up for GitHub

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

Jump to bottom

Merge Hotfix/v3.1.3 Back to Develop #169

Merged
merged 4 commits into from
Jul 21, 2023
Merged

Merge Hotfix/v3.1.3 Back to Develop #169

merged 4 commits into from
Jul 21, 2023

Commits on Jul 11, 2023

  1. Merge pull request #163 from medizininformatik-initiative/hotfix/v3.1.2 

    Hotfix 3.1.2
    @michael-82
    michael-82 authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    055cbdd View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Hotfix 3.1.3 

    - Replace QueryResultObfuscator and Tests with RandomSiteNameGenerator, using substring of random uuids as obfuscated site ids
- Update Spring Boot to 3.1.1
    @michael-82
    michael-82 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    6db6cda View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into hotfix/v3.1.3 

    # Conflicts:
#	CHANGELOG.md
#	pom.xml
#	src/main/java/de/numcodex/feasibility_gui_backend/query/obfuscation/QueryObfuscationSpringConfig.java
#	src/main/java/de/numcodex/feasibility_gui_backend/query/obfuscation/QueryResultObfuscator.java
#	src/test/java/de/numcodex/feasibility_gui_backend/query/obfuscation/QueryResultObfuscationTest.java
    @michael-82
    michael-82 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    bb70399 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge branch 'develop' into hotfix/v3.1.3 

    # Conflicts:
#	src/test/java/de/numcodex/feasibility_gui_backend/query/obfuscation/QueryResultObfuscationIT.java
    @michael-82
    michael-82 committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    b6b14b4 View commit details
    Browse the repository at this point in the history