kgess-mirror/codeberg-org
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/org.git synced 2026-01-11 19:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
105 commits 15 branches 0 tags 297 KiB
Commit graph

105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gusted
af79d8d9d3 Aktualisierung Impressum 2025-12-09 20:22:34 +01:00
Otto
c265af51dd Merge pull request 'Bylaws: Replace "business plan" with "financial plan"' (#1240) from n0toose/bylaws-english-financial-plan into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/1240
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2025-12-08 01:39:37 +01:00
Panagiotis "Ivory" Vasilopoulos
359510c655 Bylaws: Replace "business plan" with "financial plan" 
This is a translation for the word "Wirtschaftsplan".
This word can be directly translated to as "economic plan".
The original translation does not constrain us to terms like
"yearly budget" or "budgeting", so the closest translation would
be "financial plan"; it includes how money is going to be spent,
but does not leave the impression that Codeberg intends to operate
in the way that a traditional business would, nor does it imply
that e.g. only business transactions need to be disclosed.
 2025-12-08 01:09:00 +01:00
Gusted
f2064b44f5 Merge pull request 'Terms of Use: Update licensing policy (variant that explicitly allows non-commercial licences for works of personal experience and opinion)' (#1219) from dpk/org:licensing-policy-update into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/1219
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2025-11-22 00:33:08 +01:00
Gusted
4575277fff revert "Add note about date of introduction of the new privacy policy" 
Its in effect 🎉
 2025-10-02 22:05:56 +02:00
momar
9d6f9c6d31 Update executive board members 2025-10-02 20:50:43 +02:00
Moritz Marquardt
639997218c Merge pull request 'Change 9 for Assembly 2024: Add draft for privacy policy' (#54) from Assembly24-Change9-PrivacyPolicy into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/54
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Panagiotis "Ivory" Vasilopoulos <git@n0toose.net>
 2025-09-26 07:06:54 +02:00
Moritz Marquardt
33691a9d2f Add note about date of introduction of the new privacy policy 2025-09-25 21:56:26 +02:00
Moritz Marquardt
7f228271ef Revert "Add note about date of introduction of the new privacy policy" 
This reverts commit 23887a4819.
 2025-09-25 21:55:12 +02:00
momar
23887a4819 Add note about date of introduction of the new privacy policy 2025-09-25 21:21:13 +02:00
Daphne Preston-Kendal
600df26429 Hedge against aggressive interpretations of ‘non-commercial’ 2025-09-14 14:49:40 +02:00
dpk
4fd5cbb75f Fix formatting 2025-09-14 14:49:40 +02:00
Daphne Preston-Kendal
e9aaf90fef Terms of Use: Update licensing policy 2025-09-14 14:49:40 +02:00
Otto
15e7e760ea Merge pull request 'Fix dead link in README' (#1231) from kbruen/Codeberg-org:main into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/1231
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2025-09-05 01:10:48 +02:00
Kenneth Bruen
599fc014af
Fix dead link in README 2025-09-04 20:07:06 +02:00
Otto
2459c760f9 Merge pull request 'docs: add instructions for members' (#1204) from n0toose/Codeberg-org:readme-member-instructions into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/1204
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2025-09-02 01:11:36 +02:00
Panagiotis "Ivory" Vasilopoulos
fe4497f9fa docs: add instructions for members 2025-08-30 17:33:36 +02:00
Andreas Shimokawa
1a9a8a6ef5 Merge pull request 'feat(issues): add contact information redirects' (#1223) from n0toose/add-contact-links into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/1223
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2025-07-20 22:42:52 +02:00
Panagiotis "Ivory" Vasilopoulos
0881824d9a feat(issues): add contact information redirects 
Sometimes, we receive feedback on Codeberg and on its policies, as
well as even spam reports. The repository is primarily intended
for legal documents (as well as potential inconsistencies/problems
that they, or their translations, may have). Feedback on the policies
and their respective implementations is off-topic.

It makes sense to redirect people to Codeberg/Community and, should
a matter of discussion need discretion, our Contact page.
 2025-07-03 16:37:41 +02:00
Moritz Marquardt
2bad44ef35 Implement further suggestions from discussion 2025-06-18 11:52:07 +02:00
Moritz Marquardt
60fb5c436e Update or remove previously unclear points & adjust wording 2025-06-18 11:51:59 +02:00
Panagiotis "Ivory" Vasilopoulos
e3602d81eb Fix wording links & review comments 2025-06-18 11:51:48 +02:00
Moritz Marquardt
b2fd0a3ddc Fix numbering 2025-06-18 11:51:40 +02:00
Moritz Marquardt
790ed21661 Remove superfluous data processing purpose & add suggestion regarding repository contents 2025-06-18 11:51:27 +02:00
Moritz Marquardt
ed7d1042ea Incorporate changes suggested by the lawyer 2025-06-18 11:48:49 +02:00
momar
006d94a2b6 Add changes from comments to privacy policy draft 2025-05-30 20:44:50 +02:00
Moritz Marquardt
c7ccdb202d WIP: Change 9 for Assembly 2024: Add draft for privacy policy 2025-05-30 20:44:50 +02:00
Andreas Shimokawa
4d7d0703df bylaws: remove removed sections and renumber following like in german original 2025-05-26 13:47:14 +02:00
Moritz Marquardt
b6795970f1 Full new state of bylaws after general assembly 2024 (#57) 
Co-authored-by: Timwi <timwi@noreply.codeberg.org>
Co-authored-by: Otto <otto@codeberg.org>
Co-authored-by: Andreas Shimokawa <shimokawa@fsfe.org>
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/57
Co-authored-by: Moritz Marquardt <git@momar.de>
Co-committed-by: Moritz Marquardt <git@momar.de>
 2025-05-26 13:18:05 +02:00
Moritz Marquardt
cffe540ea3 Merge pull request 'Change 8 for Assembly 2024: 8. Change Fee Regulations to allow more flexible payment of membership fees' (#53) from Assembly24-Change8-FeeRegulations into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/53
 2025-03-30 20:15:46 +00:00
Moritz Marquardt
a19df0d232 Merge pull request 'Change 10 for Assembly 2024: Add election regulations' (#55) from Assembly24-Change10-ElectionRegulations into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/55
 2025-03-30 20:14:25 +00:00
ashimokawa
ff5180f0ac update Vorstand and address 2025-02-14 16:57:04 +00:00
Otto
172350cbd9 Merge pull request 'Imprint: Update law' (#69) from n0toose/imprint-ddg into main 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/69
Reviewed-by: Otto <otto@codeberg.org>
 2024-11-30 18:41:00 +00:00
Panagiotis "Ivory" Vasilopoulos
e520ebfa93 Imprint: Update law 
Fixes #68.
 2024-11-30 19:38:47 +01:00
banaanihillo
4b2a2c6854 Fix he/him to they/them 2024-08-02 21:29:35 +03:00
Moritz Marquardt
3bdc3d68b3 Add English translation of fee regulations change 2024-04-14 13:21:12 +02:00
Moritz Marquardt
31adfd8b16 Fix one last wording error in german version 2024-04-14 12:53:45 +02:00
Moritz Marquardt
f22471eee2 Add German version of election regulations 2024-04-14 11:37:18 +02:00
Moritz Marquardt
d11ce223cd Make wording match the bylaws & fix some other mistranslations 2024-04-14 09:17:16 +00:00
Moritz Marquardt
962cf565ed WIP: Change 10 for Assembly 2024: Add draft for election regulations 2024-03-23 22:24:04 +00:00
Moritz Marquardt
8be50221a2 Change 8 for Assembly 2024: 8. Change Fee Regulations to allow more flexible payment of membership fees 2024-02-08 20:29:56 +01:00
Otto
975ee655a3 Note about user content, security, Forgejo branding 2023-08-30 20:38:58 +00:00
Otto
c7f344a65f Address is finally changed 2023-03-31 09:12:08 +00:00
Otto
e8a8195ebe Fix more line breaks :-( 2023-02-22 12:42:44 +00:00
Otto
9275d21c38 fix line break 2023-02-22 12:42:19 +00:00
Otto
d888781ed4 Address will update 2023-02-22 12:42:05 +00:00
Jan Klippel
c8c2189e7b
German: Fix spelling mistake 
Fixes: #31
Signed-off-by: Jan Klippel <c0d3b3rg@kl1pp3l.de>
 2023-01-08 21:26:09 +01:00
pixelcode
1b8c61c203 German: Fix spelling/grammar mistakes, improve wording (#27) 
Reviewed-on: https://codeberg.org/Codeberg/org/pulls/27
Co-authored-by: pixelcode <pixelcode@noreply.codeberg.org>
Co-committed-by: pixelcode <pixelcode@noreply.codeberg.org>
 2022-11-17 23:16:37 +00:00
Codeberg
073cb98101 Imprint.md 2022-07-03 23:56:22 +02:00
Codeberg
f0edacf4fb Imprint.md 2022-07-03 23:55:46 +02:00