Merge branch 'origin/master' into master

Browse Source

Resolved merge conflicts in:
- weed/admin/static/js/modal-alerts.js: Adopted incoming improvements and HTML support.
- weed/admin/view/app/collection_details.templ: Switched to showAlert info type.
- weed/admin/view/app/file_browser.templ: Used descriptive delete message.
- weed/admin/view/app/maintenance_workers.templ: Used encoding and headers in pauseWorker.
- weed/admin/view/app/object_store_users.templ: Restored accidentally deleted delete functions and used encodeURIComponent.
- weed/admin/view/app/policies.templ: Standardized on showAlert and descriptive confirmations.

Regenerated all templ files.

...

This commit is contained in:

Chris Lu

2026-01-26 11:37:12 -08:00

parent 759a6cd345 5a7c74feac

commit 5ba0db7af4

72 changed files with 3381 additions and 2132 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

58

weed/admin/view/app/file_browser_templ.go

File diff suppressed because one or more lines are too long