Merge branch 'develop' into web-monetization-update
2b1daa29a620
Actions

Description

Merge branch 'develop' into web-monetization-update

Details

Provenance

matt	Authored on Fri, Jul 3, 9:55 PM

Parents

rWF34d8fea23e8a: Merge pull request #1689 from writefreely/revert-1683…
rWF5e5e1d3949d3: Fix Context on Notes

Branches

Unknown

Tags

Unknown

Event Timeline

matt committed rWF2b1daa29a620: Merge branch 'develop' into web-monetization-update (authored by matt).Fri, Jul 3, 9:55 PM

Merged Changes

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

34d8fea23e8a Merge pull request #1689 from writefreely/revert-1683…
Author
matt
Browse Repository
No Builds
No Audits
5ce4c73cd170 Revert "Bump docker/setup-qemu-action from 4.0.0 to 4.1.0"
Author
matt
Browse Repository
No Builds
No Audits
bdd1ce60b6b1 Merge pull request #1361 from writefreely/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
47ac55ff9c46 Merge pull request #1668 from writefreely/dependabot/github_actions/docker/logi…
Author
matt
Browse Repository
No Builds
No Audits
3fed27bf2cd8 Merge pull request #1683 from writefreely/dependabot/github_actions/docker/setu…
Author
matt
Browse Repository
No Builds
No Audits
3005c5adc48d Merge pull request #1667 from writefreely/dependabot/github_actions/docker/meta…
Author
matt
Browse Repository
No Builds
No Audits
95d132eed13a Merge pull request #1666 from writefreely/dependabot/github_actions/docker/buil…
Author
matt
Browse Repository
No Builds
No Audits
4e4d8b8af551 Merge pull request #1684 from writefreely/dependabot/github_actions/actions/che…
Author
matt
Browse Repository
No Builds
No Audits
fa2dd3e414f6 Add missing import in config.go
Author
matt
Browse Repository
No Builds
No Audits
4b863c848ce0 Update security vulnerability reporting info
Author
matt
Browse Repository
No Builds
No Audits
c022b3effecc Merge commit from fork
Author
matt
Browse Repository
No Builds
No Audits
826a0826fe75 Save config file with owner-only permissions
Author
matt
Browse Repository
No Builds
No Audits
4fa06465e8b4 Bump actions/checkout from 4 to 7
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
18f1e503dd3f Bump docker/setup-qemu-action from 4.0.0 to 4.1.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
c1e767c0ae74 Merge pull request #1669 from writefreely/dependabot/github_actions/docker/setu…
Author
matt
Browse Repository
No Builds
No Audits
fc873ab1fc95 Merge pull request #1674 from writefreely/dependabot/go_modules/golang.
Author
matt
Browse Repository
No Builds
No Audits
0dccbefd88fa Bump golang.org/x/crypto from 0.51.0 to 0.53.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
7d759e550f89 Merge pull request #1673 from writefreely/dependabot/go_modules/golang.
Author
matt
Browse Repository
No Builds
No Audits
68579c4c8ed3 Bump golang.org/x/net from 0.53.0 to 0.55.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
419a0fb7193b Merge pull request #1653 from writefreely/dependabot/go_modules/golang.
Author
matt
Browse Repository
No Builds
No Audits
72af74c60fc7 Bump docker/setup-buildx-action from 3.12.0 to 4.1.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
0721c9a150ec Bump docker/login-action from 4.0.0 to 4.2.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
66e1061f8f97 Bump docker/metadata-action from 6.0.0 to 6.1.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
43bec05c3b52 Bump docker/build-push-action from 7.0.0 to 7.2.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
c10c6a3ec357 Merge pull request #1641 from writefreely/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
794f3fb650ef Merge branch 'develop' into dependabot/go_modules/github.com/fatih/color-1.19.0
Author
matt
Browse Repository
No Builds
No Audits
3dea9eef46a8 Bump golang.org/x/crypto from 0.50.0 to 0.51.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
315b69a8fd91 Merge pull request #1657 from writefreely/dependabot/go_modules/golang.
Author
matt
Browse Repository
No Builds
No Audits
8ba05314f1b2 Merge pull request #1664 from writefreely/long-bcrypt-pass
Author
matt
Browse Repository
No Builds
No Audits
3e44c2908d31 Merge pull request #1665 from robertsilen/develop
Author
matt
Browse Repository
No Builds
No Audits
964318d28818 Document MariaDB support in README
Author
Robert Silén <robert.silen@mariadb.org>
Browse Repository
No Builds
No Audits
06ffb909027d Limit password to bcrypt's 72 bytes on the backend
Author
matt
Browse Repository
No Builds
No Audits
1021f0097867 Limit password to max characters supported by bcrypt in UI
Author
matt
Browse Repository
No Builds
No Audits
965863cc8460 Bump golang.org/x/net from 0.51.0 to 0.53.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
304276337a66 Merge pull request #1630 from writefreely/sort-subscribers
Author
matt
Browse Repository
No Builds
No Audits
a9d09882b10f Merge pull request #1647 from writefreely/markdown-preview
Author
matt
Browse Repository
No Builds
No Audits
cfccb120820f Merge pull request #1646 from writefreely/email-shortcodes
Author
matt
Browse Repository
No Builds
No Audits
bdc49f75a1e1 Merge pull request #1492 from writefreely/fix-post-date-format
Author
matt
Browse Repository
No Builds
No Audits
d84f5ea0a82e Merge pull request #1644 from writefreely/fix-prosemirror-html
Author
matt
Browse Repository
No Builds
No Audits
8ce6aabe55ad Fix email form not rendering from shortcode
Author
matt
Browse Repository
No Builds
No Audits
b5a3f22ba9f9 Merge pull request #1522 from writefreely/fix-reader-rss-redirect
Author
matt
Browse Repository
No Builds
No Audits
db49ad04728f Redirect Reader feed with Permanent 301, not Found 302
Author
matt
Browse Repository
No Builds
No Audits
8ee5ff015733 Fix whitespace in pad.less and pad.tmpl
Author
matt
Browse Repository
No Builds
No Audits
8633a7d69e46 Add Markdown preview to Plain Text editor
Author
matt
Browse Repository
No Builds
No Audits
13b3eace84ed Remove dependency on H.js in modals.js
Author
matt
Browse Repository
No Builds
No Audits
32e8b1089237 Move Email Subscription shortcode into constant
Author
matt
Browse Repository
No Builds
No Audits
f84325aa11d4 Remove "Enter" copy above email sub box in editor
Author
matt
Browse Repository
No Builds
No Audits
309629fd9d70 Keep email sub form disabled in Classic editor
Author
matt
Browse Repository
No Builds
No Audits
31461cf31f15 Add support for future `comment` shortcode (disabled) in Classic editor
Author
matt
Browse Repository
No Builds
No Audits
46f998f8d5df Render `` shortcode in Rich Text editor
Author
matt
Browse Repository
No Builds
No Audits

