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

Assessment: Fix the loss of submission text due to overlapping manual text blocks #6916

Merged
merged 13 commits into from
Jul 21, 2023
Merged

Assessment: Fix the loss of submission text due to overlapping manual text blocks #6916

merged 13 commits into from
Jul 21, 2023

Commits on Jul 16, 2023

  1. Handle overlapping manual text blocks

    @terlan98
    terlan98 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    b1e0e3f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bugfix/text-exercises/overlapping-manual-… 

    …text-blocks
    @terlan98
    terlan98 authored Jul 16, 2023
    Configuration menu
    Copy the full SHA
    f37d9a3 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Merge branch 'develop' into bugfix/text-exercises/overlapping-manual-… 

    …text-blocks
    @terlan98
    terlan98 authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    913c8dd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bugfix/text-exercises/overlapping-manual-… 

    …text-blocks
    @terlan98
    terlan98 authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    67e3ee2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into bugfix/text-exercises/overlapping-manual-… 

    …text-blocks
    @terlan98
    terlan98 authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    92ed3d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Add test

    @terlan98
    terlan98 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    61c234b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bugfix/text-exercises/overlapping-manual-… 

    …text-blocks
    @terlan98
    terlan98 authored Jul 18, 2023
    Configuration menu
    Copy the full SHA
    d3539b3 View commit details
    Browse the repository at this point in the history

  3. Fix jest spy

    @terlan98
    terlan98 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    2861eff View commit details
    Browse the repository at this point in the history

  4. Fix jest spy (2)

    @terlan98
    terlan98 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    d708a9b View commit details
    Browse the repository at this point in the history

  5. Fix jest spy (2)

    @terlan98
    terlan98 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    315b5d9 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'bugfix/text-exercises/overlapping-manual-text-blocks' of … 

    …https://github.com/ls1intum/Artemis into bugfix/text-exercises/overlapping-manual-text-blocks

# Conflicts:
#	src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts
    @terlan98
    terlan98 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    34c323d View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge branch 'develop' into bugfix/text-exercises/overlapping-manual-… 

    …text-blocks
    @terlan98
    terlan98 authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    08ba1a4 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge branch 'develop' into bugfix/text-exercises/overlapping-manual-… 

    …text-blocks
    @terlan98
    terlan98 authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    c6c6b86 View commit details
    Browse the repository at this point in the history