cccb-website-team/www
1
1
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: cccb-website-team:staging
Branches Tags
cccb-website-team:staging
cccb-website-team:production
..
compare: cccb-website-team:production
Branches Tags
cccb-website-team:staging
cccb-website-team:production

86 commits
staging ... production

Author SHA1 Message Date
vinzenz
2e67aa9d98 Merge pull request 'staging -> production' (#6) from staging into production 
Reviewed-on: #6
 2025-06-07 22:44:34 +02:00
murmeldin
85ce394379 Merge branch 'staging' into production 2025-06-05 20:53:32 +02:00
murmeldin
4ce69f8ec4 Merge branch 'staging' into production 2025-04-22 23:03:00 +02:00
murmeldin
bc8c3ce2cd Merge branch 'staging' into production 2025-04-17 00:52:19 +02:00
murmeldin
8745fcccd0 Merge branch 'staging' into production 2025-04-17 00:49:37 +02:00
murmeldin
44c0c5b274 Merge branch 'staging' into production 2025-04-16 18:50:32 +02:00
murmeldin
a36344f76e Merge branch 'staging' into production 2025-04-16 18:38:44 +02:00
murmeldin
bb80f1f08a Merge branch 'staging' into production 2025-04-05 11:43:22 +02:00
Marek Krug
21fd13391e rm twitter 2025-04-03 22:36:53 +02:00
Marek Krug
20e5d932ac Merge branch 'staging' into production 2025-04-03 21:13:34 +02:00
Marek Krug
8a42843e13 Merge branch 'staging' into production 2025-04-02 14:16:59 +02:00
Marek Krug
07b97ed70e Merge branch 'staging' into production 2025-03-31 20:17:25 +02:00
Marek Krug
f9ba56e5b2 Merge branch 'staging' into production 2025-03-31 13:49:47 +02:00
Marek Krug
fafb8e0542 Merge branch 'staging' into production 2025-03-29 13:19:56 +01:00
Marek Krug
8b4df2ce61 Merge branch 'staging' into production 2025-03-26 00:04:09 +01:00
Marek Krug
b2928a6c11 Merge branch 'staging' into production 2025-03-17 17:21:17 +01:00
Marek Krug
79baa813f9 Merge branch 'staging' into production 2025-03-12 17:41:59 +01:00
Marek Krug
238fdab51c fixed wrong merge 2025-03-12 16:24:02 +01:00
Marek Krug
c9da3c1c54 Merge branch 'staging' into production 2025-03-12 16:08:16 +01:00
Marek Krug
2514f8a15e Merge branch 'staging' into production 2025-03-12 00:01:01 +01:00
Marek Krug
1f048a1dd5 Merge remote-tracking branch 'refs/remotes/forgejo-cccb/production' into production 2025-03-10 04:39:20 +01:00
Marek Krug
a63680661e Merge branch 'staging' into production 2025-03-10 04:38:44 +01:00
murmeldin
bc7255541f Merge pull request 'tdoh updates' (#2) from staging into production 
Reviewed-on: #2
 2025-03-03 08:34:16 +01:00
murmeldin
00b449646c Merge pull request 'staging -> production' (#1) from staging into production 
Reviewed-on: #1
 2025-03-02 18:27:43 +01:00
Marek Krug
9a92b873da Merge branch 'staging' into production 2025-03-02 00:51:18 +01:00
Marek Krug
84cdd23a39 modify amateurfunk schedule on website and use new theme settings 2025-01-08 13:07:59 +01:00
Marek Krug
8baed04842 modified amateurfunk to not advertize open club on tuesdays 2025-01-08 12:53:32 +01:00
erdgeist
71348c56db Add streaming URL 2024-10-17 00:10:31 +02:00
dependabot[bot]
1a3736fb5c gh-action: bump peaceiris/actions-hugo from 2 to 3 
Bumps [peaceiris/actions-hugo](https://github.com/peaceiris/actions-hugo) from 2 to 3.
- [Release notes](https://github.com/peaceiris/actions-hugo/releases)
- [Changelog](https://github.com/peaceiris/actions-hugo/blob/main/CHANGELOG.md)
- [Commits](https://github.com/peaceiris/actions-hugo/compare/v2...v3)

---
updated-dependencies:
- dependency-name: peaceiris/actions-hugo
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-17 00:10:31 +02:00
Daniel Molkentin
09ca45536c bump theme 2024-10-17 00:03:57 +02:00
Daniel Molkentin
181fd690ba fix: update templates 2024-10-17 00:03:57 +02:00
Andreas Hubel
c9bff256f2 add cronjob 2024-10-17 00:03:57 +02:00
Daniel Molkentin
b01f6caa0c Merge branch 'staging' into production 2024-04-04 16:58:24 +02:00
Daniel Molkentin
6091173d94 Merge branch 'staging' into production 2024-04-04 16:24:40 +02:00
Daniel Molkentin
14f2f6c978 Merge branch 'staging' into production 2024-02-21 20:07:47 +01:00
Daniel Molkentin
5351719af6 Merge branch 'staging' into production 2023-11-07 20:52:54 +01:00
Daniel Molkentin
b54aae79f7
Merge pull request #14 from cccb/staging 
Update production
 2023-10-25 00:31:02 +02:00
Daniel Molkentin
0ca6400f2a
Merge pull request #7 from cccb/staging-to-prod 
WIP: Switch on new homepage in prod
 2023-10-25 00:30:08 +02:00
Ricardo Band
32af508b9a
Merge pull request #9 from cccb/staging 
Update release.yml
 2023-06-14 12:31:56 +02:00
Ricardo Band
74bda97bfc
Merge pull request #8 from cccb/staging 
🚀
 2023-06-14 12:28:39 +02:00
Ricardo Band
20a422bc65
Update convert_page.sh 2023-06-14 12:24:12 +02:00
Ricardo Band
30a9143fe6
Merge branch 'production' into staging-to-prod 2023-06-14 12:23:03 +02:00
Daniel Molkentin
52e402128a Merge branch 'staging' into 'production' 
Staging

See merge request cccb/www!44
 2023-01-28 20:19:24 +00:00
Daniel Molkentin
f27ba8cf7c Merge branch 'staging' into 'production' 
Updates and typo fixes

See merge request cccb/www!42
 2022-06-19 19:40:26 +00:00
atoth
d16624565a Merge branch 'staging' into 'production' 
Korrektur Tippfehler

See merge request cccb/www!41
 2022-06-13 21:44:02 +00:00
Daniel Molkentin
097b2134e2 Merge branch 'staging' into 'production' 
Datengarten

See merge request cccb/www!40
 2022-06-13 20:28:09 +00:00
atoth
2531732327 Merge branch 'staging' into 'production' 
Update from staging to production

See merge request cccb/www!39
 2022-05-22 20:30:58 +00:00
Daniel Molkentin
5962f0c805 Merge branch 'staging' into 'production' 
Staging

See merge request cccb/www!38
 2021-07-04 22:50:55 +00:00
atoth
0fcbb50477 Merge branch 'staging' into 'production' 
Mailadresse geändert, weil hardcodet anstatt aus dem selben Datensatz wie im Footer

See merge request cccb/www!37
 2021-07-01 14:31:20 +00:00
atoth
091927ea0f Merge branch 'staging' into 'production' 
Staging

See merge request cccb/www!36
 2021-07-01 14:11:28 +00:00
atoth
04cf3ff8de Merge branch 'staging' into 'production' 
Typo danimo gefixt

See merge request cccb/www!35
 2020-12-31 00:03:23 +01:00
atoth
d487b829d0 Merge branch 'staging' into 'production' 
Staging

See merge request cccb/www!34
 2020-12-31 00:00:04 +01:00
Daniel Molkentin
f3caba4095 Merge branch 'staging' into 'production' 
Staging anfahrt.md

See merge request cccb/www!33
 2020-05-23 16:50:47 +02:00
Daniel Molkentin
6a65098c27 Merge branch 'staging' into 'production' 
Anti-Viren-Paket

See merge request cccb/www!32
 2020-03-12 23:38:20 +01:00
Carina
f7f3d0077a Merge branch 'staging' into 'production' 
CR: Keine kreative Pause mehr

See merge request cccb/www!31
 2020-03-06 11:56:53 +01:00
Daniel Molkentin
3c84f0753a Merge branch 'staging' into 'production' 
CR: Fix start and end times

See merge request cccb/www!30
 2020-02-27 16:50:50 +01:00
Daniel Molkentin
077e90c9a6 Merge branch 'staging' into 'production' 
Chaosradio Dates

See merge request cccb/www!28
 2020-02-27 14:41:00 +01:00
Daniel Molkentin
194bf7c313 Merge branch 'staging' into 'production' 
DG107: URL to recording

See merge request cccb/www!27
 2020-02-12 11:35:11 +01:00
Daniel Molkentin
a258f94a61 Merge branch 'staging' into 'production' 
Update DG107 from Staging

See merge request cccb/www!26
 2020-02-04 23:23:30 +01:00
Carina
bbb05ca227 Merge branch 'staging' into 'production' 
Add upcoming Datengarten and fix title schema for last one

See merge request cccb/www!24
 2020-02-02 21:27:05 +01:00
Daniel Molkentin
4309e9301b Merge branch 'staging' into 'production' 
Hinweise auf Lastschrift entfernt

See merge request cccb/www!23
 2020-01-28 17:04:05 +01:00
Daniel Molkentin
02fc98af46 Merge branch 'staging' into 'production' 
datengarten: Fix listing order

See merge request cccb/www!22
 2020-01-23 17:59:47 +01:00
Daniel Molkentin
34a95f41ff Merge branch 'staging' into 'production' 
Videos fuer DG105 und 106

See merge request cccb/www!21
 2020-01-23 17:53:54 +01:00
Daniel Molkentin
dbd7b7c093 Merge branch 'staging' into 'production' 
Neue Beitragsordnung

See merge request cccb/www!20
 2020-01-19 22:31:48 +01:00
Carina
880272aa65 Merge branch 'staging' into 'production' 
Added link to slides.

See merge request cccb/www!19
 2020-01-15 21:41:06 +01:00
Daniel Molkentin
bb960dbfdc Merge branch 'staging' into 'production' 
Add dg106

See merge request cccb/www!18
 2020-01-13 11:22:43 +01:00
Waschtl
00c5a5448c Merge branch 'staging' into 'production' 
removed hint to Doppelmitgliedschaft, corrected membership fee

See merge request cccb/www!17
 2020-01-12 14:56:40 +01:00
Daniel Molkentin
36c90dba48 Merge branch 'staging' into 'production' 
dg105: Fix tags

See merge request cccb/www!16
 2019-12-04 21:40:50 +01:00
Daniel Molkentin
b7651631ad Merge branch 'staging' into 'production' 
Staging to production for dg105

See merge request cccb/www!15
 2019-12-04 16:56:49 +01:00
Daniel Molkentin
54af520ff8 Merge branch 'staging' into 'production' 
Add tags

See merge request cccb/www!14
 2019-11-04 22:32:12 +01:00
Daniel Molkentin
41415dc693 Merge branch 'staging' into 'production' 
Staging

See merge request cccb/www!13
 2019-11-04 22:17:15 +01:00
Daniel Molkentin
66419dce2e Merge branch 'staging' into 'production' 
Fixes to DG102, updated README

See merge request cccb/www!12
 2019-09-04 21:50:34 +02:00
Carina
3cca7294c8 Merge branch 'staging' into 'production' 
Merge staging in production

See merge request cccb/www!11
 2019-09-04 19:08:15 +02:00
Daniel Molkentin
0f52d2c435 Merge branch 'staging' into 'production' 
Merge staging

See merge request cccb/www!10
 2019-08-14 12:13:52 +02:00
Daniel Molkentin
8719b884e0 Merge branch 'staging' into 'production' 
Neue Satzung, Beitragsordnung

See merge request cccb/www!9
 2019-08-03 17:20:54 +02:00
Carina
aa5a9cc544 Merge branch 'staging' into 'production' 
Merge staging in production

See merge request cccb/www!7
 2019-07-04 18:51:42 +02:00
Daniel Molkentin
9a67ec22f9 Merge branch 'staging' into 'production' 
Update dg100, video for dg99

See merge request cccb/www!6
 2019-06-11 22:15:49 +02:00
Daniel Molkentin
e4771499ca Merge branch 'staging' into 'production' 
dg100

See merge request cccb/www!5
 2019-06-07 16:02:25 +02:00
Daniel Molkentin
56b3bf14ae Merge branch 'staging' into 'production' 
dg99

See merge request cccb/www!4
 2019-05-13 13:13:51 +02:00
Daniel Molkentin
bfd564c2c1 Merge branch 'staging' into 'production' 
Staging

See merge request cccb/www!3
 2019-03-17 19:09:01 +01:00
Daniel Molkentin
3127cb5007 Merge branch 'staging' into 'production' 
Staging

See merge request cccb/www!2
 2019-03-15 04:08:18 +01:00
Daniel Molkentin
6d63004173 Ensure artifacts expire 2019-03-14 23:01:32 +01:00
Daniel Molkentin
fb95b705bc Merge branch 'staging' 2019-03-14 21:02:51 +01:00
Daniel Molkentin
f7a56196f4 Merge branch 'staging' 2019-03-14 00:01:51 +01:00
Daniel Molkentin
55d13a94e7 Adjust hugo params for master 2019-03-13 23:48:35 +01:00
Daniel Molkentin
49d5646b15 Allow specifying per-branch parameters 2019-03-13 23:46:54 +01:00
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
content/page/mitgliedschaft-infos.md
View file

@ -21,7 +21,7 @@ Wir wollen die Menschen kennenlernen, bevor sie ein Mitglied im Verein werden ko
Das Verfahren in etwa ist wie folgt (in chronologischer Reihenfolge):
* Du bist immer mal wieder an offenen Tagen im [Club Discordia](/veranstaltungen/clubdiscordia/) da, und lernst Leute kennen.
* Du bist immer mal wieder an offenen Tagen im [Club Discordia](/page/clubdiscordia/) da, und lernst Leute kennen.
* Du sprichst mit den 'regulars' und wirst ein Teil der aktiven Community.
* Danach kannst Du einen Mitgliedsantrag ausfüllen und abgeben.
* Der Vorstand wird die Mitglieder auf der internen Mailingliste nach einem Meinungsbild befragen

5
content/veranstaltungen/datengarten.md
View file

@ -16,8 +16,9 @@ Discordia](/veranstaltungen/clubdiscordia/). Regelmäßige Datengärten finden i
jedem 1. Mittwoch im Monat ab ±20 Uhr** statt. Zudem
gibt es immer mal wieder einen Datengarten außerhalb der Reihe. Wenn Du
Interesse an regelmäßigen Updates über stattfindende Veranstaltungen
hast, folge [@clubdiscordia](https://chaos.social/@clubdiscordia) auf
Mastodon, abonniere unseren [Veranstaltungskalender](/verein/calendar) oder trage Dich auf unseren Mailverteiler zum Datengarten ein.
hast, folge [@clubdiscordia](https://chaos.social/@clubdiscordia) auf Mastodon,
abonniere unseren [Veranstaltungskalender](/verein/calendar) oder
trage Dich auf unseren Mailverteiler zum Datengarten ein.
Schicke dazu eine Mail an <datengarten-subscribe@berlin.ccc.de>.
{{< alert " " >}}