From ec27a4bf20aa4236a4753f0c2b57cd6d27d25148 Mon Sep 17 00:00:00 2001 From: Himmel Date: Thu, 19 Mar 2026 15:12:33 +0800 Subject: [PATCH 1/2] Add new contributor Himmel to CLA (#9755) --- licenses/cla-individual.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index e278daf7eb..c3f3db9d6d 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -646,4 +646,6 @@ Rishu kumar, @rishu-7549, 2025/10/25 @hsteve11, 2025/12/30 -@kjharcombe, 2026/03/16 \ No newline at end of file +@kjharcombe, 2026/03/16 + +Himmel, @NotHimmel, 2026/03/19 From 65fcded29fd4c354fe45f9cccd14f000cb88285b Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Fri, 20 Mar 2026 08:54:03 +0100 Subject: [PATCH 2/2] Fix name clashes - definition tiddlers with images (#9759) --- .../HelloThumbnail - Community Survey.tid | 2 +- .../HelloThumbnail - Intertwingled Innovations.tid | 2 +- ...y 2025.webp => Community Survey 2025 Image.webp} | Bin ...p.meta => Community Survey 2025 Image.webp.meta} | 2 +- ...ns.webp => Intertwingled Innovations Image.webp} | Bin .../Intertwingled Innovations Image.webp.meta | 3 +++ .../images/Intertwingled Innovations.webp.meta | 3 --- 7 files changed, 6 insertions(+), 6 deletions(-) rename editions/tw5.com/tiddlers/images/{Community Survey 2025.webp => Community Survey 2025 Image.webp} (100%) rename editions/tw5.com/tiddlers/images/{Community Survey 2025.webp.meta => Community Survey 2025 Image.webp.meta} (74%) rename editions/tw5.com/tiddlers/images/{Intertwingled Innovations.webp => Intertwingled Innovations Image.webp} (100%) create mode 100644 editions/tw5.com/tiddlers/images/Intertwingled Innovations Image.webp.meta delete mode 100644 editions/tw5.com/tiddlers/images/Intertwingled Innovations.webp.meta diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Community Survey.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Community Survey.tid index b540348c93..efbb50e999 100644 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Community Survey.tid +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Community Survey.tid @@ -1,7 +1,7 @@ title: HelloThumbnail - Community Survey 2025 tags: HelloThumbnail color: rgb(234, 205, 183) -image: Community Survey 2025 +image: Community Survey 2025 Image caption: Community Survey link: Community Survey 2025 ribbon-text: NEW diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Intertwingled Innovations.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Intertwingled Innovations.tid index 91678367b8..9c5f6c6f6d 100644 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Intertwingled Innovations.tid +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Intertwingled Innovations.tid @@ -1,7 +1,7 @@ background-color: #EDB431 caption: Intertwingled Innovations color: #ff0 -image: Intertwingled Innovations +image: Intertwingled Innovations Image link: Intertwingled Innovations tags: HelloThumbnail title: HelloThumbnail - Intertwingled Innovations diff --git a/editions/tw5.com/tiddlers/images/Community Survey 2025.webp b/editions/tw5.com/tiddlers/images/Community Survey 2025 Image.webp similarity index 100% rename from editions/tw5.com/tiddlers/images/Community Survey 2025.webp rename to editions/tw5.com/tiddlers/images/Community Survey 2025 Image.webp diff --git a/editions/tw5.com/tiddlers/images/Community Survey 2025.webp.meta b/editions/tw5.com/tiddlers/images/Community Survey 2025 Image.webp.meta similarity index 74% rename from editions/tw5.com/tiddlers/images/Community Survey 2025.webp.meta rename to editions/tw5.com/tiddlers/images/Community Survey 2025 Image.webp.meta index ca56926a10..8eb66313b1 100644 --- a/editions/tw5.com/tiddlers/images/Community Survey 2025.webp.meta +++ b/editions/tw5.com/tiddlers/images/Community Survey 2025 Image.webp.meta @@ -1,4 +1,4 @@ alt-text: Shape the future by taking the TiddlyWiki Community Survey 2025 tags: picture -title: Community Survey 2025 +title: Community Survey 2025 Image type: image/webp \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/images/Intertwingled Innovations.webp b/editions/tw5.com/tiddlers/images/Intertwingled Innovations Image.webp similarity index 100% rename from editions/tw5.com/tiddlers/images/Intertwingled Innovations.webp rename to editions/tw5.com/tiddlers/images/Intertwingled Innovations Image.webp diff --git a/editions/tw5.com/tiddlers/images/Intertwingled Innovations Image.webp.meta b/editions/tw5.com/tiddlers/images/Intertwingled Innovations Image.webp.meta new file mode 100644 index 0000000000..20dd660ca8 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/Intertwingled Innovations Image.webp.meta @@ -0,0 +1,3 @@ +title: Intertwingled Innovations Image +type: image/webp +tags: picture diff --git a/editions/tw5.com/tiddlers/images/Intertwingled Innovations.webp.meta b/editions/tw5.com/tiddlers/images/Intertwingled Innovations.webp.meta deleted file mode 100644 index f074bf96e1..0000000000 --- a/editions/tw5.com/tiddlers/images/Intertwingled Innovations.webp.meta +++ /dev/null @@ -1,3 +0,0 @@ -title: Intertwingled Innovations -type: image/webp -tags: picture