-
Notifications
You must be signed in to change notification settings - Fork 4
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
Apps doc updates #21
Apps doc updates #21
Conversation
@molinaro-m - this looks better. Thanks for the tip. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect! Now it works, both locally and on the webtest preview branch
it's more like what we will operate tomorrow. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Conflict on content/_index.html
needs to be fixed. There was a big update to the site style that you probably don't have integrated into your branch.
Second, more minor issue, and not to be too picky about Git stuff since we haven't broadcasted this widely yet, but apps
is not a very good branch name. What we are preferring is making an issue in the tracker first, then using it in the name like iss1234
or iss1234-port-apps
. I won't block the PR based on this (just the conflict needs to be fixed), but please in the future make an issue first and then name your branch after it.
This conflict is because of my last commit. All the links are now in a different file: |
@@ -0,0 +1,108 @@ | |||
--- | |||
title: "VO Applications" | |||
date: 2024-02-09T10:00:00+02:00 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The date
can be left out - this is not correct anyways and Hugo will insert it automatically.
Okay, maybe you could resolve this then instead of @andamian ? |
I can, indeed. I will probably wait for the PR #23 to be merged first, as it touches as well the |
By the way, should this PR stay a Draft? |
@gmantele and @JeremyMcCormick - thanks for the feedback. This is a draft PR that I've started in preparation for the hackathon. I can probably solve the conflict at the end when the PR is ready which right now is not. The Apps page has not been worked on. |
Understood, we can look at this tomorrow then. 👍 |
@JeremyMcCormick - I'm probably jumping the gun here without having clear directions on how we are going to proceed. I just assumed that in this PR we will fix all the issues raised in https://docs.google.com/spreadsheets/d/15TE9LCNdDyBhAQF_TyX2AqXSXW8RxQqHkU_bBKxQK7I/edit#gid=0. I will adapt later if that's not the case. |
Yes, we are hoping to fix at least some of those issues. Please read the contribution guide: https://github.com/ivoa/ivoa-web/blob/main/CONTRIBUTING.md It may clear some things for you in terms of recommended developer workflow. |
Now that the main conflicting changes are done, maybe we should try to fix the conflict in this branch so that the editing team can work with no problem this afternoon. |
I have a strong preference that we do not use freeform branch names for major updates to the site. Can we instead put these changes on a branch that references an issue in the tracker and then open a new PR? I have made a new issue for adding the applications page: @andamian You may keep existing changes by branching from your existing one like |
Replaced with #26 |
No description provided.