From a0e5a4d2f12c112fd7b1c5678dd93fdb43335df8 Mon Sep 17 00:00:00 2001 From: valberg Date: Sat, 1 Jun 2024 19:08:20 +0000 Subject: [PATCH 01/15] Remove call for general assembly --- content/_index.da.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/content/_index.da.md b/content/_index.da.md index ab4f89e..d740d5b 100644 --- a/content/_index.da.md +++ b/content/_index.da.md @@ -2,8 +2,6 @@ title: Velkommen til data.coop --- -[📣️ Indkaldelse til generalforsamling 1. juni 2024 📣️](/assembly2024-2) - data.coop er et kooperativ, som ejer og driver en digital infrastruktur for medlemmerne. Vores grundlæggende formål er at passe på medlemmernes data. Vores kerneprincipper er: -- 2.43.4 From e096bcec9cbf4d23822449c508ab8b851bdcaf39 Mon Sep 17 00:00:00 2001 From: valberg Date: Sat, 1 Jun 2024 19:09:06 +0000 Subject: [PATCH 02/15] Update content/_index.en.md --- content/_index.en.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/content/_index.en.md b/content/_index.en.md index 4db3096..dcad610 100644 --- a/content/_index.en.md +++ b/content/_index.en.md @@ -2,8 +2,6 @@ title: Welcome to data.coop --- -[📣️ General assemby June 1st 2024 📣️](/assembly2024-2) - data.coop is a cooperative, which owns and operates a digital infrastructure for its members. Our fundamental vision is to protect our members' data. The community consists of members around the Copenhagen-area and is open to inquiries from abroad to start sister infrastructures based on the same principles. -- 2.43.4 From 5e284532a267a2fe01a27df9a1251d158b3187dc Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sun, 2 Jun 2024 17:34:49 +0200 Subject: [PATCH 03/15] Update rights page (Danish) --- content/rights.da.md | 66 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/content/rights.da.md b/content/rights.da.md index eacd0a7..8fe14b2 100644 --- a/content/rights.da.md +++ b/content/rights.da.md @@ -43,13 +43,15 @@ foreningens hjemmeside og mailinglister. Ordinær generalforsamling afholdes hvert år inden udgangen af september måned. Dagsorden for ordinær generalforsamling skal indeholde følgende punkter: -1. Valg af dirigent og referent. +1. Formalia + 1. Valg af dirigent. + 2. Generalforsamlingens lovlighed (er indkaldelsen sket rettidigt). + 3. Valg af referent. 2. Bestyrelsens beretning. -3. Fremlæggelse af regnskab, budget og kontingent. +3. Fremlæggelse og godkendelse af regnskab, budget og kontingent. 4. Indkomne forslag. -5. Godkendelse af vedtægtsændringer og Acceptable Use Policy -6. Valg (Jf. § 3) -7. Eventuelt +5. Valg (Jf. § 3) +6. Eventuelt ### § 4.1. Afholdelse af generalforsamlinger og bestyrelsesmøder Generalforsamlinger og bestyrelsesmøder kan afholdes på internettet. @@ -77,10 +79,14 @@ Bestyrelsen fastsætter selv sin forretningsorden. Bestyrelsen kan sammensætte samarbejdsgrupper af medlemmer, der kan fungerer som idéudviklingsforum for foreningen. +### § 5.1 Tegningsret + Tegningsret for foreningen har forpersonen og kassereren, dog ved køb, salg eller pantsætning af fast ejendom, indgåelse af driftsaftaler samt ved optagelse af lån, af den samlede bestyrelse. +Den samlede bestyrelse kan meddele prokura til individuelle medlemmer af bestyrelsen. + ## § 6. Medlemskab Som medlem kan enhver fysisk person optages, som har interesse i at støtte foreningens formål. Medlemskab er bindende for et år ad gangen. @@ -108,14 +114,56 @@ på en ekstraordinær generalforsamling. Mistillid til administratorer skal meldes til bestyrelsen. Bestyrelsen kan midlertidigt fratage en administrator vedkommendes administrationsrettigheder, indtil mistillidserklæringen mod vedkommende er behandlet. -## § 8. Kontingent/finansiering +## § 8. Moderationspolitik +Foreningen vedtager en moderationspolitik for foreningens sociale tjenester på generalforsamlingen. Moderationspolitikken håndhæves af et moderatorhold. + +### § 8.1 Udpegning af moderatorer +Bestyrelsen udpeger moderatorer. + +Udpegning af moderatorer skal annonceres til foreningens medlemmer. + +Kun medlemmer af foreningen kan bestride hvervet som moderator. Moderatorer skal så vidt muligt findes udenfor bestyrelsen, dog skal mindst én moderator samtidig være bestyrelsesmedlem. + +### § 8.2 Mistillid til moderatorer +Hvis der er mistillid til en eller flere moderatorer skal dette behandles +på en ekstraordinær generalforsamling. + +Mistillid til moderatorer skal meldes til bestyrelsen. Bestyrelsen kan midlertidigt fratage en moderator vedkommendes moderatorrettigheder, indtil mistillidserklæringen mod vedkommende er behandlet. + +## § 9. Kontingent/finansiering De årlige kontingenter fastsættes af generalforsamlingen. Foreningen kan herudover finansieres ved sponsor- og annoncestøtte samt bidrag fra offentlige/private virksomheder, fonde, øvrige foreninger/institutioner og private personer, så længe det ikke stiller krav til foreningens dispositioner. -## § 9. Ekstraordinær generalforsamling +## § 10. Medlemsydelse + +Foreningen stiller tjenester til rådighed for sine medlemmer mod betaling af medlemsydelse. + +Medlemsydelsen defineres og prissættes af bestyrelsen. + +### § 10.1 Leverings- og betalingsbetingelser + +Bestyrelsen fastsætter leverings- og betalingsbetingelser, såsom betalingsperioder, frister og refusion. + +Bestyrelsen forudsætter sig ret til at pålægge gebyrer eller lukke for tjenester ved udebleven betaling. + +### § 10.2 Ændring af medlemsydelser og betalingsbetingelser + +Ændring af ydelser og betalingsbetingelser skal annonceres til foreningens medlemmer mindst 30 dage inden ændringen træder i kraft. + +Tilføjelser af flere tjenester eller ændringer på konfigurationen af tjenester anses IKKE som ændringer, der kræver varslinger. + +### § 10.3 Indsigelse mod ændringer + +Hvis et eller flere medlemmer er uenige i ændringer af medlemsydelsen eller betalingsbetingelser, kan de indsende en skriftlig indsigelse til bestyrelsen. + +Indsigelsen skal være bestyrelsen i hænde senest 14 dage før ændringen træder i kraft. + +Hvis bestyrelsen modtager indsigelser fra mindst 1/3 af foreningens medlemmer, skal bestyrelsen indkalde til en ekstraordinær generalforsamling, hvor ændringen skal fremsættes som forslag og godkendes af generalforsamlingen. + +## § 11. Ekstraordinær generalforsamling Indkaldelse sker, hvis et flertal af bestyrelsen ønsker det. Indkaldelse sker, hvis 1/3 af medlemmerne ønsker det. @@ -124,10 +172,10 @@ Indkaldelse sker under samme betingelser, som anført i §4. Dagsorden skal motiveres. -## § 10. Regnskab +## § 12. Regnskab Regnskabsåret for Foreningen er kalenderåret. -## § 11. Opløsning +## § 13. Opløsning Opløsning af foreningen kræver et flertal på ¾ af generalforsamlingens eller den ekstraordinære generalforsamlings fremmødte medlemmer. -- 2.43.4 From 1ae0988d2cb5fc639b7cb54e7c1fe3b3e00ddb58 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sun, 2 Jun 2024 18:26:15 +0200 Subject: [PATCH 04/15] Remove files for GA calls --- content/assembly2024-1.da.md | 32 ---------------------- content/assembly2024-2.da.md | 51 ------------------------------------ 2 files changed, 83 deletions(-) delete mode 100644 content/assembly2024-1.da.md delete mode 100644 content/assembly2024-2.da.md diff --git a/content/assembly2024-1.da.md b/content/assembly2024-1.da.md deleted file mode 100644 index d9ac49d..0000000 --- a/content/assembly2024-1.da.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -title: Ekstraordinær Generalforsamlingen 15. maj 2024 ---- - - - -Bestyrelsen indkalder hermed til en ekstraordinær generalforsamling, hvor vi ønsker at nå til en beslutning vedrørende den moderationspolitik, som det dertil nedsatte udvalg er nået frem til. - -Indkaldelsen til ekstraordinær GF kan måske virke underlig, taget i betragtning at vi har en ordinær generalforsamling blot 2 uger efter. Men vi havde allerede besluttet at tage dette spørgsmål op så hurtigt som muligt. Og vi indser også, at denne vigtige debat næppe får tilstrækkelig tid til en ordinær generalforsamling, og omvendt ville tage uforholdsmæssigt meget tid ved en sådan. - -Dagsorden ser således ud: - -1. Valg af dirigent og referent. -2. Fremlæggelse og diskussion af Moderationspolitik -3. Beslutning om Moderationspolitik - -Mødet finder sted via online videomøde: - -*fjernet fra offentlig indkaldelse* - -## 1. Valg af dirigent og referent - -## 2. Fremlæggelse og diskussion af Moderationspolitik - -Forslaget til en Moderationspolitik kan læses her: https://git.data.coop/data.coop/dokumenter/pulls/28 - -## 3. Beslutning om Moderationspolitik - -Evt. ændringsforslag behandles først. - -Herefter går vi til afstemning. - diff --git a/content/assembly2024-2.da.md b/content/assembly2024-2.da.md deleted file mode 100644 index 8aaa43a..0000000 --- a/content/assembly2024-2.da.md +++ /dev/null @@ -1,51 +0,0 @@ ---- -title: Indkaldelse til generalforsamling i data.coop, lørdag d. 1. juni 2024, kl. 13:00 ---- - -Kære data.coop medlem. - -Hermed indkaldes til ordinær 2024 generalforsamling for foreningen data.coop lørdag den 1. juni 2024 kl. 13:00. - -Generalforsamlingen vil blive afholdt online. Der bliver udsendt et link til det præcise sted i dagene op til. - -Man kan finde vedtægter samt tidligere referater her:
- - -Regnskab, budget og andre relevante dokumenter for generalforsamlingen kan findes på:
- - -Hvis man har forslag til vedtægtsændringer må de meget gerne indsendes som "[Pull Request](https://git.data.coop/data.coop/dokumenter/pulls)" i Forgejo - spørg gerne om hjælp på [Matrix-kanalen](https://matrix.to/#/#data.coop:data.coop) eller på mail til forpersonen, Vidir, på . Husk at indsende senest syv dage før GF, så de er modtaget senest 24 maj 2024 kl 23:59. - -## Dagsorden - -1) Valg af dirigent og referent. -2) Bestyrelsens beretning. -3) Fremlæggelse af regnskab, budget og kontingent. -4) Indkomne forslag. - - - Forslag om vedtægtsændring: Separat afsnit for Tegningsret + ny regel for prokura: - - Forslag om vedtægtsændring: Specificering af formalia i dagsordenen: - - Omformuler fra specifikke kanaler til noget mere generelt: - - Smårettelser til Moderationspolitik: - - **BEMÆRK! Forslag stillet via Pull Requests kan rettes frem til syv dage før generalforsamlingen jf. vedtægterne.** - -5) Godkendelse af vedtægtsændringer og [Acceptable Use Policy](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md) inklusive eventuelle vedtagede forslag til denne. -6) Valg jf. §3 i vedtægterne. - Den nuværende bestyrelse består af: - - Bestyrelsesmedlemmer: - - Balder - - Halfdan - - Mikkel - - Reynir (på valg) - - Vidir (på valg) - - Suppleanter (på valg): - - Sam - - Sune -7) Eventuelt. - -Det var alt! Hvis du har spørgsmål, så skriv gerne til . - -Med venlig hilsen
-Bestyrelsen - -- 2.43.4 From 1a61003ef7518ac22d90ba9346eaf221c2dcea38 Mon Sep 17 00:00:00 2001 From: Daniel N Date: Sun, 2 Jun 2024 18:12:51 +0000 Subject: [PATCH 05/15] Update rights page (en) --- content/rights.en.md | 67 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/content/rights.en.md b/content/rights.en.md index 03b412b..d9b2cc6 100644 --- a/content/rights.en.md +++ b/content/rights.en.md @@ -35,13 +35,15 @@ Board members are elected for a period of 2 years, so that at least 2 members ar ## § 4. The General Assembly (GA) The board calls for meetings of the GA no less than 14 days prior through the website of the association and mailing lists. The GA meets every year before the end of September. The agenda of the annual meeting of the GA must include the following items: -1. Election of a meeting chair and notetaker +1. Formalities + 1. Election of a meeting chair and notetaker + 2. Legality of the meeting (was the meeting called in time) + 3. Election of a notetaker 2. Report from the board -3. Presentation of accounts, budget and membership fee +3. Presentation and approval of accounts, budget and membership fee 4. Incoming motions -5. Approval of statute amendments and Acceptable Use Policy -6. Elections (as per §3) -7. Any other business +5. Elections (as per §3) +6. Any other business ### § 4.1. Holding of meetings of the GA and the board Meetings of the GA and the board may take place online. @@ -66,7 +68,11 @@ The board itself determines its own rules of procedure. The board may create ad-hoc working groups consisting of members, functioning as fora for developing ideas for the association. -The chair and treasurer have legal authority, but when it comes to purchasing, selling, or mortgaging real estate, making service agreements, or taking loans, the entire board must agree to bind the association. +### §5.1 Legal authority + +The chair and treasurer have legal authority, but when it comes to purchasing, selling, or mortgaging real estate, making service agreements, or taking loans, the board as a whole must agree to bind the association. + +The board as a whole may assign power of attorney to individual members of the board. ## § 6. Membership Any physical person who supports the aims of the association may become a member. Membership is binding for one year at a time. @@ -90,12 +96,53 @@ Mistrust towards one or more administrators must be addressed at an extraordinar Mistrust towards administrators must be reported to the board. The board has the authority to temporarily suspend an administrator's administrative rights until the declaration of mistrust against them is addressed -## § 8. Membership fees/funding +## § 8. Moderationspolitik +The association maintains a moderation policy for its social services, approved by the GA. The moderation policy is enforced by a team of moderators. + +### § 8.1 Appointment of moderators +The board appoints moderators. + +The appointment of moderators must be announced to the members of the association. + +Only members of the association can hold the position of moderator. Ideally, moderators should not be board members, however, at least one moderator must also be a board member. + + ### § 8.2 Mistrust of moderators +Mistrust towards one or more moderators must be addressed at an extraordinary meeting of the GA. + +Mistrust towards moderators must be reported to the board. The board has the authority to temporarily suspend a moderator's moderator rights until the declaration of mistrust against them is addressed + +## § 9. Membership fees/funding Annual membership fees are decided by the GA. Additionally, the association can receive funding through sponsorships, advertising support, as well as contributions from public/private companies, foundations, other associations/institutions, and private individuals, as long as it does not impose conditions on the association's decisions. -## § 9. Extraordinary General Assembly (GA) +## § 10. Service fees + +The association provides services to its members who pay a service fee. + +The service fee is defined and determined by the board. + +### § 10.1 Terms of delivery and payment + +The board determines the terms of delivery and payment, such as terms, payment times and refunds. + +The board reserves the right to charge late fees or suspend services in case of lacking payments. + +### § 10.2 Change of service fees and payment terms + +Changes to service fees or payment terms must be announced to the members of the association no later than 30 days before taking effect. + +The addition of services or changes to service configurations are NOT considered changes requiring notice. + +### § 10.3 Disputing changes + +If one or more members disagree with changes in service fees or payment terms, they may file a dispute in writing to the board. + +The dispute must be received by the board no later than 14 days before the change would take effect. + +If the board receives disputes from at least 1/3 of the members of the association, the board must call for an extraordinary GA, at which the change must be presented as a motion to be approved by the GA. + +## § 11. Extraordinary General Assembly (GA) Extraordinary GAs may be called if desired by a majority of the board. Extraordinary GAs may be called if desired by one-third of the members. @@ -104,10 +151,10 @@ Extraordinary GAs are called following the same terms as in §4. The agenda must be substantiated. -## § 10. Accounts +## § 12. Accounts The association's financial year is the calendar year. -## § 11. Dissolution +## § 13. Dissolution Dissolution of the association requires a majority vote of three-quarters of members present at the GA or extraordinary GA. The dissolution must then be approved at a subsequent extraordinary GA. -- 2.43.4 From 52a42938dbfd9ed26efe1c16f2a7f62dffc543a3 Mon Sep 17 00:00:00 2001 From: Daniel N Date: Sun, 2 Jun 2024 18:40:21 +0000 Subject: [PATCH 06/15] Update content/rights.en.md --- content/rights.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rights.en.md b/content/rights.en.md index d9b2cc6..93c21a2 100644 --- a/content/rights.en.md +++ b/content/rights.en.md @@ -96,7 +96,7 @@ Mistrust towards one or more administrators must be addressed at an extraordinar Mistrust towards administrators must be reported to the board. The board has the authority to temporarily suspend an administrator's administrative rights until the declaration of mistrust against them is addressed -## § 8. Moderationspolitik +## § 8. Moderation policy The association maintains a moderation policy for its social services, approved by the GA. The moderation policy is enforced by a team of moderators. ### § 8.1 Appointment of moderators -- 2.43.4 From 3644523cf05d7ea264b12983deb0b03e31af04be Mon Sep 17 00:00:00 2001 From: Daniel N Date: Sun, 2 Jun 2024 18:12:51 +0000 Subject: [PATCH 07/15] Update rights page (en) --- content/rights.en.md | 67 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/content/rights.en.md b/content/rights.en.md index 03b412b..d9b2cc6 100644 --- a/content/rights.en.md +++ b/content/rights.en.md @@ -35,13 +35,15 @@ Board members are elected for a period of 2 years, so that at least 2 members ar ## § 4. The General Assembly (GA) The board calls for meetings of the GA no less than 14 days prior through the website of the association and mailing lists. The GA meets every year before the end of September. The agenda of the annual meeting of the GA must include the following items: -1. Election of a meeting chair and notetaker +1. Formalities + 1. Election of a meeting chair and notetaker + 2. Legality of the meeting (was the meeting called in time) + 3. Election of a notetaker 2. Report from the board -3. Presentation of accounts, budget and membership fee +3. Presentation and approval of accounts, budget and membership fee 4. Incoming motions -5. Approval of statute amendments and Acceptable Use Policy -6. Elections (as per §3) -7. Any other business +5. Elections (as per §3) +6. Any other business ### § 4.1. Holding of meetings of the GA and the board Meetings of the GA and the board may take place online. @@ -66,7 +68,11 @@ The board itself determines its own rules of procedure. The board may create ad-hoc working groups consisting of members, functioning as fora for developing ideas for the association. -The chair and treasurer have legal authority, but when it comes to purchasing, selling, or mortgaging real estate, making service agreements, or taking loans, the entire board must agree to bind the association. +### §5.1 Legal authority + +The chair and treasurer have legal authority, but when it comes to purchasing, selling, or mortgaging real estate, making service agreements, or taking loans, the board as a whole must agree to bind the association. + +The board as a whole may assign power of attorney to individual members of the board. ## § 6. Membership Any physical person who supports the aims of the association may become a member. Membership is binding for one year at a time. @@ -90,12 +96,53 @@ Mistrust towards one or more administrators must be addressed at an extraordinar Mistrust towards administrators must be reported to the board. The board has the authority to temporarily suspend an administrator's administrative rights until the declaration of mistrust against them is addressed -## § 8. Membership fees/funding +## § 8. Moderationspolitik +The association maintains a moderation policy for its social services, approved by the GA. The moderation policy is enforced by a team of moderators. + +### § 8.1 Appointment of moderators +The board appoints moderators. + +The appointment of moderators must be announced to the members of the association. + +Only members of the association can hold the position of moderator. Ideally, moderators should not be board members, however, at least one moderator must also be a board member. + + ### § 8.2 Mistrust of moderators +Mistrust towards one or more moderators must be addressed at an extraordinary meeting of the GA. + +Mistrust towards moderators must be reported to the board. The board has the authority to temporarily suspend a moderator's moderator rights until the declaration of mistrust against them is addressed + +## § 9. Membership fees/funding Annual membership fees are decided by the GA. Additionally, the association can receive funding through sponsorships, advertising support, as well as contributions from public/private companies, foundations, other associations/institutions, and private individuals, as long as it does not impose conditions on the association's decisions. -## § 9. Extraordinary General Assembly (GA) +## § 10. Service fees + +The association provides services to its members who pay a service fee. + +The service fee is defined and determined by the board. + +### § 10.1 Terms of delivery and payment + +The board determines the terms of delivery and payment, such as terms, payment times and refunds. + +The board reserves the right to charge late fees or suspend services in case of lacking payments. + +### § 10.2 Change of service fees and payment terms + +Changes to service fees or payment terms must be announced to the members of the association no later than 30 days before taking effect. + +The addition of services or changes to service configurations are NOT considered changes requiring notice. + +### § 10.3 Disputing changes + +If one or more members disagree with changes in service fees or payment terms, they may file a dispute in writing to the board. + +The dispute must be received by the board no later than 14 days before the change would take effect. + +If the board receives disputes from at least 1/3 of the members of the association, the board must call for an extraordinary GA, at which the change must be presented as a motion to be approved by the GA. + +## § 11. Extraordinary General Assembly (GA) Extraordinary GAs may be called if desired by a majority of the board. Extraordinary GAs may be called if desired by one-third of the members. @@ -104,10 +151,10 @@ Extraordinary GAs are called following the same terms as in §4. The agenda must be substantiated. -## § 10. Accounts +## § 12. Accounts The association's financial year is the calendar year. -## § 11. Dissolution +## § 13. Dissolution Dissolution of the association requires a majority vote of three-quarters of members present at the GA or extraordinary GA. The dissolution must then be approved at a subsequent extraordinary GA. -- 2.43.4 From 19bc81287ff38d3ef9d2d2b7c0cfaba9e451f7bf Mon Sep 17 00:00:00 2001 From: Daniel N Date: Sun, 2 Jun 2024 18:40:21 +0000 Subject: [PATCH 08/15] Update content/rights.en.md --- content/rights.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rights.en.md b/content/rights.en.md index d9b2cc6..93c21a2 100644 --- a/content/rights.en.md +++ b/content/rights.en.md @@ -96,7 +96,7 @@ Mistrust towards one or more administrators must be addressed at an extraordinar Mistrust towards administrators must be reported to the board. The board has the authority to temporarily suspend an administrator's administrative rights until the declaration of mistrust against them is addressed -## § 8. Moderationspolitik +## § 8. Moderation policy The association maintains a moderation policy for its social services, approved by the GA. The moderation policy is enforced by a team of moderators. ### § 8.1 Appointment of moderators -- 2.43.4 From 324a77af35fb9895ec8f0c9e5f478b587eeba420 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sun, 2 Jun 2024 17:34:49 +0200 Subject: [PATCH 09/15] Update rights page (Danish) --- content/rights.da.md | 66 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/content/rights.da.md b/content/rights.da.md index eacd0a7..8fe14b2 100644 --- a/content/rights.da.md +++ b/content/rights.da.md @@ -43,13 +43,15 @@ foreningens hjemmeside og mailinglister. Ordinær generalforsamling afholdes hvert år inden udgangen af september måned. Dagsorden for ordinær generalforsamling skal indeholde følgende punkter: -1. Valg af dirigent og referent. +1. Formalia + 1. Valg af dirigent. + 2. Generalforsamlingens lovlighed (er indkaldelsen sket rettidigt). + 3. Valg af referent. 2. Bestyrelsens beretning. -3. Fremlæggelse af regnskab, budget og kontingent. +3. Fremlæggelse og godkendelse af regnskab, budget og kontingent. 4. Indkomne forslag. -5. Godkendelse af vedtægtsændringer og Acceptable Use Policy -6. Valg (Jf. § 3) -7. Eventuelt +5. Valg (Jf. § 3) +6. Eventuelt ### § 4.1. Afholdelse af generalforsamlinger og bestyrelsesmøder Generalforsamlinger og bestyrelsesmøder kan afholdes på internettet. @@ -77,10 +79,14 @@ Bestyrelsen fastsætter selv sin forretningsorden. Bestyrelsen kan sammensætte samarbejdsgrupper af medlemmer, der kan fungerer som idéudviklingsforum for foreningen. +### § 5.1 Tegningsret + Tegningsret for foreningen har forpersonen og kassereren, dog ved køb, salg eller pantsætning af fast ejendom, indgåelse af driftsaftaler samt ved optagelse af lån, af den samlede bestyrelse. +Den samlede bestyrelse kan meddele prokura til individuelle medlemmer af bestyrelsen. + ## § 6. Medlemskab Som medlem kan enhver fysisk person optages, som har interesse i at støtte foreningens formål. Medlemskab er bindende for et år ad gangen. @@ -108,14 +114,56 @@ på en ekstraordinær generalforsamling. Mistillid til administratorer skal meldes til bestyrelsen. Bestyrelsen kan midlertidigt fratage en administrator vedkommendes administrationsrettigheder, indtil mistillidserklæringen mod vedkommende er behandlet. -## § 8. Kontingent/finansiering +## § 8. Moderationspolitik +Foreningen vedtager en moderationspolitik for foreningens sociale tjenester på generalforsamlingen. Moderationspolitikken håndhæves af et moderatorhold. + +### § 8.1 Udpegning af moderatorer +Bestyrelsen udpeger moderatorer. + +Udpegning af moderatorer skal annonceres til foreningens medlemmer. + +Kun medlemmer af foreningen kan bestride hvervet som moderator. Moderatorer skal så vidt muligt findes udenfor bestyrelsen, dog skal mindst én moderator samtidig være bestyrelsesmedlem. + +### § 8.2 Mistillid til moderatorer +Hvis der er mistillid til en eller flere moderatorer skal dette behandles +på en ekstraordinær generalforsamling. + +Mistillid til moderatorer skal meldes til bestyrelsen. Bestyrelsen kan midlertidigt fratage en moderator vedkommendes moderatorrettigheder, indtil mistillidserklæringen mod vedkommende er behandlet. + +## § 9. Kontingent/finansiering De årlige kontingenter fastsættes af generalforsamlingen. Foreningen kan herudover finansieres ved sponsor- og annoncestøtte samt bidrag fra offentlige/private virksomheder, fonde, øvrige foreninger/institutioner og private personer, så længe det ikke stiller krav til foreningens dispositioner. -## § 9. Ekstraordinær generalforsamling +## § 10. Medlemsydelse + +Foreningen stiller tjenester til rådighed for sine medlemmer mod betaling af medlemsydelse. + +Medlemsydelsen defineres og prissættes af bestyrelsen. + +### § 10.1 Leverings- og betalingsbetingelser + +Bestyrelsen fastsætter leverings- og betalingsbetingelser, såsom betalingsperioder, frister og refusion. + +Bestyrelsen forudsætter sig ret til at pålægge gebyrer eller lukke for tjenester ved udebleven betaling. + +### § 10.2 Ændring af medlemsydelser og betalingsbetingelser + +Ændring af ydelser og betalingsbetingelser skal annonceres til foreningens medlemmer mindst 30 dage inden ændringen træder i kraft. + +Tilføjelser af flere tjenester eller ændringer på konfigurationen af tjenester anses IKKE som ændringer, der kræver varslinger. + +### § 10.3 Indsigelse mod ændringer + +Hvis et eller flere medlemmer er uenige i ændringer af medlemsydelsen eller betalingsbetingelser, kan de indsende en skriftlig indsigelse til bestyrelsen. + +Indsigelsen skal være bestyrelsen i hænde senest 14 dage før ændringen træder i kraft. + +Hvis bestyrelsen modtager indsigelser fra mindst 1/3 af foreningens medlemmer, skal bestyrelsen indkalde til en ekstraordinær generalforsamling, hvor ændringen skal fremsættes som forslag og godkendes af generalforsamlingen. + +## § 11. Ekstraordinær generalforsamling Indkaldelse sker, hvis et flertal af bestyrelsen ønsker det. Indkaldelse sker, hvis 1/3 af medlemmerne ønsker det. @@ -124,10 +172,10 @@ Indkaldelse sker under samme betingelser, som anført i §4. Dagsorden skal motiveres. -## § 10. Regnskab +## § 12. Regnskab Regnskabsåret for Foreningen er kalenderåret. -## § 11. Opløsning +## § 13. Opløsning Opløsning af foreningen kræver et flertal på ¾ af generalforsamlingens eller den ekstraordinære generalforsamlings fremmødte medlemmer. -- 2.43.4 From 44668abc6d23d2066953f6c48e6d61e6ac51e2f7 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sun, 2 Jun 2024 18:26:15 +0200 Subject: [PATCH 10/15] Remove files for GA calls --- content/assembly2024-1.da.md | 32 ---------------------- content/assembly2024-2.da.md | 51 ------------------------------------ 2 files changed, 83 deletions(-) delete mode 100644 content/assembly2024-1.da.md delete mode 100644 content/assembly2024-2.da.md diff --git a/content/assembly2024-1.da.md b/content/assembly2024-1.da.md deleted file mode 100644 index d9ac49d..0000000 --- a/content/assembly2024-1.da.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -title: Ekstraordinær Generalforsamlingen 15. maj 2024 ---- - - - -Bestyrelsen indkalder hermed til en ekstraordinær generalforsamling, hvor vi ønsker at nå til en beslutning vedrørende den moderationspolitik, som det dertil nedsatte udvalg er nået frem til. - -Indkaldelsen til ekstraordinær GF kan måske virke underlig, taget i betragtning at vi har en ordinær generalforsamling blot 2 uger efter. Men vi havde allerede besluttet at tage dette spørgsmål op så hurtigt som muligt. Og vi indser også, at denne vigtige debat næppe får tilstrækkelig tid til en ordinær generalforsamling, og omvendt ville tage uforholdsmæssigt meget tid ved en sådan. - -Dagsorden ser således ud: - -1. Valg af dirigent og referent. -2. Fremlæggelse og diskussion af Moderationspolitik -3. Beslutning om Moderationspolitik - -Mødet finder sted via online videomøde: - -*fjernet fra offentlig indkaldelse* - -## 1. Valg af dirigent og referent - -## 2. Fremlæggelse og diskussion af Moderationspolitik - -Forslaget til en Moderationspolitik kan læses her: https://git.data.coop/data.coop/dokumenter/pulls/28 - -## 3. Beslutning om Moderationspolitik - -Evt. ændringsforslag behandles først. - -Herefter går vi til afstemning. - diff --git a/content/assembly2024-2.da.md b/content/assembly2024-2.da.md deleted file mode 100644 index 8aaa43a..0000000 --- a/content/assembly2024-2.da.md +++ /dev/null @@ -1,51 +0,0 @@ ---- -title: Indkaldelse til generalforsamling i data.coop, lørdag d. 1. juni 2024, kl. 13:00 ---- - -Kære data.coop medlem. - -Hermed indkaldes til ordinær 2024 generalforsamling for foreningen data.coop lørdag den 1. juni 2024 kl. 13:00. - -Generalforsamlingen vil blive afholdt online. Der bliver udsendt et link til det præcise sted i dagene op til. - -Man kan finde vedtægter samt tidligere referater her:
- - -Regnskab, budget og andre relevante dokumenter for generalforsamlingen kan findes på:
- - -Hvis man har forslag til vedtægtsændringer må de meget gerne indsendes som "[Pull Request](https://git.data.coop/data.coop/dokumenter/pulls)" i Forgejo - spørg gerne om hjælp på [Matrix-kanalen](https://matrix.to/#/#data.coop:data.coop) eller på mail til forpersonen, Vidir, på . Husk at indsende senest syv dage før GF, så de er modtaget senest 24 maj 2024 kl 23:59. - -## Dagsorden - -1) Valg af dirigent og referent. -2) Bestyrelsens beretning. -3) Fremlæggelse af regnskab, budget og kontingent. -4) Indkomne forslag. - - - Forslag om vedtægtsændring: Separat afsnit for Tegningsret + ny regel for prokura: - - Forslag om vedtægtsændring: Specificering af formalia i dagsordenen: - - Omformuler fra specifikke kanaler til noget mere generelt: - - Smårettelser til Moderationspolitik: - - **BEMÆRK! Forslag stillet via Pull Requests kan rettes frem til syv dage før generalforsamlingen jf. vedtægterne.** - -5) Godkendelse af vedtægtsændringer og [Acceptable Use Policy](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md) inklusive eventuelle vedtagede forslag til denne. -6) Valg jf. §3 i vedtægterne. - Den nuværende bestyrelse består af: - - Bestyrelsesmedlemmer: - - Balder - - Halfdan - - Mikkel - - Reynir (på valg) - - Vidir (på valg) - - Suppleanter (på valg): - - Sam - - Sune -7) Eventuelt. - -Det var alt! Hvis du har spørgsmål, så skriv gerne til . - -Med venlig hilsen
-Bestyrelsen - -- 2.43.4 From 23adc3214ac1d8166c98ed30a659cf78338859fb Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Thu, 13 Jun 2024 12:27:23 +0200 Subject: [PATCH 11/15] Opdaterede oplysninger om medlemskab --- content/membership.da.md | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/content/membership.da.md b/content/membership.da.md index a047ca7..a95391d 100644 --- a/content/membership.da.md +++ b/content/membership.da.md @@ -8,14 +8,27 @@ generalforsamling. Du bør læse vores [vedtægter]({{< ref "/rights.md" >}}) og især vores [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md) inden du melder dig ind. Har du spørgsmål, kan du finde os på [Matrix og IRC]({{< ref "/about.md" >}}) eller [sende en e-mail til bestyrelsen](mailto:board@data.coop). +## Medlemspris + +Vores kontingentår løber fra og med 1. juli til og med 30. juni. + +Medlemskab består af et kontingent til foreningen, samt en medlemsydelse for brug af tjenesterne. Betalinger følger det kontingentåret. Dvs. medlemskab er fortløbende fra betaling af kontingent frem til overstået ordinær generalforsamling. Medlemsydelsen er ligeledes 1 år forudbetalt og følger også kontingentåret, dog i indmeldelsesåret er kun indregnet tilbageværende måneder til og med juni. + +* Almindeligt medlem: **600 kr / år** + * Heraf 150 kr kontingent + * ...og 450 kr medlemsydelse (inkl. moms) +* Nedsat kontingent: **100 kr / år** + * Heraf 50 kr kontingent + * ...og 50 kr medlemsydelse (inkl. moms) + + +## Sådan melder du dig ind + +En betalingsløsning er under udvikling. + Du bliver medlem ved at overføre penge til vores konto og sende en email til vores kasserer, [benjaoming@data.coop](mailto:benjaoming@data.coop), med dit navn. * Reg. 5444 (Arbejdernes Landsbank) * Kontonr. 0510901 * Tekst på overførslen: Fornavn+efternavn - -Årligt kontingent: **300 kr** (dog gerne mere)\ -Nedsat kontingent for studerende/arbejdsløse: **50 kr** - -Kontingent-perioden gælder for det foreningsår, man melder sig ind i. Dvs. medlemskab er fortløbende fra betaling af kontingent frem til overstået ordinær generalforsamling. -- 2.43.4 From 5ab14dea000b9881b65315bca0532dacf4b9f467 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Thu, 15 Aug 2024 16:43:41 +0200 Subject: [PATCH 12/15] Add some English translation and update the process --- content/membership.da.md | 11 ++++++----- content/membership.en.md | 32 ++++++++++++++++++++++---------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/content/membership.da.md b/content/membership.da.md index a95391d..af4b7da 100644 --- a/content/membership.da.md +++ b/content/membership.da.md @@ -26,9 +26,10 @@ Medlemskab består af et kontingent til foreningen, samt en medlemsydelse for br En betalingsløsning er under udvikling. -Du bliver medlem ved at overføre penge til vores konto og sende en email til -vores kasserer, [benjaoming@data.coop](mailto:benjaoming@data.coop), med dit navn. +Du melder dig ind ved at skrive til kasserer@data.coop med følgende information: - * Reg. 5444 (Arbejdernes Landsbank) - * Kontonr. 0510901 - * Tekst på overførslen: Fornavn+efternavn +* At du har læst og er enig i vores [vedtægter]({{< ref "/rights.md" >}}) og [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md). +* Ønsket primært brugernavn +* Ønsket email-adresse + +Herefter kan vi sende dig en invitation og et betalingslink. diff --git a/content/membership.en.md b/content/membership.en.md index 2c89134..7caefd4 100644 --- a/content/membership.en.md +++ b/content/membership.en.md @@ -16,17 +16,29 @@ Many parts of this organization are already in English, but our legal documents are not (yet). Please write us if you have any questions. -You become a member by paying the annual membership fee to our account *and* sending an email -to our treasurer [benjaoming@data.coop](mailto:benjaoming@data.coop), containing your name. +## Price -Currently, the only option is to wire a bank payment to our Danish bank account: +Our membership period runs from one general assembly to the next => July 1st until June 30th. -* Reg. 5444 (Arbejdernes Landsbank) -* Kontonr. 0510901 -* Text: First name + last name +A membership is comprised of a contingent to the association and a service fee. Payments follow the membership period. -Annual membership: **DKK 300** (or more)\ -Reduced annual membership (students/unemployed): **DKK 50** +* Ordinary membershio: **600 kr / år** + * ...of which 150 kr is contingent + * ...and 450 kr are service fee (incl. VAT) +* Reduced membership: **100 kr / år** + * ...of which 50 kr is contingent + * ...and 50 kr is service fee (incl. VAT) -The membership period counts from *association year* that you sign up in. -That means that a membership is valid from when it's paid and until and including the next general assembly. +A reduced membership is offered to students and unemployed members. + +## How to become a member + +We are developing a sign-up form. + +Currently, you sign up by writing kasserer@data.coop with the following info: + +* That you have read and agree to our [statutes]({{< ref "/rights.md" >}}) and [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md). +* A desired primary username +* The email address to connect to your account + +After this, we can send you an invite and payment link. -- 2.43.4 From 6427e4b770ab7bb46649350024cdfb0996259962 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Thu, 22 Aug 2024 21:57:23 +0200 Subject: [PATCH 13/15] Add "reduced membership" note to Danish version --- content/membership.da.md | 1 + content/membership.en.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/content/membership.da.md b/content/membership.da.md index af4b7da..2429654 100644 --- a/content/membership.da.md +++ b/content/membership.da.md @@ -21,6 +21,7 @@ Medlemskab består af et kontingent til foreningen, samt en medlemsydelse for br * Heraf 50 kr kontingent * ...og 50 kr medlemsydelse (inkl. moms) +Nedsat kontingent tilbydes til studerende og arbejdsløse. ## Sådan melder du dig ind diff --git a/content/membership.en.md b/content/membership.en.md index 7caefd4..4bafd5c 100644 --- a/content/membership.en.md +++ b/content/membership.en.md @@ -29,7 +29,7 @@ A membership is comprised of a contingent to the association and a service fee. * ...of which 50 kr is contingent * ...and 50 kr is service fee (incl. VAT) -A reduced membership is offered to students and unemployed members. +The reduced membership is offered to students and unemployed members. ## How to become a member -- 2.43.4 From 9c0de66d7e3fdc44a6f61c61fcd367a5900335e6 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sun, 20 Oct 2024 17:05:49 +0200 Subject: [PATCH 14/15] Use maintained Hugo image for CI + add devcontainer config --- .devcontainer/Dockerfile | 56 +++++++++++++++++++++++++++++++++ .devcontainer/devcontainer.json | 51 ++++++++++++++++++++++++++++++ .drone.yml | 8 ++--- 3 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..9704b97 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,56 @@ +# syntax=docker/dockerfile:1 +FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04 + +ARG USER=vscode +ARG DEBIAN_FRONTEND=noninteractive +RUN usermod -s /usr/bin/zsh ${USER} + +# VARIANT can be either 'hugo' for the standard version or 'hugo_extended' for the extended version. +ARG VARIANT=hugo_extended +# VERSION can be either 'latest' or a specific version number +ARG VERSION=latest + +# Download Hugo +RUN case ${VERSION} in \ + latest) \ + export VERSION=$(curl -s https://api.github.com/repos/gohugoio/hugo/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}') ;;\ + esac && \ + echo ${VERSION} && \ + case $(uname -m) in \ + aarch64) \ + export ARCH=ARM64 ;; \ + *) \ + export ARCH=64bit ;; \ + esac && \ + echo ${ARCH} && \ + wget -O ${VERSION}.tar.gz https://github.com/gohugoio/hugo/releases/download/v${VERSION}/${VARIANT}_${VERSION}_Linux-${ARCH}.tar.gz && \ + tar xf ${VERSION}.tar.gz && \ + mv hugo /usr/bin/hugo + +# Hugo dev server port +EXPOSE 1313 + + +USER ${USER} +ARG HOME=/home/${USER} +WORKDIR ${HOME} + +ARG PNPM_HOME=${HOME}/.local/share/pnpm +ENV PATH="${PNPM_HOME}:$PATH" +RUN <> .zshrc +# EOT + +RUN < ${OHMYZSH_HOME}/plugins/git/_hugo +EOT diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..fba096d --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,51 @@ +{ + "name": "Hugo & pnpm", + + "build": { + "dockerfile": "Dockerfile" + }, + + // 👇 Features to add to the Dev Container. More info: https://containers.dev/implementors/features. + // "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, + + // 👇 Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + "html.format.templating": true + }, + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + // https://marketplace.visualstudio.com/items?itemName=eliostruyf.vscode-front-matter + "eliostruyf.vscode-front-matter", + // https://marketplace.visualstudio.com/items?itemName=rusnasonov.vscode-hugo + "rusnasonov.vscode-hugo", + // https://marketplace.visualstudio.com/items?itemName=budparr.language-hugo-vscode + "budparr.language-hugo-vscode", + // https://marketplace.visualstudio.com/items?itemName=eliostruyf.vscode-hugo-themer + "eliostruyf.vscode-hugo-themer", + // https://marketplace.visualstudio.com/items?itemName=kaellarkin.hugo-shortcode-syntax + "kaellarkin.hugo-shortcode-syntax", + + // "csstools.postcss", + + // "esbenp.prettier-vscode", + // "tamasfe.even-better-toml", + // "naumovs.color-highlight", + // "GitHub.vscode-pull-request-github", + // "eamodio.gitlens", + "davidanson.vscode-markdownlint", + "streetsidesoftware.code-spell-checker" + ] + } + }, + + "remoteUser": "vscode", + + "postCreateCommand": "pnpm install-completion zsh" +} diff --git a/.drone.yml b/.drone.yml index 9c434fd..ea2a906 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,8 @@ name: default steps: # stable site - name: build_stable - image: klakegg/hugo:ext-alpine-ci + image: floryn90/hugo:ext-alpine-ci + user: root environment: HUGO_SECURITY_HTTP_URLS: none commands: @@ -15,7 +16,8 @@ steps: # staging site - name: build_staging - image: klakegg/hugo:ext-alpine-ci + image: floryn90/hugo:ext-alpine-ci + user: root environment: HUGO_SECURITY_HTTP_URLS: none commands: @@ -78,5 +80,3 @@ steps: # `${DRONE_REPO}` build #${DRONE_BUILD_NUMBER} status: **${DRONE_BUILD_STATUS}** # # ${DRONE_PULL_REQUEST_TITLE}](${DRONE_COMMIT_LINK}) - -# provoke build \ No newline at end of file -- 2.43.4 From 8f6ff15ff56b49244a47a12dbfc16dfe2a3513b9 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sun, 20 Oct 2024 17:13:01 +0200 Subject: [PATCH 15/15] Fix docker-compose.yml [skip CI] --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 77b6030..f0a53f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: server: - image: klakegg/hugo:ext-alpine + image: floryn90/hugo:ext-alpine command: server volumes: - ".:/src" -- 2.43.4