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

Adaptive learning: Allow editors to edit the competency link weight #9564

Merged
merged 50 commits into from
Oct 30, 2024
Merged

Adaptive learning: Allow editors to edit the competency link weight #9564

merged 50 commits into from
Oct 30, 2024

Commits on Oct 18, 2024

  1. First refactoring

    @JohannesStoehr
    JohannesStoehr committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    9713857 View commit details
    Browse the repository at this point in the history

  2. Fix most tests

    @JohannesStoehr
    JohannesStoehr committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    73f9597 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    4c367aa View commit details
    Browse the repository at this point in the history

  2. Try around

    @JohannesStoehr
    JohannesStoehr committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    a700139 View commit details
    Browse the repository at this point in the history

  3. Revert LoggingAspect

    @JohannesStoehr
    JohannesStoehr committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    4d68a02 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    99d0c85 View commit details
    Browse the repository at this point in the history

  2. Fix more tests

    @JohannesStoehr
    JohannesStoehr committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    8c3dc7c View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'refs/heads/develop' into feature/adaptive-learning/comp… 

    …etency-link-weight
    @JohannesStoehr
    JohannesStoehr committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    b029f0f View commit details
    Browse the repository at this point in the history

  2. Fix more tests

    @JohannesStoehr
    JohannesStoehr committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    8d63e74 View commit details
    Browse the repository at this point in the history

  3. Fix more tests

    @JohannesStoehr
    JohannesStoehr committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    3145850 View commit details
    Browse the repository at this point in the history

  4. Fix more tests

    @JohannesStoehr
    JohannesStoehr committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    ff64ccc View commit details
    Browse the repository at this point in the history

  5. Fix exercise creation

    @JohannesStoehr
    JohannesStoehr committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    fe7318a View commit details
    Browse the repository at this point in the history

  6. Fix exercise update server

    @JohannesStoehr
    JohannesStoehr committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    4458e47 View commit details
    Browse the repository at this point in the history

  7. Fix exercise import

    @JohannesStoehr
    JohannesStoehr committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    bfa4f28 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Done

    @JohannesStoehr
    JohannesStoehr committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    9f070ac View commit details
    Browse the repository at this point in the history

  2. Fix tests

    @JohannesStoehr
    JohannesStoehr committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    b52d014 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight

# Conflicts:
#	src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java
#	src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java
#	src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java
#	src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts
    @JohannesStoehr
    JohannesStoehr committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    7bead56 View commit details
    Browse the repository at this point in the history

  4. Fix last things

    @JohannesStoehr
    JohannesStoehr committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    dcd99c3 View commit details
    Browse the repository at this point in the history

  5. Remove log

    @JohannesStoehr
    JohannesStoehr committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c87a614 View commit details
    Browse the repository at this point in the history

  6. Allow user editing

    @JohannesStoehr
    JohannesStoehr committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c7dbf9d View commit details
    Browse the repository at this point in the history

  7. Patrik

    @JohannesStoehr
    JohannesStoehr committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    f285a0d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    583ee8a View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight

# Conflicts:
#	src/test/java/de/tum/cit/aet/artemis/programming/icl/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java
    @JohannesStoehr
    JohannesStoehr committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    038d66c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    2d3cade View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    1d2d45a View commit details
    Browse the repository at this point in the history

  2. Use variables

    @JohannesStoehr
    JohannesStoehr committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    43b5e39 View commit details
    Browse the repository at this point in the history

  3. Use SCREAMING_SNAKE_CASE

    @JohannesStoehr
    JohannesStoehr committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    b4f1334 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    40d3d87 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/feature/adaptive-learning/compet… 

    …ency-link-weight-edit' into feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    45103b8 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Make Flo happy

    @JohannesStoehr
    JohannesStoehr committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    30f9583 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    009c6ec View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    ad560fd View commit details
    Browse the repository at this point in the history

  4. Make Flo happy transitively

    @JohannesStoehr
    JohannesStoehr committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7c0d345 View commit details
    Browse the repository at this point in the history

  5. Fix and combine test

    @JohannesStoehr
    JohannesStoehr committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    9efb40f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    597ea81 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7534972 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    c0d5076 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr authored Oct 26, 2024
    Configuration menu
    Copy the full SHA
    c4f30cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr authored Oct 26, 2024
    Configuration menu
    Copy the full SHA
    7a0eace View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr authored Oct 27, 2024
    Configuration menu
    Copy the full SHA
    b1f9e9d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr authored Oct 27, 2024
    Configuration menu
    Copy the full SHA
    b2cf54d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight
    @JohannesStoehr
    JohannesStoehr authored Oct 27, 2024
    Configuration menu
    Copy the full SHA
    276989e View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight

# Conflicts:
#	src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java
#	src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java
#	src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java
    @JohannesStoehr
    JohannesStoehr committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    674a52d View commit details
    Browse the repository at this point in the history

  2. Increase test coverage

    @JohannesStoehr
    JohannesStoehr committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    19c6044 View commit details
    Browse the repository at this point in the history

  3. Fix constructor order

    @JohannesStoehr
    JohannesStoehr committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    f543026 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr authored Oct 28, 2024
    Configuration menu
    Copy the full SHA
    b83e2cf View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight

# Conflicts:
#	src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html
    @JohannesStoehr
    JohannesStoehr committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    eca4ef4 View commit details
    Browse the repository at this point in the history

  2. Fix merge conflict

    @JohannesStoehr
    JohannesStoehr committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e1bb388 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/adaptive-learning/competency-link-weight' into … 

    …feature/adaptive-learning/competency-link-weight-edit
    @JohannesStoehr
    JohannesStoehr authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    b492936 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feature/adaptive-learning/competency-link… 

    …-weight-edit

# Conflicts:
#	src/main/webapp/app/entities/competency.model.ts
#	src/main/webapp/app/shared/competency-selection/competency-selection.component.ts
#	src/test/javascript/spec/component/shared/competency-selection.component.spec.ts
    @JohannesStoehr
    JohannesStoehr committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    bf92aac View commit details
    Browse the repository at this point in the history