Merge branch 'develop'
5e267eb26240
Actions

Description

Merge branch 'develop'

Details

Provenance

matt	Authored on Mon, Nov 9, 6:50 PM

Parents

rWFd2485910010b: Merge commit from fork
rWF53419b5349da: Merge branch 'develop'

Branches

Unknown

Tags

Unknown

References

HEAD -> main

Event Timeline

matt committed rWF5e267eb26240: Merge branch 'develop' (authored by matt).Mon, Nov 9, 6:50 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

d2485910010b Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
1e213fd5bbbb Merge pull request #1786 from writefreely/dependabot/docker/alpine-3.24.3
Author
matt
Browse Repository
No Builds
No Audits
b3ad4f04aea8 Bump alpine from 3.18.4 to 3.24.3
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
5906aa9f93f4 Fix Dependabot Docker update directory
Author
matt
Browse Repository
No Builds
No Audits
50dedcd05a31 Remove deprecated `-d` flag from `go get` in Makefile
Author
matt
Browse Repository
No Builds
No Audits
95e1918e1041 Update Docker builds to Go 1.26
Author
matt
Browse Repository
No Builds
No Audits
ffa7a10b70b6 Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
Author
matt
Browse Repository
No Builds
No Audits
6996e83619af Merge pull request #1784 from writefreely/web-monetization-update
Author
matt
Browse Repository
No Builds
No Audits
c242ec0ee495 Merge branch 'develop' into web-monetization-update
Author
matt
Browse Repository
No Builds
No Audits
37d5e01013f9 Prefer local lessc install over global in Makefile
Author
matt
Browse Repository
No Builds
No Audits
3c963f831283 Bump version to 0.17.3
Author
matt
Browse Repository
No Builds
No Audits
e8cae8b935b4 Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
8ff3647e9a09 Merge pull request #1733 from writefreely/fix-ap-collections-first
Author
matt
Browse Repository
No Builds
No Audits
90d321a1a870 Merge pull request #1780 from writefreely/dependabot/go_modules/golang.
Author
matt
Browse Repository
No Builds
No Audits
e755fb35ae94 Bump golang.org/x/crypto from 0.54.0 to 0.58.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
51e05c7985a4 fix GHSA-7jv7-gf23-wcqq
Author
李欣哲 <3022001754@tju.edu.cn>
Browse Repository
No Builds
No Audits
5d1bc057e86a Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
b7f9d20cdd87 Prevent IPv6 transition-address bypass in federation guards
Author
matt
Browse Repository
No Builds
No Audits
4dc99d9fb5e6 Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
500a04e1100c Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
5eb85c743051 Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
c9b7caf972a6 Always use authenticated user ID for collection updates
Author
matt
Browse Repository
No Builds
No Audits
049aa2a25af4 Merge pull request #1731 from writefreely/improve-missing-dir-errors
Author
matt
Browse Repository
No Builds
No Audits
5398325629f9 Merge pull request #1748 from writefreely/fix-signup-paths
Author
matt
Browse Repository
No Builds
No Audits
5d98e0be7ac9 Merge pull request #1736 from writefreely/fix-robots-txt
Author
matt
Browse Repository
No Builds
No Audits
71d6410b0e28 Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
7fb71bc17918 Prevent access to private / password-protected blogs via ActivityPub
Author
matt
Browse Repository
No Builds
No Audits
3efbc692750e Merge pull request #1738 from c7io-dev/fix-customize-username-shadow
Author
matt
Browse Repository
No Builds
No Audits
dd2de20d3332 Enforce signup checks consistently across all registration paths
Author
matt
Browse Repository
No Builds
No Audits
ec745e3ffdc4 Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
2c6c02405a00 Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
5110ba343ed1 Merge pull request #1730 from writefreely/fix-uppercase-usernames
Author
matt
Browse Repository
No Builds
No Audits
e9ec650611a2 Merge pull request #1727 from writefreely/fix-password-protected
Author
matt
Browse Repository
No Builds
No Audits
47488e93fa13 Merge pull request #1729 from writefreely/fedi-image-description
Author
matt
Browse Repository
No Builds
No Audits
2681d08da9a5 Fix shadowed .Username on collection customize page
Author
sNullp <snullp@bsql.me>
Browse Repository
No Builds
No Audits
16b70a82f228 Support serving robots.txt on single-user instances
Author
matt
Browse Repository
No Builds
No Audits
37254560029a Merge branch 'develop' into fix-ap-collections-first
Author
matt
Browse Repository
No Builds
No Audits
07214a925202 Output friendly error when templates directories not found
Author
matt
Browse Repository
No Builds
No Audits
c21aafb9ecd2 Output friendly error when keys haven't been found
Author
matt
Browse Repository
No Builds
No Audits
3ad305f1d232 Output friendly error when no configuration file
Author
matt
Browse Repository
No Builds
No Audits
d34c775ed881 On startup, log notification of migrations needed
Author
matt
Browse Repository
No Builds
No Audits
aa0143148ebc Merge pull request #1712 from writefreely/dependabot/github_actions/docker/logi…
Author
matt
Browse Repository
No Builds
No Audits
130d1cb33307 Merge pull request #1714 from writefreely/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
9161903645cf Add tests for normalizing usernames via OAuth
Author
matt
Browse Repository
No Builds
No Audits
224159b9213f Normalize usernames for signups through OAuth
Author
matt
Browse Repository
No Builds
No Audits
790cb054273f Add tests for Markdown alt text extraction
Author
matt
Browse Repository
No Builds
No Audits
e67905a484d2 Include image alt text in fediverse attachment data
Author
matt
Browse Repository
No Builds
No Audits
c4d0ac637350 Fix password-protected blogs not unlocking after cookie expires
Author
matt
Browse Repository
No Builds
No Audits
0d778f211d44 Fix open-redirect in the login flow
Author
matt
Browse Repository
No Builds
No Audits
cd3f40855edf Prevent unauthorized users from updating collection attributes
Author
matt
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

