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

Fix/441 Fail if no language is set #461

Merged
merged 15 commits into from
Dec 10, 2024
Merged

Fix/441 Fail if no language is set #461

merged 15 commits into from
Dec 10, 2024

Conversation

riedde
Copy link
Contributor

@riedde riedde commented Nov 7, 2024 •
edited by krHERO
Loading

Description, Context and related Issue

Fixes #441

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist

  • I have performed a self-review of my code

@riedde riedde requested a review from bwbohl November 7, 2024 12:31
@riedde riedde added the Type: bugfix A pull request providing a bugfix label Nov 7, 2024
@riedde riedde added this to the 1.0.0 milestone Nov 7, 2024
@riedde riedde marked this pull request as draft November 7, 2024 12:33
@riedde
Copy link
Contributor Author

riedde commented Nov 7, 2024

I forgot something!

@riedde riedde marked this pull request as ready for review November 7, 2024 12:44
@riedde riedde requested a review from roewenstrunk November 7, 2024 12:45
bwbohl
bwbohl reviewed Nov 7, 2024
View reviewed changes
add/data/xqm/util.xqm Outdated Show resolved Hide resolved
@riedde riedde requested a review from bwbohl November 13, 2024 07:52
peterstadler
peterstadler reviewed Nov 18, 2024
View reviewed changes
add/data/xqm/util.xqm Outdated Show resolved Hide resolved
peterstadler
peterstadler reviewed Nov 18, 2024
View reviewed changes
add/data/xqm/util.xqm Outdated Show resolved Hide resolved
peterstadler
peterstadler requested changes Dec 2, 2024
View reviewed changes
add/data/xqm/util.xqm Outdated Show resolved Hide resolved
add/data/xqm/util.xqm Outdated Show resolved Hide resolved
riedde
riedde commented Dec 2, 2024
View reviewed changes
add/data/xqm/util.xqm Outdated Show resolved Hide resolved
riedde
riedde commented Dec 4, 2024
View reviewed changes
add/data/xqm/util.xqm Outdated Show resolved Hide resolved
@riedde riedde requested a review from peterstadler December 4, 2024 18:49
@riedde
Copy link
Contributor Author

riedde commented Dec 5, 2024

So, if I got it right, all request and discussions are resolved.

peterstadler
peterstadler reviewed Dec 9, 2024
View reviewed changes
add/controller.xql Outdated Show resolved Hide resolved
@riedde riedde requested a review from peterstadler December 9, 2024 10:03
@peterstadler
Copy link
Member

Thanks for the quick update @riedde .
Now there's only the conflict in add/data/xqm/util.xqm that needs to be resolved before we can merge this PR.

@riedde
Copy link
Contributor Author

riedde commented Dec 10, 2024

Strange. I checked out the branch and merged develop into it locally and there was no conflict. Maybe my git client was able to resolve it when fast-forwarding.

@peterstadler peterstadler merged commit fd45a49 into develop Dec 10, 2024
5 checks passed
@peterstadler peterstadler deleted the fix/441-fail-if-no-lang-set branch December 10, 2024 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterstadler peterstadler peterstadler approved these changes

@roewenstrunk roewenstrunk Awaiting requested review from roewenstrunk

@bwbohl bwbohl Awaiting requested review from bwbohl

Assignees

@roewenstrunk roewenstrunk

@riedde riedde

Labels
Type: bugfix A pull request providing a bugfix
Projects
Edirom Development
Status: Done
Milestone
1.0.0
Development

Successfully merging this pull request may close these issues.

[BUG] Edirom fails when no edition lang is defined
4 participants
@riedde @peterstadler @roewenstrunk @bwbohl