Compare commits

...

23 commits

Author SHA1 Message Date
decibyte 25e8362f6c Fix missing logo
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2022-11-09 13:01:38 +00:00
Mikkel Munch Mortensen 2491470166 Add logo for Mastodon
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2022-11-09 12:19:15 +01:00
Mikkel Munch Mortensen bcd4e8d6c3 Update the service list
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
* Add a note about how to get access as a member.
 * Add Mastodon as a members-only service.
2022-11-09 09:51:32 +01:00
benjaoming ee6d31deae Alt for tungt (#36)
All checks were successful
continuous-integration/drone/push Build is passing
😭
Co-authored-by: benjaoming <benjamin@overtag.dk>
Co-committed-by: benjaoming <benjamin@overtag.dk>
2022-10-16 06:12:27 +00:00
Jesper Hess ffbcefcef4
Remove reference to Keybase team 2022-01-13 08:26:14 +01:00
benjaoming cb08d2bfca Merge pull request 'Add precision for membership period in accordance with statutes' (#34) from medlemsperiode into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #34
2021-12-09 13:03:08 +00:00
benjaoming 1ce10e0026 Add precision for membership period in accordance with statutes
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-12-08 11:58:40 +00:00
Reynir Björnsson 536b260a7e Ingen arrangementer
All checks were successful
continuous-integration/drone/push Build is passing
2021-09-15 15:53:49 +02:00
benjaoming 57139dfda2 Merge pull request 'Skift Freenode ud med Libera.chat samt tilføje link til vores Matrixrum' (#33) from freenode->libera.chat into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #33
2021-05-28 15:03:24 +00:00
Jesper Hess 989ff0366e
Skift Freenode ud med Libera.chat samt tilføje link til vores Matrixrum
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-05-27 10:36:17 +02:00
Reynir Björnsson 745cb3c472 Fix gf2021 årstal
All checks were successful
continuous-integration/drone/push Build is passing
2021-03-10 18:54:04 +01:00
reynir 8a883a7ca4 Indkald til generalforsamling 2021 (#25)
All checks were successful
continuous-integration/drone/push Build is passing
Redirect to dokumenter repo directory for /gf2021. Remove gf2020 page. Change link on index.

Co-authored-by: Víðir Valberg Guðmundsson <valberg@orn.li>
Reviewed-on: #25
2021-03-10 17:44:50 +00:00
reynir e1b2c9acd6 Tilføj link til vedtægter og AUP i blivmedlem (#22)
All checks were successful
continuous-integration/drone/push Build is passing
Tilføj link til renderede vedtægter og AUP

Co-authored-by: Thomas Jespersen <t@laumann.xyz>
Co-authored-by: Reynir Björnsson <reynir@reynir.dk>
Reviewed-on: #22
2021-01-15 13:31:10 +00:00
reynir d57322a070 Merge pull request 'Tilføj note om gf2020 password' (#21) from gf2020 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #21
2020-12-10 19:45:24 +00:00
Reynir Björnsson a477a94974 Tilføj note om gf2020 password
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-12-10 11:28:38 +01:00
benjaoming 8fbd8eb418 Merge pull request 'Indkaldelse til generalforsamling 2020' (#18) from gf2020 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #18
2020-12-08 19:26:41 +00:00
Reynir Björnsson e8d8d677ab Remove redundant title
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
Co-authored-by: Jesper Hess <jesper@graffen.dk>
2020-12-08 17:19:35 +01:00
Reynir Björnsson 5db1a70c49 General assembly is members only
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-12-08 17:09:51 +01:00
Reynir Björnsson ae75944a3d Update meeting time, add jitsi link
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-12-08 17:05:33 +01:00
Reynir Björnsson cc6a1789ec
New pages go into _pages I guess
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-12-05 16:40:29 +01:00
Reynir Björnsson 042ad55563
Indkaldelse til generalforsamling 2020 2020-12-05 16:40:28 +01:00
Jesper Hess c1bee81e11 Merge pull request 'Add pull request condition to drone config' (#20) from fix-drone into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #20
2020-12-05 15:31:40 +00:00
Jesper Hess 5bda28be42
Tweaking drone config to better support PRs
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-12-05 16:22:33 +01:00
9 changed files with 122 additions and 21 deletions

View file

@ -24,6 +24,9 @@ steps:
when:
branch:
- master
event:
exclude:
- pull_request
- name: notify
image: plugins/matrix
@ -34,3 +37,4 @@ steps:
from_secret: matrix_username
password:
from_secret: matrix_password

View file

@ -19,4 +19,8 @@ vores kasserer, [benjaoming@data.coop](mailto:benjaoming@data.coop), med dit nav
Årligt kontingent: **300 kr** (dog gerne mere)<br>
(nedsat kontingent er 50 kr. for studerende/arbejdsløse)
Kontingent-perioden gælder for det år, man melder sig ind i.
Kontingent-perioden gælder for det foreningsår, man melder sig ind i. Medlemskab er
fortløbende fra betaling af kontingent frem til overstået ordinær generalforsamling.
Vedtægter og Acceptable Usage Policy, og deres versionshistorik, kan læses i vores [git repository](https://git.data.coop/data.coop/dokumenter).
Læs her vores [vedtægter](https://git.data.coop/data.coop/dokumenter/src/branch/master/Vedtaegter.md) og [AUP](https://git.data.coop/data.coop/dokumenter/src/branch/master/Acceptable%20Usage%20Policy.md).

13
_pages/gf2021.md Normal file
View file

@ -0,0 +1,13 @@
---
layout: page
title: Generalforsamling 2021
permalink: /gf2021/
---
<meta http-equiv="Refresh" content="0; url='https://git.data.coop/data.coop/dokumenter/src/branch/master/generalforsamlinger/2021'" />
# Du bliver nu viderestillet til siden med dokumenter for generalforsamling 2021.
Hvis der ikke sker noget kan du trykke på følgende link:
<a href="https://git.data.coop/data.coop/dokumenter/src/branch/master/generalforsamlinger/2021">https://git.data.coop/data.coop/dokumenter/src/branch/master/generalforsamlinger/2021</a>

View file

@ -26,6 +26,6 @@ og afprøver nogle prototyper til den fremtidige hosting og infrastruktur.
Du kan finde os på:
* Freenode IRC, **#data.coop**.
* Keybase, **datacoop**
* Matrix: **[#data.coop:data.coop](https://matrix.to/#/#data.coop:data.coop)**
* IRC (Libera.chat): **#data.coop**.
* Vores [Gitea server](https://git.data.coop/data.coop/)

View file

@ -15,16 +15,19 @@ en uddybning af [hvad de forskellige badges dækker over](/tjenester/badges/).
## Tjenester der kun er for vores medlemmer
<h3 class="service nextcloud"><a href="https://cloud.data.coop/">Nextcloud</a> filer, kalender, adressebog</h3>
Er du medlem og vil have adgang til en tjeneste? Så kontakt en fra bestyrelsen.
Enten via <a href="/om/">en af vores chatkanaler</a> eller <a href="mailto:board@data.coop">e-mail</a>.
<h3 class="service mastodon"><a href="https://social.data.coop/">Mastodon</a> micro-blogging, socialt network</h3>
<section class="service-details">
<p>Gem dine filer, din kalender og dine kontakter i skyen og tilgå alt fra alle dine enheder.</p>
<p>Del kattebilleder og memes og følg med i hvad andre spændende mennesker foretager sig.</p>
<h4>Badges</h4>
<ul class="badges">
<li>
<span class="badge badge-negative badge-stable">Negativ:</span>
<span class="badge badge-positive badge-stable">Positiv:</span>
<a href="/tjenester/badges/#stabilitet">
Tjenesten er <em>ikke</em> stabil endnu
Tjenesten er stabil
</a>
</li>
<li>
@ -46,9 +49,65 @@ en uddybning af [hvad de forskellige badges dækker over](/tjenester/badges/).
</a>
</li>
<li>
<span class="badge badge-negative badge-backup">Negativ:</span>
<span class="badge badge-positive badge-backup">Positiv:</span>
<a href="/tjenester/badges/#backup">
<em>Ingen</em> backup af data
Der er backup af data
</a>
</li>
<li>
<span class="badge badge-negative badge-logging">Negativ:</span>
<a href="/tjenester/badges/#logning">
Der foretages logning
</a>
</li>
<li>
<span class="badge badge-partial badge-anonymous-access">Delvis:</span>
<a href="/tjenester/badges/#anonym-adgang">
Delvis anonym adgang
</a>[1]
</li>
</ul>
<p class="badge-notes">
[1] Offentlig aktivitet på tjenesten kan tilgås af alle, uden at være logget ind.
Det kræver en konto at dele sine egne ting på Mastodon.
</p>
</section>
<h3 class="service nextcloud"><a href="https://cloud.data.coop/">Nextcloud</a> filer, kalender, adressebog</h3>
<section class="service-details">
<p>Gem dine filer, din kalender og dine kontakter i skyen og tilgå alt fra alle dine enheder.</p>
<h4>Badges</h4>
<ul class="badges">
<li>
<span class="badge badge-positive badge-stable">Positiv:</span>
<a href="/tjenester/badges/#stabilitet">
Tjenesten er stabil
</a>
</li>
<li>
<span class="badge badge-positive badge-secure-connection">Positiv:</span>
<a href="/tjenester/badges/#sikker-forbindelse">
Sikker forbindelse
</a>
</li>
<li>
<span class="badge badge-negative badge-encrypted-data-storage">Negativ:</span>
<a href="/tjenester/badges/#krypteret-opbevaring-af-data">
Data opbevares <em>ikke</em> krypteret
</a>
</li>
<li>
<span class="badge badge-negative badge-zero-knowledge">Negativ:</span>
<a href="/tjenester/badges/#zero-knowledge">
<em>Ikke</em> omfattet af zero knowledge
</a>
</li>
<li>
<span class="badge badge-positive badge-backup">Positiv:</span>
<a href="/tjenester/badges/#backup">
Der er backup af data
</a>
</li>
<li>
@ -90,9 +149,9 @@ en uddybning af [hvad de forskellige badges dækker over](/tjenester/badges/).
<h4>Badges</h4>
<ul class="badges">
<li>
<span class="badge badge-negative badge-stable">Negativ:</span>
<span class="badge badge-positive badge-stable">Positiv:</span>
<a href="/tjenester/badges/#stabilitet">
Tjenesten er <em>ikke</em> stabil endnu
Tjenesten er stabil
</a>
</li>
<li>
@ -114,9 +173,9 @@ en uddybning af [hvad de forskellige badges dækker over](/tjenester/badges/).
</a>
</li>
<li>
<span class="badge badge-negative badge-backup">Negativ:</span>
<span class="badge badge-positive badge-backup">Positiv:</span>
<a href="/tjenester/badges/#backup">
<em>Ingen</em> backup af data
Der er backup af data
</a>
</li>
<li>
@ -146,9 +205,9 @@ en uddybning af [hvad de forskellige badges dækker over](/tjenester/badges/).
<h4>Badges</h4>
<ul class="badges">
<li>
<span class="badge badge-negative badge-stable">Negativ:</span>
<span class="badge badge-positive badge-stable">Positiv:</span>
<a href="/tjenester/badges/#stabilitet">
Tjenesten er <em>ikke</em> stabil endnu
Tjenesten er Stabil
</a>
</li>
<li>
@ -170,9 +229,9 @@ en uddybning af [hvad de forskellige badges dækker over](/tjenester/badges/).
</a>[1]
</li>
<li>
<span class="badge badge-negative badge-backup">Negativ:</span>
<span class="badge badge-positive badge-backup">Positiv:</span>
<a href="/tjenester/badges/#backup">
<em>Ingen</em> backup af data
Der er backup af data
</a>
</li>
<li>

View file

@ -81,6 +81,10 @@
background-repeat: no-repeat;
}
.service.mastodon {
background-image: url(/images/logos/mastodon.png);
}
.service.nextcloud {
background-image: url(/images/logos/nextcloud.png);
}

View file

@ -1,3 +1,4 @@
services:
jekyll:
image: jekyll/jekyll
command: jekyll serve --livereload --livereload-port 35729

BIN
images/logos/mastodon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -1,6 +1,22 @@
---
layout: page
---
<div style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; background: #000" id="why">
<div style="margin: auto; padding: 50px; font-size: 28px; color: #ddd; text-align: center;">
<p><strong>🌈 I mindet om Graffen 💖</strong></p>
<p>Kæreste Jesper, data.coop fortsætter i dit minde og i din ære. Du har forladt os alt for tidligt, men du har givet os mere end nogen anden. Vi kunne blot ønske os at du var blevet noget længere. Du har været vores helt, nu er du vores legende.</p>
<p>Tak for alt.</p>
<p>
<a href="#" onclick="document.getElementById('why').style.display='none';" style="color: #fff; text-decoration: underline; font-size: 18px;">til vores forside »</a>
</p>
</div>
</div>
# Velkommen til data.coop
Vi er en forening som har formålet, at passe på medlemmernes data. Vores kerneprincipper er
@ -18,5 +34,5 @@ Foreningen arbejder nu på, at få gang i aktiviteterne. Inden længe vil du her
hvad du kan få ud af et medlemsskab samt detaljer om, hvordan du kan melde dig ind og være med til at opbygge noget fedt.
| Næste arrangement | Bliv medlem |
|---------------------------------------------------------------------------------------------------------|-----------------------------------------------------|
| Vi har umiddelbart ikke nogen arbejdsdag, men find os til næste [Cryptohagen](https://cryptohagen.dk/). | Vi har brug for medlemmer. [Læs mere her](/medlem). |
|---------------------|-----------------------------------------------------|
| Intet planlagt. | Vi har brug for medlemmer. [Læs mere her](/medlem). |