.github/

workflows/

config/

less/

mailer/

static/

fonts/

MaterialIcons-Regular.eot

MaterialIcons-Regular.svg

MaterialIcons-Regular.ttf

js/

webmonetization.js

template_render_test.go

templates.go

templates/

include/

user/

rWF5e267eb26240

View Options

.github/dependabot.yml

View Options

.github/workflows/docker-publish.yml

View Options

Dockerfile

View Options

Makefile

View Options

README.md

View Options

account.go

View Options

account_import.go

View Options

activitypub.go

View Options

app.go

View Options

collections.go

View Options

config/config.go

View Options

database.go

View Options

email.go

View Options

go.mod

View Options

go.sum

View Options

handle.go

View Options

invites.go

View Options

keys.go

View Options

less/Makefile

View Options

less/icons.less

View Options

mailer/mailer.go

View Options

mailer/mailer_test.go

View Options

monetization.go

View Options

oauth_generic.go

View Options

oauth_signup.go

View Options

postrender.go

View Options

posts.go

View Options

posts_test.go

View Options

routes.go

View Options

signup_test.go

View Options

static/fonts/MaterialIcons-Regular.eot

View Options

static/fonts/MaterialIcons-Regular.svg

View Options

static/fonts/MaterialIcons-Regular.ttf

View Options

static/js/webmonetization.js

View Options

template_render_test.go

View Options

templates.go

View Options

templates/include/post-render.tmpl

View Options

templates/user/collection.tmpl

View Options

templates/user/import.tmpl

View Options

templates/user/invite.tmpl

View Options

templates/user/settings.tmpl

View Options

unregisteredusers.go

View Options

Merge branch 'develop'5e267eb26240Actions

Description

Details

Event Timeline

Merged Changes

Changes (43)

rWF5e267eb26240

.github/dependabot.yml

.github/workflows/docker-publish.yml

Dockerfile

Makefile

README.md

account.go

account_import.go

activitypub.go

app.go

collections.go

config/config.go

database.go

email.go

go.mod

go.sum

handle.go

invites.go

keys.go

less/Makefile

less/icons.less

mailer/mailer.go

mailer/mailer_test.go

monetization.go

oauth_generic.go

oauth_signup.go

postrender.go

posts.go

posts_test.go

routes.go

signup_test.go

static/fonts/MaterialIcons-Regular.eot

static/fonts/MaterialIcons-Regular.svg

static/fonts/MaterialIcons-Regular.ttf

static/js/webmonetization.js

template_render_test.go

templates.go

templates/include/post-render.tmpl

templates/user/collection.tmpl

templates/user/import.tmpl

templates/user/invite.tmpl

templates/user/settings.tmpl

unregisteredusers.go

webfinger.go

Merge branch 'develop'
5e267eb26240
Actions