WIP: Prepare for 40C3 #64

Draft

stb wants to merge 8 commits from 40c3 into main

pull from: 40c3

merge into: CCCHH:main

CCCHH:main

CCCHH:schedule-title-status

CCCHH:happy-new-year

CCCHH:last-minute-bookings

CCCHH:koerperfunk-remaining-seats

CCCHH:corrections

CCCHH:correct-dates

CCCHH:lounge

CCCHH:fix-ticketshop

CCCHH:desy

CCCHH:vollkorn

CCCHH:GV-images

CCCHH:n0th1ng

CCCHH:changes-Art

CCCHH:logo

CCCHH:2-bisschen-mehr-info-zum-ablauf

Conversation 2 Commits 8 Files changed 3873 +16256 -35

stb commented 2026-10-16 15:18:10 +02:00

Owner

Copy link

No description provided.

stb self-assigned this 2026-10-16 15:18:10 +02:00

stb added 1 commit 2026-10-16 15:18:10 +02:00

Prepare for 40C3 b71f7de510

stb changed title from Prepare for 40C3 to WIP: Prepare for 40C3 2026-10-16 15:18:14 +02:00

forgejo-actions commented 2026-10-16 15:18:25 +02:00

Copy link

You can view your changes at https://staging.hackertours.hamburg.ccc.de/pr64/

You can view your changes at https://staging.hackertours.hamburg.ccc.de/pr64/

stb commented 2026-10-16 15:18:44 +02:00

Author

Owner

Copy link

Bitte nicht mergen, bevor das Hackertours-Team sich einig ist, dass die Ankündigung der Touren raus kann!

Bitte nicht mergen, bevor das Hackertours-Team sich einig ist, dass die Ankündigung der Touren raus kann!

CCCHH added 1 commit 2026-10-16 15:49:30 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 1545113f89

CCCHH added 1 commit 2026-10-16 16:09:10 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 4d786667d3

CCCHH added 1 commit 2026-10-16 17:44:30 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (confirmed and offered tours) f7368d72b3

CCCHH added 1 commit 2026-10-16 18:26:26 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 1e9b8fabb6

stb added 1 commit 2026-10-16 19:01:10 +02:00

Merge branch 'main' into 40c3 c6077c59ba

CCCHH added 1 commit 2026-10-16 19:20:43 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 7e7dadb67e

stb added 2 commits 2026-10-16 19:30:46 +02:00

Switch to shortcode 6a86c29552

Merge branch '40c3' of git.hamburg.ccc.de:ccchh/hackertours into 40c3 c2f7061a6c

CCCHH added 1 commit 2026-10-16 19:38:39 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 12ef6bbb2f

CCCHH added 1 commit 2026-10-16 19:51:15 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) a3978700b3

stb added 1 commit 2026-10-16 20:21:25 +02:00

Add a generic tour-map shortcode and a data format to supply the necessary info 14aed5e649

stb added 1 commit 2026-10-16 20:35:08 +02:00

dd vendored icons for the tour-map 2c28c050a5

CCCHH added 1 commit 2026-10-17 01:03:19 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) aae9018000

stb added 2 commits 2026-10-17 01:07:12 +02:00

Add tour-map to event index pages 4369cf7d1c

Merge branch '40c3' of git.hamburg.ccc.de:ccchh/hackertours into 40c3 989d99d80e

CCCHH added 1 commit 2026-10-17 01:08:43 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) d3727ce1f7

stb added 2 commits 2026-10-17 01:14:56 +02:00

Style 89f3fad232

Add heading for better navigation 2c8bdba7e1

stb added 1 commit 2026-10-17 01:38:23 +02:00

Merge branch 'main' into 40c3 925737eff5

stb added 1 commit 2026-10-17 01:51:07 +02:00

Add calendar shortcode 6eceb15f18

CCCHH added 1 commit 2026-10-17 01:56:26 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 281a987904

stb added 1 commit 2026-10-17 02:07:09 +02:00

Turn calendar download link into an icon, vendor font awesome for that. 01054e1419

CCCHH added 1 commit 2026-10-17 02:08:42 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 1ff57e8c7a

stb added 1 commit 2026-10-17 02:13:26 +02:00

Use a pill with explicit links for iCal and Google Calendar. 443ae1e05d

CCCHH added 1 commit 2026-10-17 02:15:21 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 962bd994b1

CCCHH added 1 commit 2026-10-17 02:18:48 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 5b0dc691e2

CCCHH added 1 commit 2026-10-17 09:08:34 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 0251016c2e

CCCHH added 1 commit 2026-10-17 09:22:53 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 7d59bbcebd

stb added 1 commit 2026-10-17 09:33:42 +02:00

Merge branch 'schedule-title-status' into 40c3 ... c2d4c63b6f

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

stb added 1 commit 2026-10-17 09:44:16 +02:00

Merge branch 'main' into 40c3 c496f8bbfb

stb added 1 commit 2026-10-17 09:51:46 +02:00

Remove duplicate translation keys ... 8be86215e3

Merging main into 40c3 combined the two merges of schedule-title-status,
which had kept the same new keys on both branches, so skip_to_content,
logo_alt and map_39c3_title were defined twice and Hugo failed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

stb force-pushed 40c3 from 8be86215e3 to 821290616a 2026-10-17 10:30:37 +02:00 Compare

CCCHH added 1 commit 2026-10-17 10:33:27 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) a27781ddc5

CCCHH added 1 commit 2026-10-17 10:43:46 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 726dafa338

stb added 2 commits 2026-10-17 10:50:43 +02:00

Fix pa11y issues with the map f1b8c42ab6

Merge branch '40c3' of git.hamburg.ccc.de:ccchh/hackertours into 40c3 2c0573ce2b

stb added 1 commit 2026-10-17 10:56:03 +02:00

Fix orientation of thumbnails f6a698a64b

CCCHH added 1 commit 2026-10-18 14:47:28 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) ab94098db0

CCCHH added 1 commit 2026-10-18 15:06:01 +02:00

Sync 40C3 Hackertours tours from Hackertours-Admin (all tours) 176a72235b

All checks were successful

Hide checks

/ build (pull_request) Successful in 1m35s

Details

/ accessibility (pull_request) Successful in 2m47s

Details

This pull request is marked as a work in progress.

This branch is out-of-date with the base branch

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 40c3:40c3

git switch 40c3

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff 40c3

git switch 40c3

git rebase main

git switch main

git merge --ff-only 40c3

git switch 40c3

git rebase main

git switch main

git merge --no-ff 40c3

git switch main

git merge --squash 40c3

git switch main

git merge --ff-only 40c3

git switch main

git merge 40c3

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

stb

3 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

CCCHH/hackertours!64

No description provided.