Benjamin Bach
2dcb026a6c
Merge branch 'main' of git.data.coop:data.coop/dokumenter into gf-2024/forslag/kooperativtkbh
2024-06-01 14:58:21 +02:00
valberg
f1ff19361a
Merge pull request 'GF2024: AUP-ændring: Omformuler fra specifikke kanaler til noget mere generelt' ( #41 ) from ingen-specifikke-kanaler into main
...
Reviewed-on: #41
Reviewed-by: Sam A. <samsapti@noreply@git.data.coop>
2024-06-01 12:42:21 +00:00
valberg
b88abeff31
Merge pull request 'GF2024: Smårettelser til Moderationspolitik' ( #42 ) from mastodon-moderation-rettelser into main
...
Reviewed-on: #42
2024-06-01 12:40:21 +00:00
valberg
5dc7500f09
Merge pull request 'GF2024: Vedtægtsændring: Fjern punkt 5. fra dagsorden.' ( #45 ) from gf-2024/forslag/fjernelse-af-punkt-5-i-dagsorden into main
...
Reviewed-on: #45
Reviewed-by: benjaoming <benjaoming@data.coop>
2024-06-01 12:17:08 +00:00
valberg
7cab7a3898
Merge pull request 'GF2024: Vedtægtsændring: Præcisér at regnskab, budget og kontingent skal godkendes.' ( #46 ) from gf-2024/forslag/godkendelse-af-regnskab-budget-og-kontingent into main
...
Reviewed-on: #46
Reviewed-by: benjaoming <benjaoming@data.coop>
2024-06-01 12:15:49 +00:00
valberg
71de6b3da9
Merge pull request 'GF2024: Vedtægtsændring: Specificering af formalia i dagsordenen' ( #36 ) from gf-2024/forslag/generalforsamling-dagsorden-formalia into main
...
Reviewed-on: #36
2024-06-01 12:14:21 +00:00
benjaoming
0efd3c04cf
Merge pull request 'GF2024: Vedtægtsændring: Separat afsnit for Tegningsret + ny regel for prokura' ( #35 ) from tegningsret into main
...
Reviewed-on: #35
Reviewed-by: reynir <data.coop@reynir.dk>
2024-06-01 12:13:28 +00:00
valberg
74845750b5
Merge pull request 'GF2024: Vedtægtsændring: Medlemsydelse' ( #43 ) from gf-2024/forslag/medlemsydelse into main
...
Reviewed-on: #43
Reviewed-by: benjaoming <benjaoming@data.coop>
2024-06-01 12:09:07 +00:00
valberg
f05d802cbc
Merge pull request 'Bestyrelsens beretning 2023-2024' ( #50 ) from bestyrelsens-beretning-2023-2024 into main
...
Reviewed-on: #50
2024-06-01 10:58:36 +00:00
valberg
f4d802d9bd
Bestyrelsens beretning 2023-2024
2024-06-01 10:58:21 +00:00
Benjamin Bach
48396fb935
Proposal to become members of Kooperativt København
2024-05-27 14:31:45 +02:00
benjaoming
cf79ba565c
Merge branch 'main' into gf-2024/forslag/medlemsydelse
2024-05-20 07:39:32 +00:00
Víðir Valberg Guðmundsson
4321689171
GF2024: Vedtægtsændring: Præcisér at regnskab, budget og kontingent skal godkendes.
2024-05-19 09:05:01 +02:00
Víðir Valberg Guðmundsson
9127567493
GF2024 Vedtægtsændring: Fjern punkt 5. fra dagsorden.
2024-05-19 08:59:14 +02:00
benjaoming
b0e33798cc
Merge pull request 'GF 2024: Regnskab 2023' ( #44 ) from 2024-regnskab into main
...
Reviewed-on: #44
2024-05-19 06:43:07 +00:00
Benjamin Bach
8d5193c3c4
Regnskab 2023
2024-05-18 22:03:41 +02:00
benjaoming
32f7165be3
Merge pull request 'GF 2024: Budgetforslag for 2024' ( #37 ) from 2024-prep into main
...
Reviewed-on: #37
2024-05-18 19:11:07 +00:00
Benjamin Bach
e0719abb41
AUP is on main, not master
2024-05-15 23:29:49 +02:00
Sam A.
861846095c
Merge branch 'main' into mastodon-moderation-rettelser
2024-05-15 20:33:07 +00:00
benjaoming
9fbaf75cc8
Merge pull request 'Ekstraordinær GF 2024-05-15: Forslag til Mastodon moderationspolitik og håndbog for moderatorer' ( #28 ) from mastodon-moderation into main
...
Reviewed-on: #28
2024-05-15 18:17:49 +00:00
Benjamin Bach
698d136af1
Remove weird part of sentence "drejer om"
2024-05-15 18:59:30 +02:00
benjaoming
9527a1a3db
Merge pull request 'Typos and formatting' ( #40 ) from rettelser into mastodon-moderation
...
Reviewed-on: #40
2024-05-15 16:56:46 +00:00
decibyte
7f6a4e90d8
Omformuler fra specifikke kanaler til noget mere generelt
...
For ikke at skulle opdatere AUP'en hver gang en tjeneste skifter navn eller bliver erstattet af noget andet, prøver vi at formulere det lidt mere bredt hvordan man bidrager positivt i kommunikationen/samarbejdet.
Derudover lidt smårettelser, nu jeg alligevel var i gang.
2024-05-15 16:34:14 +00:00
Sam A.
fd3825b4f7
Data.coop -> data.coop
2024-05-15 18:13:55 +02:00
Sam A.
8d7fe4ce5c
Markdown doesn't support lettered lists
2024-05-15 18:12:54 +02:00
Sam A.
5b600859ba
Typo
2024-05-15 18:10:51 +02:00
Sam A.
1b74a1f49e
a) -> a.
2024-05-15 18:10:23 +02:00
Sam A.
31381ada79
Data.coop -> data.coop
2024-05-15 18:10:03 +02:00
Sam A.
b7c8f5fb84
Rename 'mastodon-moderation.md' to 'Fediverse Moderation.md'
2024-05-15 17:42:25 +02:00
Benjamin Bach
712c3e353c
Update @decibyte 's comments: domain saving+kontingent 2023
2024-05-14 14:34:02 +02:00
Benjamin Bach
95d923634d
Basisydelse=medlemsydelse
2024-05-14 14:03:08 +02:00
Benjamin Bach
80ac329f10
Singular it all @valberg
2024-05-14 13:49:37 +02:00
Benjamin Bach
d710b2a77c
Initialize a document for terms and conditions on payments and delivery
2024-05-14 12:20:57 +02:00
Benjamin Bach
5cdc64a8c9
compromise, some singular, some plural
2024-05-14 11:55:23 +02:00
Benjamin Bach
7416e63b12
Pluralize intro
2024-05-13 23:10:40 +02:00
Benjamin Bach
14ef28f149
Simplify §9
2024-05-13 20:32:46 +02:00
Benjamin Bach
3ae9426140
Some corrections
2024-05-13 18:35:33 +02:00
Benjamin Bach
7a0ef1874a
Adds proposed budget w/ .ods source
2024-05-13 17:58:15 +02:00
Víðir Valberg Guðmundsson
5471dca6e9
GF2024 Forslag om vedtægtsændring: Introduktion af servicegebyr
2024-05-08 23:02:10 +02:00
Víðir Valberg Guðmundsson
ae0ee21fce
GF2024 Forslag om vedtægtsændring: Specificering af formalia i dagsordenen
2024-05-08 22:35:20 +02:00
benjaoming
8e69aa1f2f
Merge pull request 'Mastodon moderation: Adds a section to guide decision about Meta based in principles and policy' ( #34 ) from meta into mastodon-moderation
...
Reviewed-on: #34
2024-04-26 15:14:37 +00:00
Benjamin Bach
c181001906
Update with fixes from @laumann
2024-03-18 10:35:29 +01:00
Benjamin Bach
a92de77135
Clarify/be stringent about "instance" and don't use undefined term "fediverse"
2024-03-18 10:30:16 +01:00
Benjamin Bach
b28ebc5757
Separate section for the signatories of the association
2024-03-18 10:09:49 +01:00
benjaoming
32a1fe96cd
Remove pad link
2024-02-29 22:27:04 +00:00
benjaoming
275378eefe
Remove wild photo
2024-02-29 22:25:45 +00:00
benjaoming
28e8785c27
Minutes from today's board meeting
2024-02-29 22:24:08 +00:00
Benjamin Bach
23f915190b
Intro to Inspiration
2024-01-14 13:00:02 +01:00
Benjamin Bach
c4dd0fb228
Some more refinements to introduction
2024-01-14 12:58:38 +01:00
Benjamin Bach
dbd8d7ffd2
Add introduction and rename policy
2024-01-13 19:49:41 +01:00