FSFE/fsfe-website
27
32
Fork 92
Code Issues 64 Pull Requests 11 Wiki Activity

feat: add infomaterial and merch items #5383

Merged
hl merged 13 commits from image-additions2 into master 2025-10-09 14:39:42 +00:00
Conversation 1 Commits 13 Files Changed 16 +73 -3
hl commented 2025-10-07 15:18:07 +00:00
Member
Copy Link
No description provided.
hl added 1 commit 2025-10-07 15:18:08 +00:00
add promo pics
All checks were successful
continuous-integration/drone/pr Build is passing
Details
61d4b16b2c
hl added 1 commit 2025-10-07 15:51:36 +00:00
Add promo pictures and data entry
All checks were successful
continuous-integration/drone/pr Build is passing
Details
20cb663d67
hl changed title from add promo pics to WIP: feat: add infomaterial and merch items 2025-10-07 16:35:46 +00:00
tobiasd reviewed 2025-10-07 16:43:10 +00:00
fsfe.org/order/data/items.en.xml
@@ -118,6 +118,12 @@
<image small="data/pictures/bag-since2001-blue-front-small.jpg" large="data/pictures/bag-since2001-blue-front-large.jpg"/>
<image small="data/pictures/bag-since2001-blue-back-small.jpg" large="data/pictures/bag-since2001-blue-back-large.jpg"/>
</item>
<item type="other" id="ada-zangemann-tattoos" price="4.00" date="2025-10-07">
tobiasd commented 2025-10-07 16:43:10 +00:00
Owner
Copy Link

You have to add new XML files for the two new items in the data/info directory. Use the id as filename, but remember the language of the item.

You have to add new XML files for the two new items in the `data/info` directory. Use the `id` as filename, but remember the language of the item.
hl marked this conversation as resolved
hl added 1 commit 2025-10-09 12:42:02 +00:00
new promo pics: smaller file sizes
Some checks failed
continuous-integration/drone/pr Build is failing
Details
425320cfe8
hl added 1 commit 2025-10-09 12:49:22 +00:00
add merchandise info texts
Some checks failed
continuous-integration/drone/pr Build is failing
Details
4df1745dd3
hl added 1 commit 2025-10-09 12:54:10 +00:00
remove ampersand to please the XML gods
Some checks failed
continuous-integration/drone/pr Build is failing
Details
1e8b4e7721
hl changed title from WIP: feat: add infomaterial and merch items to feat: add infomaterial and merch items 2025-10-09 12:56:09 +00:00
hl added 1 commit 2025-10-09 12:59:12 +00:00
change order of balloon to 2
Some checks failed
continuous-integration/drone/pr Build is failing
Details
ed037979f6
hl added 1 commit 2025-10-09 12:59:29 +00:00
Merge branch 'master' into image-additions2
All checks were successful
continuous-integration/drone/pr Build is passing
Details
5558cbd278
tobiasd added 1 commit 2025-10-09 14:02:40 +00:00
fix items
All checks were successful
continuous-integration/drone/pr Build is passing
Details
59881b50e9
hl added 2 commits 2025-10-09 14:16:18 +00:00
fix items
All checks were successful
continuous-integration/drone/pr Build is passing
Details
59881b50e9
change balloon, remove redundant images
All checks were successful
continuous-integration/drone/pr Build is passing
Details
1bdc7bff04
hl added 1 commit 2025-10-09 14:32:35 +00:00
replace merchandise pics with horizontal ones
All checks were successful
continuous-integration/drone/pr Build is passing
Details
e3c2f98276
tobiasd added 4 commits 2025-10-09 14:36:42 +00:00
Merge branch 'master' into image-additions2
All checks were successful
continuous-integration/drone/pr Build is passing
Details
5558cbd278
fix items
All checks were successful
continuous-integration/drone/pr Build is passing
Details
59881b50e9
Merge branch 'image-additions2' of git.fsfe.org:fsfe/fsfe-website into image-additions2 e28dd3a071
Merge branch 'image-additions2' of git.fsfe.org:fsfe/fsfe-website into image-additions2
All checks were successful
continuous-integration/drone/pr Build is passing
Details
d4f5b897ee
hl merged commit 7c5bdebdbc into master 2025-10-09 14:39:42 +00:00
tobiasd deleted branch image-additions2 2025-10-24 15:50:07 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
tobiasd
Labels
Clear labels
bug
build
cgi Scripting
design
disruptive
Requires careful coordination and documentation changes
documentation
duplicate
easy
feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
albert alex.busch alex.sander anaghz ao bonnie cryptie dario delliott dfajfer dmaphy doczkal eal egnun eventregbot fi fkobi floriansnow gabriel.ku guido hl hugo ineiev jn jzarl linus lucabon lucas.lasota max.mehl mk monochromec mweimann nico.rikken patrick reinhard renovate-bot repentinus schiessle sofiaritz tobiasd vincent
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: FSFE/fsfe-website#5383
No description provided.
Delete Branch "image-additions2"

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?