20
0
Fork
You've already forked www
3

Deploy to ILoveFS 2026 to test website #63

Open
pomidor wants to merge 0 commits from ilovefs2026 into website-v2
pull from: ilovefs2026
merge into: HSPOZ:website-v2
HSPOZ:master
HSPOZ:add-photo-gallery
HSPOZ:cicd-oidc-argo-auth
HSPOZ:newsletter-8
HSPOZ:website-v2
HSPOZ:newsletter-7
HSPOZ:knyfixit
HSPOZ:newsletter-6
HSPOZ:fix-mobilibon-api-integration
HSPOZ:newsletter-5-fix
HSPOZ:newsletter-5
HSPOZ:exterior
HSPOZ:zarzućIRCaPrzeglądarką
HSPOZ:disablepolish
HSPOZ:ilovefs2025
HSPOZ:ilovefs
HSPOZ:point-to-wiki-landing-page
HSPOZ:add-wiki
HSPOZ:fsfe_ilovefs
HSPOZ:fix-ci-3
HSPOZ:fix-ci-2
HSPOZ:git-warsztaty
HSPOZ:fix-ci
HSPOZ:update-meeting-time
HSPOZ:fix-event-hour
HSPOZ:meowevents
HSPOZ:tmp
No description provided.
website-v2 ( #39 )
All checks were successful
Docker build / build (push) Successful in 3m5s
84d650e845 
Reviewed-on: #39
ILoveFS2025: Add room number
All checks were successful
Docker build / build (push) Successful in 3m7s
eeeca7af2e
Merge branch 'website-v2'
All checks were successful
Docker build / build (push) Successful in 3m2s
7293f8068d
Odnowienie tekstu na WWW-klienten IRCa
All checks were successful
Docker build / build (push) Successful in 3m31s
cd5c310b44
Fixup quackupu z IRCem WuUwU. Normalny <p>, dodatkowy <p> w kontakt, usunięty <br>, dodany <p>.
All checks were successful
Docker build / build (push) Successful in 3m21s
8956c297e3
Add new blog article, update Astro ( #46 )
All checks were successful
Docker build / build (push) Successful in 4m35s
4f92c497ff 
Reviewed-on: #46
Fix text in neswletter no 5.
All checks were successful
Docker build / build (push) Successful in 4m37s
5ad84f7944
Update AstroJS
Some checks failed
Docker build / build (push) Has been cancelled
1d419f2883
Add ArgoCD auto-deployment
All checks were successful
Docker build / Build and push Docker image (push) Successful in 56s
Docker build / Deploy through ArgoCD (push) Successful in 12s
4ce1361eae
feat(CI): show deployment command
All checks were successful
Docker build / Build and push Docker image (push) Successful in 52s
Docker build / Deploy through ArgoCD (push) Successful in 10s
5ee08fd9b8
Fix Newsletter #4 number and add redirect
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m11s
Docker build / Deploy through ArgoCD (push) Successful in 24s
e326fc35c4
Add missing trailingSlash
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m8s
Docker build / Deploy through ArgoCD (push) Successful in 10s
711063c999
Add Newsletter 5 ( #50 )
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m50s
Docker build / Deploy through ArgoCD (push) Successful in 23s
e459824889 
Reviewed-on: #50
Co-authored-by: pomidor <pomidor@duck.com>
Co-committed-by: pomidor <pomidor@duck.com>
Add missing link in Newsletter 5 ( #52 )
All checks were successful
Docker build / Build and push Docker image (push) Successful in 53s
Docker build / Deploy through ArgoCD (push) Successful in 10s
6ec5e49ced 
Reviewed-on: #52
Co-authored-by: pomidor <pomidor@duck.com>
Co-committed-by: pomidor <pomidor@duck.com>
newsletter-5-fix ( #53 )
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m34s
Docker build / Deploy through ArgoCD (push) Successful in 24s
8d27ffd182 
Reviewed-on: #53
Co-authored-by: pomidor <pomidor@duck.com>
Co-committed-by: pomidor <pomidor@duck.com>
Fix Mobilizon API integration - add error handling ( #54 )
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m48s
Docker build / Deploy through ArgoCD (push) Successful in 21s
af3696a658 
Reviewed-on: #54
Show Meetup link if Mobilizon is not available ( #55 )
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m2s
Docker build / Deploy through ArgoCD (push) Successful in 11s
71b4db9886 
Reviewed-on: #55
Add newsletter 6
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m5s
Docker build / Deploy through ArgoCD (push) Successful in 19s
e29dc49015
Decrease Mobilizon.pl request timeout to 2500 ms
All checks were successful
Docker build / Build and push Docker image (push) Successful in 2m12s
Docker build / Deploy through ArgoCD (push) Successful in 22s
ed43bcafa7
Add redirect from /endof10 to Mobilizon event
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m32s
Docker build / Deploy through ArgoCD (push) Successful in 24s
470e03605c
Add knyfixit2025 landing and basic html redirect from /warsztaty ( #58 )
All checks were successful
Docker build / Build and push Docker image (push) Successful in 2m17s
Docker build / Deploy through ArgoCD (push) Successful in 24s
0004eaa57a 
Reviewed-on: #58
Co-authored-by: Artur Motyka <artur@motyka.pro>
Co-committed-by: Artur Motyka <artur@motyka.pro>
Add Mobilizon links
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m39s
Docker build / Deploy through ArgoCD (push) Successful in 20s
02f6bd93c6
fix(public/knyfixit): wrong date
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m0s
Docker build / Deploy through ArgoCD (push) Successful in 22s
57b3be6b5b
Fix text
All checks were successful
Docker build / Build and push Docker image (push) Successful in 58s
Docker build / Deploy through ArgoCD (push) Successful in 10s
0c6aa872e3
Correction of the funding text
All checks were successful
Docker build / Build and push Docker image (push) Successful in 59s
Docker build / Deploy through ArgoCD (push) Successful in 20s
a265614ffd
Add event signup popups and media patron section with styling
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m50s
Docker build / Deploy through ArgoCD (push) Successful in 25s
c52c7d4569
Add PIWO and Podzielnia partners
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m22s
Docker build / Deploy through ArgoCD (push) Successful in 20s
624eabccb0
Add links to partners
All checks were successful
Docker build / Build and push Docker image (push) Successful in 59s
Docker build / Deploy through ArgoCD (push) Successful in 8s
1f9b84dd7e
Newsletter 7 ( #61 )
All checks were successful
Docker build / Build and push Docker image (push) Successful in 2m8s
Docker build / Deploy through ArgoCD (push) Successful in 18s
7f633151fa 
Reviewed-on: #61
Reviewed-by: Jacek Pruciak <juniorjpdj@noreply.codeberg.org>
Co-authored-by: pomidor <pomidor@duck.com>
Co-committed-by: pomidor <pomidor@duck.com>
Fix wrong Newsletter 7 URL
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m6s
Docker build / Deploy through ArgoCD (push) Successful in 8s
78553707b3
Update dependencies
Some checks failed
Docker build / Deploy through ArgoCD (push) Blocked by required conditions
Docker build / Build and push Docker image (push) Has been cancelled
c1ef1b56aa
Change offical address
All checks were successful
Docker build / Build and push Docker image (push) Successful in 1m27s
Docker build / Deploy through ArgoCD (push) Successful in 21s
b94777494b
This pull request has changes conflicting with the target branch.
  • bun.lock
  • package.json
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

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

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 website-v2
git merge --no-ff ilovefs2026
git switch ilovefs2026
git rebase website-v2
git switch website-v2
git merge --ff-only ilovefs2026
git switch ilovefs2026
git rebase website-v2
git switch website-v2
git merge --no-ff ilovefs2026
git switch website-v2
git merge --squash ilovefs2026
git switch website-v2
git merge --ff-only ilovefs2026
git switch website-v2
git merge ilovefs2026
git push origin website-v2
Sign in to join this conversation.
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
HSPOZ/www!63
Reference in a new issue
HSPOZ/www
No description provided.
Delete branch "ilovefs2026"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?