search

ivoa / ivoa-web

ivoa.net website static web pages
Creative Commons Attribution Share Alike 4.0 International
3 stars 2 forks source link

Convert about and contacts pages #86

Open molinaro-m opened 2 weeks ago

molinaro-m commented 2 weeks ago

should fix #60 and #2 (partly)

molinaro-m commented 2 weeks ago

Added the contacts page I'll work out the members-contact now (even if it is linked to this explicitly)

molinaro-m commented 3 days ago

Hi @JeremyMcCormick , @gmantele This is now rebased on the shortcodes additions (even if not using them). Please, check whether it's OK to merge it.

JeremyMcCormick commented 3 days ago

Hi @JeremyMcCormick , @gmantele This is now rebased on the shortcodes additions (even if not using them). Please, check whether it's OK to merge it.

It seems like the short code changes were not rebased out. I still see them in the commit log.

You might need to git fetch origin first?

molinaro-m commented 2 days ago

I think I get what's the issue here (my fault). There's the branch on origin that diverged from my local due to rebasing and merging. I wonder if there's a solution or if its better I drop this PR, delete and redo the branches, and then restart the merge request from a clean situation.

JeremyMcCormick commented 2 days ago

I think I get what's the issue here (my fault).

There's the branch on origin that diverged from my local due to rebasing and merging.

I wonder if there's a solution or if its better I drop this PR, delete and redo the branches, and then restart the merge request from a clean situation.

I mentioned this on the other PR - just drop the shortcode commits entirely using a rebase. Should work fine I think...