Codeberg/org

Fork 29

Full new state of bylaws after general assembly 2024 #57

Open

momar wants to merge 17 commits from Assembly24-FullDraft into main

momar commented

2024-05-14 19:10:57 +00:00

Member

No description provided.

momar added 8 commits 2024-05-14 19:10:58 +00:00

Change 2 for Assembly 2024: Anchor "Codeberg Teams" in the bylaws 345722594e

Change 1 for Assembly 2024: Clearer tasks for Presidium & Executive Board 458c599375

Change 3 for Assembly 2024: Make it possible for the executive board to get paid 15738a59c1

Change 4 for Assembly 2024: Allow for easier remote decisions, shorten deadlines for proposals and make it possible to stand for election even during the assembly 744a54c95a

Change 5 for Assembly 2024: Allow to remove members with unreachable email addresses 5dc529d9a5

Change 7 for Assembly 2024: Allow written communication by default, and make it possible to cancel a membership through an online form c840f482f7

Change 8 for Assembly 2024: 8. Change Fee Regulations to allow more flexible payment of membership fees 8be50221a2

Change 6 for Assembly 2024: Explicitly state rules of procedure and make terms of use and privacy policy official rules of procedure d69637b753

momar force-pushed Assembly24-FullDraft from daef699cd8 to ac3cfd47f8

2024-05-14 19:20:15 +00:00

Compare

n0toose added the

enhancement

bylaws

label 2024-09-27 04:06:35 +00:00

fnetX added 2 commits 2024-11-27 18:00:45 +00:00

Rechtschreibung 54d5654803

Merge pull request 'Rechtschreibung' (#38 ) from Timwi/Codeberg.org:main into Assembly24-FullDraft ccdc756614

Reviewed-on: #38

fnetX changed title from ~~WIP: Full new state of bylaws after general assembly 2024 (just as a preview)~~ to Full new state of bylaws after general assembly 2024 (just as a preview)

2024-11-27 18:01:59 +00:00

fnetX changed title from ~~Full new state of bylaws after general assembly 2024 (just as a preview)~~ to Full new state of bylaws after general assembly 2024

2024-11-27 18:02:06 +00:00

ashimokawa added 1 commit 2024-11-28 12:14:57 +00:00

Change date to 2024-11-27 (when the typo had been merged) faee4b6a4b

This pull request has changes conflicting with the target branch.

en/bylaws.md

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin Assembly24-FullDraft:Assembly24-FullDraft

git checkout Assembly24-FullDraft

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 checkout main

git merge --no-ff Assembly24-FullDraft

git checkout Assembly24-FullDraft

git rebase main

git checkout main

git merge --ff-only Assembly24-FullDraft

git checkout Assembly24-FullDraft

git rebase main

git checkout main

git merge --no-ff Assembly24-FullDraft

git checkout main

git merge --squash Assembly24-FullDraft