CCCHH/hackertours
2
1
Fork 4
Code Issues 2 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Adds 39C3 entry for XFEL; capitalizes 38C3 and 39C3 in headlines #41

Open
ViMaSter wants to merge 5 commits from 39c3-xfel into main
pull from: 39c3-xfel
merge into: CCCHH:main
Conversation 2 Commits 5 Files changed 8 +78 -16
ViMaSter commented 2025-11-12 17:06:05 +01:00
Collaborator
Copy link
No description provided.
fix: Capitalizes C3 in XFEL headlines
Some checks failed
/ build (pull_request) Failing after 15s
Details
5e9c78fac3
ViMaSter reviewed 2025-11-12 17:07:22 +01:00
content/de/39c3/xfel/index.md Outdated
@ -0,0 +24,4 @@
* Kosten: kostenlos
* Treffen am Hackertours-Desk: **wie oben angegeben**.
* Wichtig: Fotos zur nicht-kommerziellen Nutzung sind erlaubt. Bitte fotografiert jedoch keine Mitarbeitende, es sei denn, diese sind ausdrücklich damit einverstanden. Bitte tragt flaches, festes Schuhwerk. Bitte lest die [Nutzungsbedingungen für Besuchende](https://www.xfel.eu/sites/sites_custom/site_xfel/content/e245399/e277337/xfel_file277366/Nutzungsbedingungen_fuer_Besucher_innen_ger.pdf) und die
[Ordnungs- und Sicherheitsbestimmungen](https://www.xfel.eu/sites/sites_custom/site_xfel/content/e245399/e277337/xfel_file277367/Ordnungs_und_Sicherheitsbestimmungen_fuer_Besucher_innen_eng.pdf) des European XFEL.
ViMaSter commented 2025-11-12 17:07:22 +01:00
Author
Collaborator
Copy link

XFEL instructed me to use the old 38C3 page as reference, but this link 404s. I've send them an email asking for a replacement (the visitor page has a different document linked now), so keeping this PR as work-in-progress until I do.

XFEL instructed me to use the old 38C3 page as reference, but this link 404s. I've send them an email asking for a replacement (the visitor page has a different document linked now), so keeping this PR as work-in-progress until I do.
ViMaSter commented 2025-11-17 09:52:51 +01:00
Author
Collaborator
Copy link

Updated the links to match https://www.xfel.eu/besucherinnen/index_ger.html as requested by XFEL.

Updated the links to match https://www.xfel.eu/besucherinnen/index_ger.html as requested by XFEL.
ViMaSter marked this conversation as resolved
ViMaSter reviewed 2025-11-12 17:07:26 +01:00
content/en/39c3/xfel/index.md Outdated
@ -0,0 +24,4 @@
* Cost: free
* Meeting time at Hackertours-Desk: **as mentioned above**.
* Important: Photos for non-commercial purposes are allowed. However, please do not take pictures of staff members unless they explicitly agree. Please wear flat, sturdy footwear. Please read the [Terms and Conditions for Visitors](https://www.xfel.eu/sites/sites_custom/site_xfel/content/e245399/e277337/xfel_file277366/Terms_and_Conditions_for_Visitors_eng.pdf) and the
[Order and Safety Regulations](https://www.xfel.eu/sites/sites_custom/site_xfel/content/e245399/e277337/xfel_file277367/Ordnungs_und_Sicherheitsbestimmungen_fuer_Besucher_innen_eng.pdf) of the European XFEL.
ViMaSter commented 2025-11-12 17:07:26 +01:00
Author
Collaborator
Copy link

XFEL instructed me to use the old 38C3 page as reference, but this link 404s. I've send them an email asking for a replacement (the visitor page has a different document linked now), so keeping this PR as work-in-progress until I do.

XFEL instructed me to use the old 38C3 page as reference, but this link 404s. I've send them an email asking for a replacement (the visitor page has a different document linked now), so keeping this PR as work-in-progress until I do.
ViMaSter commented 2025-11-17 09:52:49 +01:00
Author
Collaborator
Copy link

Updated the links to match https://www.xfel.eu/visitors/index_eng.html as requested by XFEL.

Updated the links to match https://www.xfel.eu/visitors/index_eng.html as requested by XFEL.
ViMaSter marked this conversation as resolved
fix: Resolves date typo
All checks were successful
/ build (pull_request) Successful in 27s
Details
3a887f6c4b
docs: Updates links to match https://www.xfel.eu/visitors/index_eng.html
All checks were successful
/ build (pull_request) Successful in 29s
Details
6ccf3eb397
docs: Updates links to match https://www.xfel.eu/besucherinnen/index_ger.html
All checks were successful
/ build (pull_request) Successful in 27s
Details
7ac4c3bef3
ViMaSter changed title from WIP: Adds 39C3 entry for XFEL; capitalizes 38C3 and 39C3 in headlines to Adds 39C3 entry for XFEL; capitalizes 38C3 and 39C3 in headlines 2025-11-17 09:52:55 +01:00
All checks were successful
/ build (pull_request) Successful in 27s
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 39c3-xfel:39c3-xfel
git switch 39c3-xfel

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 39c3-xfel
git switch 39c3-xfel
git rebase main
git switch main
git merge --ff-only 39c3-xfel
git switch 39c3-xfel
git rebase main
git switch main
git merge --no-ff 39c3-xfel
git switch main
git merge --squash 39c3-xfel
git switch main
git merge --ff-only 39c3-xfel
git switch main
git merge 39c3-xfel
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
1 participant
Notifications
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!41
No description provided.