Visit Page
5
0
Fork
You've already forked pages
0

Make the repo function as a wiki #4

Open
aaaaargZombies wants to merge 1 commit from wiki into main
pull from: wiki
merge into: willowbark:main
willowbark:main
willowbark:values

Last meeting we talked about turning this repo into a wiki, not much has changed:

  • The TOC pad has been copoed in to make an index.
  • The index still links to the pads, these could become pages sooner or later but I left them as they have comments etc.
  • A notes.md & minutes.md have been made as indexs.
  • I made resources directory for things that aren't text, ie the site design PDF.

I have left in the XMPP page and the HTML site mockups, maybe these should go?

Last meeting we talked about turning this repo into a wiki, not much has changed: - The TOC pad has been copoed in to make an index. - The index still links to the pads, these could become pages sooner or later but I left them as they have comments etc. - A notes.md & minutes.md have been made as indexs. - I made resources directory for things that aren't text, ie the site design PDF. I have left in the XMPP page and the HTML site mockups, maybe these should go?

Nice! I'd say we can get rid of the extra stuff. Is anyone using the web chat? If not, let's remove it, if so, we can put it on the main website now.

Nice! I'd say we can get rid of the extra stuff. Is anyone using the web chat? If not, let's remove it, if so, we can put it on the main website now.
@ -0,0 +1,14 @@
# Minutes

I wonder if this is something we need? Seems like it will just be a thing we forget to update. If there's an actual wiki somewhere maybe we can have it auto generate indices. If not, this file probably won't be used anyways and just duplicates the directory listing.

I wonder if this is something we need? Seems like it will just be a thing we forget to update. If there's an actual wiki somewhere maybe we can have it auto generate indices. If not, this file probably won't be used anyways and just duplicates the directory listing.
@ -0,0 +1,3 @@
# Notes
[[2021年08月06日-worker-coop-startup-webinar.md]]

Same as wiki index comment.

Same as wiki index comment.

I should mention that we also have the option of enabling the actual Gitea wiki software stuff in settings. That's also a git repo, but can be edited and viewed on the web. We could move content there and just use this repo for files and other non-wiki documents we want to keep track of.

I should mention that we also have the option of enabling the actual Gitea wiki software stuff in settings. That's also a git repo, but can be edited and viewed on the web. We could move content there and just use this repo for files and other non-wiki documents we want to keep track of.
Author
Owner
Copy link

Ah I didn't realise that was a git repo, now I think about it, it would be strange if it wasn't.

I like the idea of using that then.

Ah I didn't realise that was a git repo, now I think about it, it would be strange if it wasn't. I like the idea of using that then.

I've enabled it (I did not add any content) so that we can play around with it.

I've enabled it (I did not add any content) so that we can play around with it.

I tried adding the minutes, but apparently the wiki doesn't support pages at anything but the top level? That seems poor. We probably want minutes grouped or something, otherwise there are going to be a lot of files in this hard-to-navigate directory very quickly.

I tried adding the minutes, but apparently the wiki doesn't support pages at anything but the top level? That seems poor. We probably want minutes grouped or something, otherwise there are going to be a lot of files in this hard-to-navigate directory very quickly.
Author
Owner
Copy link

If we're interacting via the wiki rather than the directory structure that doesn't really bother me.

If we're interacting via the wiki rather than the directory structure that doesn't really bother me.

That's fair; I would probably have generally preferred to just use the repo directly on my laptop and wouldn't have looked at the web interface, but I can get over that and use the web too I suppose since we have a free tool at our disposal (or just use the repo but everything will be hard to find and ugly)

That's fair; I would probably have generally preferred to just use the repo directly on my laptop and wouldn't have looked at the web interface, but I can get over that and use the web too I suppose since we have a free tool at our disposal (or just use the repo but everything will be hard to find and ugly)
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin wiki:wiki
git switch wiki

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff wiki
git switch wiki
git rebase main
git switch main
git merge --ff-only wiki
git switch wiki
git rebase main
git switch main
git merge --no-ff wiki
git switch main
git merge --squash wiki
git switch main
git merge --ff-only wiki
git switch main
git merge wiki
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
willowbark/pages!4
Reference in a new issue
willowbark/pages
No description provided.
Delete branch "wiki"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?