release: sync main with dev (about editor, journal template, icon cleanup) (#449)
Brings `main` up to `dev` after #448 realigned the two branches. `main` had #431 (portfolio features) but was missing everything that landed on `dev` since: - #443 — journal sample story ships as a template, not a live entry - #445 — last emojis in the public frontend replaced with SVG icons - #446 — About page toggle + content editor in the admin (@lancetm714's work, rebased) - #448 — the merge of `main` into `dev`, resolving the `Icons.tsx` split and porting `IconEyeOff` into the shared icon file After this merge both branches carry the same tree. CI on #448 (type-check + tests) passed on the merged state. --------- Co-authored-by: ralksta <ralksta@users.noreply.github.com> Co-authored-by: lancetm714 <108419425+lancetm714@users.noreply.github.com>
This commit is contained in:
8
.gitignore
vendored
8
.gitignore
vendored
@@ -62,10 +62,18 @@ docker-compose.override.yml
|
||||
content/settings.yaml
|
||||
content/gallery.yaml
|
||||
content/about.md
|
||||
# Journal entries reference Immich asset UUIDs, which are specific to one
|
||||
# server — committing an entry would publish ids from the author's instance.
|
||||
# The .example alongside them stays tracked as a starting point.
|
||||
content/journal/*.md
|
||||
content/essays/*.md
|
||||
# Von der App zur Laufzeit geschrieben: yaml-service legt bis zu 10 Backups je
|
||||
# Datei ab, und die Backups von gallery.yaml/settings.yaml wuerden genau den
|
||||
# Inhalt ins Repo tragen, den die drei Zeilen darueber heraushalten sollen.
|
||||
content/.backups/
|
||||
# yaml-service writes next to the file it backs up, so the journal directory
|
||||
# gets its own .backups/ — the top-level pattern above does not reach it.
|
||||
content/**/.backups/
|
||||
content/analytics.json
|
||||
content/*.screenshot-bak
|
||||
# Credentials written by the /install wizard (never committed)
|
||||
|
||||
Reference in New Issue
Block a user