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

N21 2149 merlin bibliothek element #5323

Merged
merged 28 commits into from
Nov 13, 2024
Merged

Conversation

mrikallab
Copy link
Contributor

@mrikallab mrikallab commented Nov 6, 2024

Description

Links to Tickets or other pull requests

Changes

Datasecurity

Deployment

New Repos, NPM pakages or vendor scripts

Approval for review

  • DEV: If api was changed - generate-client:server was executed in vue frontend and changes were tested and put in a PR with the same branch name.
  • QA: In addition to review, the code has been manually tested (if manual testing is possible)
  • All points were discussed with the ticket creator, support-team or product owner. The code upholds all quality guidelines from the PR-template.

Notice: Please remove the WIP label if the PR is ready to review, otherwise nobody will review it.

MarvinOehlerkingCap and others added 24 commits May 23, 2024 11:05
…lin-bibliothek-element

# Conflicts:
#	apps/server/src/modules/tool/tool-api.module.ts
#	apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.ts
#	apps/server/src/modules/tool/tool-launch/service/tool-launch.service.ts
#	apps/server/src/modules/tool/tool-launch/tool-launch.module.ts
#	apps/server/src/modules/tool/tool-launch/uc/tool-launch.uc.ts
# Conflicts:
#	backup/setup/external-tools.json
# Conflicts:
#	backup/setup/external-tools.json
…nt' into N21-2149-merlin-bibliothek-element

# Conflicts:
#	apps/server/src/modules/tool/tool-launch/mapper/tool-launch.mapper.spec.ts
#	backup/setup/external-tools.json
@MBergCap MBergCap merged commit 990ad4e into main Nov 13, 2024
75 checks passed
@MBergCap MBergCap deleted the N21-2149-merlin-bibliothek-element branch November 13, 2024 13:43
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.

4 participants