benjaoming
7ce7b6ecb0
Merge pull request 'Bestyrelsesmøde 2024-06-10: Referat' ( #56 ) from bestyrelsesmoede into main
...
Reviewed-on: #56
2024-08-15 09:49:10 +00:00
benjaoming
618057cfa7
Merge pull request 'Bestyrelsesmøde 2024-06-10: Ændringer i Medlemsydelse (ny sats + tydeliggørelser i betalingsbetingelser)' ( #55 ) from medlemsydelse2024 into main
...
Reviewed-on: #55
2024-08-15 09:48:34 +00:00
Benjamin Bach
a6f7e78883
meeting minutes, board constitution
2024-06-10 21:34:07 +02:00
Benjamin Bach
35990ef04a
Changes to Medlemsydelser, agreed on board meeting 2024-06-10
2024-06-10 19:29:58 +02:00
Benjamin Bach
efe21878d1
Update PDF w/ version corrected at assembly, remove ODS source ( #54 )
...
Reviewed-on: #54
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-06-02 19:26:34 +00:00
valberg
305b4ad770
Referat af generalforsamling 2024. ( #53 )
...
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Reviewed-on: #53
Reviewed-by: benjaoming <benjaoming@data.coop>
2024-06-02 19:25:40 +00:00
Sam A.
cdd376880d
Merge pull request 'Fikset små markdown ting post-GF' ( #52 ) from vedtaegter-markdown-rettelse into main
...
Reviewed-on: #52
Reviewed-by: Sam A. <samsapti@noreply@git.data.coop>
2024-06-02 15:36:26 +00:00
valberg
498db02e99
Fikset små markdown ting post-GF
2024-06-01 18:54:48 +00:00
valberg
92f65166d7
Merge pull request 'GF2024: Vedtægtsændring: Tilføj paragraf om moderationspolitik' ( #47 ) from gf2024/moderator-ikke-bestyrelsesmedlem into main
...
Reviewed-on: #47
Reviewed-by: benjaoming <benjaoming@data.coop>
2024-06-01 18:50:54 +00:00
Víðir Valberg Guðmundsson
8f0007b213
Merge branch 'main' into gf2024/moderator-ikke-bestyrelsesmedlem
2024-06-01 20:50:00 +02:00
benjaoming
e1298b45c9
Merge pull request 'GF2024: Forslag om indmeldelse i Kooperativt København' ( #48 ) from gf-2024/forslag/kooperativtkbh into main
...
Reviewed-on: #48
2024-06-01 12:59:41 +00:00
Benjamin Bach
6df994d214
Change from general assembly
2024-06-01 14:59:08 +02:00
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
e6b514402e
Merge pull request 'GF2024: Ændringsforslag til "Vedtægtsændring: Tilføj paragraf om moderationspolitik": Tilføjelse af mistillidsparagraf' ( #51 ) from gf2024/aendringforslag-til-moderationspolitik-paragraf into gf2024/moderator-ikke-bestyrelsesmedlem
...
Reviewed-on: #51
2024-06-01 12:37:14 +00:00
Víðir Valberg Guðmundsson
699c635bd4
Upd.
2024-06-01 14:35:04 +02:00
valberg
9eef2bde08
Update Vedtaegter.md
2024-06-01 12:31:05 +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
valberg
89477ec772
Merge pull request 'GF2024: Ændringsforslag: Ændring af formulering samt andet' ( #49 ) from gf2024/moderationspolitik-aendringsforslag into gf2024/moderator-ikke-bestyrelsesmedlem
...
Reviewed-on: #49
2024-05-27 20:08:25 +00:00
Sam A.
64820d7482
Change rule about moderators not being board members
2024-05-27 21:52:56 +02:00
Sam A.
2cac63a0ac
Change § 8 as suggested by Balder, and move stuff to § 8.1
2024-05-27 21:50:50 +02:00
Sam A.
cc407ffd9f
Rename § 8. Moderatorer to § 8. Moderationspolitik + typo
2024-05-27 21:48:04 +02:00
Benjamin Bach
48396fb935
Proposal to become members of Kooperativt København
2024-05-27 14:31:45 +02:00
Sam A.
11548b45a5
Tilføj paragraf om moderatorhold
2024-05-21 18:52:34 +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