Changes (62)

Path

Size

.github/

workflows/

author/

config/

database_activitypub.go

db/

less/

mailer/

migrations/

	v17.go
	v9.go

page/

pages/

parse/

prose/

markdownSerializer.js

spam/

static/

img/

ic_preview@2x.png

ic_preview_dark@2x.png

js/

templates/

user/

include/

rWF2b1daa29a620

View Options

.github/workflows/docker-publish.yml

View Options

Dockerfile

View Options

README.md

View Options

SECURITY.md

View Options

account.go

View Options

activitypub.go

View Options

app.go

View Options

author/author.go

View Options

config/config.go

View Options

config/funcs.go

View Options

database-sqlite.go

View Options

database.go

View Options

database_activitypub.go

View Options

database_test.go

View Options

db/create_test.go

View Options

email.go

View Options

go.mod

View Options

go.sum

View Options

jobs.go

View Options

keys.go

View Options

less/core.less

View Options

less/pad.less

View Options

less/prose-editor.less

View Options

mailer/mailer.go

View Options

main_test.go

View Options

migrations/migrations.go

View Options

migrations/v17.go

View Options

nodeinfo.go

View Options

oauth_generic.go

View Options

oauth_gitea.go

View Options

oauth_signup.go

View Options

oauth_slack.go

View Options

oauth_test.go

View Options

page/page.go

View Options

pages.go

View Options

pages/landing.tmpl

View Options

pages/reset.tmpl

View Options

pages/signup.tmpl

View Options

parse/posts.go

View Options

postrender.go

View Options

posts.go

View Options

prose/markdownParser.js

View Options

prose/markdownSerializer.js

View Options

prose/menu.js

View Options

prose/package.json

View Options

prose/prose.js

View Options

prose/schema.js

View Options

read.go

View Options

routes.go

View Options

session.go

View Options

spam/email.go

View Options

static/img/ic_preview@2x.png

View Options

static/img/ic_preview_dark@2x.png

View Options

static/js/modals.js

View Options

templates/classic.tmpl

View Options

templates/edit-meta.tmpl

View Options

templates/pad.tmpl

View Options

templates/user/collection.tmpl

View Options

templates/user/include/header.tmpl

View Options

templates/user/settings.tmpl

View Options

templates/user/stats.tmpl

View Options

Merge branch 'develop' into web-monetization-update2b1daa29a620Actions

Description

Details

Event Timeline

Merged Changes

Changes (62)

rWF2b1daa29a620

.github/workflows/docker-publish.yml

Dockerfile

README.md

SECURITY.md

account.go

activitypub.go

app.go

author/author.go

config/config.go

config/funcs.go

database-sqlite.go

database.go

database_activitypub.go

database_test.go

db/create_test.go

email.go

go.mod

go.sum

jobs.go

keys.go

less/core.less

less/pad.less

less/prose-editor.less

mailer/mailer.go

main_test.go

migrations/migrations.go

migrations/v17.go

nodeinfo.go

oauth_generic.go

oauth_gitea.go

oauth_signup.go

oauth_slack.go

oauth_test.go

page/page.go

pages.go

pages/landing.tmpl

pages/reset.tmpl

pages/signup.tmpl

parse/posts.go

postrender.go

posts.go

prose/markdownParser.js

prose/markdownSerializer.js

prose/menu.js

prose/package.json

prose/prose.js

prose/schema.js

read.go

routes.go

session.go

spam/email.go

static/img/ic_preview@2x.png

static/img/ic_preview_dark@2x.png

static/js/modals.js

templates/classic.tmpl

templates/edit-meta.tmpl

templates/pad.tmpl

templates/user/collection.tmpl

templates/user/include/header.tmpl

templates/user/settings.tmpl

templates/user/stats.tmpl

updates.go

Merge branch 'develop' into web-monetization-update
2b1daa29a620
Actions