Commit graph

314 commits

Author SHA1 Message Date
benjaoming
d03d9fef68 Merge pull request 'staging => main' (#131) from staging into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/131
2024-09-05 17:39:45 +00:00
benjaoming
56612b28fb Merge pull request 'Opdaterede oplysninger om medlemskab' (#130) from benjaoming/website:nyt-kontingent-etc into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/130
2024-09-05 17:36:55 +00:00
benjaoming
2fa1832041 Merge branch 'staging' into nyt-kontingent-etc 2024-09-05 17:35:37 +00:00
Benjamin Bach
6427e4b770
Add "reduced membership" note to Danish version 2024-08-22 21:57:23 +02:00
Benjamin Bach
5ab14dea00
Add some English translation and update the process 2024-08-15 16:43:41 +02:00
Benjamin Bach
23adc3214a
Opdaterede oplysninger om medlemskab 2024-06-13 12:27:23 +02:00
Sam Al-Sapti
560b05522a
Merge branch 'main' into staging 2024-06-06 19:59:02 +02:00
Sam Al-Sapti
44668abc6d Remove files for GA calls 2024-06-06 17:55:14 +00:00
Sam Al-Sapti
324a77af35 Update rights page (Danish) 2024-06-06 17:55:14 +00:00
Daniel N
19bc81287f Update content/rights.en.md 2024-06-06 17:55:14 +00:00
Daniel N
3644523cf0 Update rights page (en) 2024-06-06 17:55:14 +00:00
Sam A
948fb1bf66 Merge branch 'main' into staging 2024-06-06 17:54:42 +00:00
benjaoming
a255bc06d6 Merge pull request 'Update rights page (Danish) after ordinary GA' (#127) from update-rights into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/127
Reviewed-by: benjaoming <benjaoming@data.coop>
2024-06-03 08:56:21 +00:00
benjaoming
7020e342af Merge pull request 'Update rights page (en)' (#128) from daniel/dc-website:rights-en into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/128
Reviewed-by: benjaoming <benjaoming@data.coop>
2024-06-03 08:55:39 +00:00
Daniel N
52a42938db Update content/rights.en.md 2024-06-02 18:40:21 +00:00
Daniel N
1a61003ef7 Update rights page (en) 2024-06-02 18:12:51 +00:00
Sam Al-Sapti
1ae0988d2c
Remove files for GA calls 2024-06-02 18:26:15 +02:00
Sam Al-Sapti
5e284532a2
Update rights page (Danish) 2024-06-02 17:37:15 +02:00
valberg
9c57c309e2 Pull staging into main (#126)
Reviewed-on: https://git.data.coop/data.coop/website/pulls/126
2024-06-01 19:14:00 +00:00
valberg
df10ca4ec5 Merge pull request 'Remove call for general assembly' (#125) from remove-call-for-general-assembly into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/125
2024-06-01 19:13:00 +00:00
valberg
e096bcec9c Update content/_index.en.md 2024-06-01 19:09:06 +00:00
valberg
a0e5a4d2f1 Remove call for general assembly 2024-06-01 19:08:20 +00:00
benjaoming
84c1194df6 Merge pull request 'staging => main' (#124) from staging into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/124
2024-05-18 19:59:40 +00:00
benjaoming
dbddff9b6f Merge branch 'main' into staging 2024-05-18 19:57:10 +00:00
benjaoming
573c71db16 Merge pull request 'Call for ordinary assembly 2024' (#123) from benjaoming/website:indkaldelse-gf2024 into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/123
2024-05-18 19:47:29 +00:00
Benjamin Bach
d25e971def
Call for ordinary assembly 2024 2024-05-18 21:13:51 +02:00
valberg
e1657ec054 Merge pull request 'staging' (#122) from staging into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/122
Reviewed-by: valberg <valberg@orn.li>
2024-05-01 17:52:16 +00:00
benjaoming
b239cf3ed8 Merge pull request 'Wrong link :(' (#121) from indkaldelse into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/121
2024-05-01 17:50:25 +00:00
Benjamin Bach
fa55a258cc
Wrong link :( 2024-05-01 19:50:01 +02:00
valberg
35d2419cac Update .drone.yml 2024-05-01 17:32:31 +00:00
benjaoming
ea17521fda Merge pull request 'staging into main' (#119) from staging into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/119
2024-05-01 17:17:32 +00:00
valberg
d9637f084c Merge branch 'main' into staging 2024-05-01 17:14:08 +00:00
valberg
c413779a4c Merge pull request 'Indkaldelse ekstraordinær GF 15. maj' (#118) from indkaldelse into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/118
Reviewed-by: valberg <valberg@orn.li>
2024-05-01 17:12:34 +00:00
Benjamin Bach
84a7870c40
General assembly call 2024-05-01 19:08:50 +02:00
benjaoming
be42e72234 Merge pull request 'staging => main' (#116) from staging into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/116
2024-03-25 22:42:43 +00:00
benjaoming
1b047ab7e1 Merge pull request 'Update account numbers' (#115) from benjaoming/website:new-account into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/115
2024-03-25 22:41:35 +00:00
Benjamin Bach
9f3594f867
Update account numbers 2024-03-25 23:31:10 +01:00
Sam A
14fd8ef231 Merge pull request 'Old "main" into "staging"' (#113) from main into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/113
Reviewed-by: Sam A. <samsapti@noreply@git.data.coop>
2024-02-29 19:36:05 +00:00
benjaoming
91e1f0ac19 Merge pull request 'First draft, english translation' (#112) from daniel/data.coop-website:Statutes-translation into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/112
Reviewed-by: benjaoming <benjamin@overtag.dk>
2024-02-28 16:08:07 +00:00
benjaoming
d6df8b1ef4 Fixing some grammar stuff 2024-02-28 16:03:06 +00:00
Daniel N
e2569e1e2e First draft, english translation 2024-01-14 13:08:36 +00:00
Sam Al-Sapti
888ddf8465
Revert baseURL 2023-12-22 20:19:49 +01:00
Sam Al-Sapti
69d2c5b671
Fix baseURL for staging 2023-12-17 21:39:16 +01:00
benjaoming
dcc5a231b4 Merge pull request 'main into staging' (#110) from main into staging
Reviewed-on: https://git.data.coop/data.coop/website/pulls/110
2023-12-17 20:28:49 +00:00
benjaoming
6fed406c31 Merge pull request 'Comment out Matrix plugin, it randomly hangs forever' (#109) from benjaoming/website:rm-matrix-notification into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/109
2023-12-16 23:14:11 +00:00
Benjamin Bach
268a576b3b
Comment out Matrix plugin, it randomly hangs forever 2023-12-17 00:12:33 +01:00
benjaoming
509b750f0f Merge pull request 'Oops languages were swapped :)' (#108) from benjaoming/website:fix-language into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/108
2023-12-16 22:58:48 +00:00
Benjamin Bach
2d6463444d
Description in English 2023-12-16 23:54:40 +01:00
Benjamin Bach
faeb00cffb
Oops languages were swapped :) 2023-12-16 23:52:38 +01:00
benjaoming
23d103122c Merge pull request 'Link preview image #105 - but will it build?' (#106) from some-card into main
Reviewed-on: https://git.data.coop/data.coop/website/pulls/106
2023-12-16 22:32:21 +00:00