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

JSON Content Editor #634

Merged
merged 18 commits into from
Dec 20, 2023
Merged

JSON Content Editor #634

merged 18 commits into from
Dec 20, 2023

Conversation

sarahelsaig
Copy link
Member

@sarahelsaig sarahelsaig commented Dec 3, 2023

Content change and details in submodule Lombiq/Orchard-JSON-Editor#54

@sarahelsaig
Copy link
Member Author

The test is only red because "Add Windows Build Warning Label" fails with Error: Parameter token or opts.auth is required. I think it's related to this being in a fork and not to the PR itself, so please ignore it.

@Piedone
Copy link
Member

Piedone commented Dec 5, 2023

Hehh, ironic: https://github.com/Lombiq/Open-Source-Orchard-Core-Extensions/actions/runs/7092830642/workflow#L90 I think it trips on the unusual combination of your user being part of the Lombiq org but this coming from a fork (and it would work for a fork when opened by an outsider, when we have to approve the run first).

Copy link

github-actions bot commented Dec 6, 2023

This pull request has merge conflicts. Please resolve those before requesting a review.

@sarahelsaig sarahelsaig reopened this Dec 8, 2023
@@ -40,7 +40,7 @@
branch = dev
[submodule "src/Modules/Lombiq.JsonEditor"]
path = src/Modules/Lombiq.JsonEditor
url = https://github.com/Lombiq/Orchard-JSON-Editor.git
url = https://github.com/sarahelsaig/Orchard-JSON-Editor.git
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: revert or don't merge this.

@Piedone Piedone changed the base branch from dev to issue/OSOE-746 December 20, 2023 01:25
@Piedone Piedone merged commit 0296895 into Lombiq:issue/OSOE-746 Dec 20, 2023
8 of 9 checks passed
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.

2 participants