Merge branch 'develop' into activitypub-mentions
d8df15855cfb
Actions

Description

Merge branch 'develop' into activitypub-mentions

Details

Provenance

matt	Authored on Nov 26 2019, 6:19 PM

Parents

rWFbd99044e9c92: Fix 500 on tags page
rWF1bda0434de89: Unmarshal to `webfinger.Resource` instead of interface{}

Branches

Unknown

Tags

Unknown

Event Timeline

matt committed rWFd8df15855cfb: Merge branch 'develop' into activitypub-mentions (authored by matt).Nov 26 2019, 6:19 PM

Merged Changes

bd99044e9c92 Fix 500 on tags page
Author
matt
Browse Repository
No Builds
No Audits
2899d98cfd9f Fix collection post 500 when not logged in
Author
matt
Browse Repository
No Builds
No Audits
278e4f6242d1 Bump version to 0.11.1
Author
matt
Browse Repository
No Builds
No Audits
3d49baf39a0f Improve non-chorus site-wide header
Author
matt
Browse Repository
No Builds
No Audits
474a5d908dfb Merge pull request #209 from writeas/fix-host-single-user-templates
Author
robjloranger
Browse Repository
No Builds
No Audits
80362000feed Skip logging default pad template fallback
Author
matt
Browse Repository
No Builds
No Audits
79f35a0ccdf6 Fix collection template issues introduced in #205
Author
matt
Browse Repository
No Builds
No Audits
bca678aee5a5 Merge pull request #174 from writeas/T661-disable-accounts
Author
matt
Browse Repository
No Builds
No Audits
53586d9cb825 Merge branch 'develop' into T661-disable-accounts
Author
matt
Browse Repository
No Builds
No Audits
5839c2ac4da3 Merge pull request #192 from writeas/T695-reset-user-pass
Author
matt
Browse Repository
No Builds
No Audits
8f24da94a62a Bump version to 0.11.0
Author
matt
Browse Repository
No Builds
No Audits
5644e8d2516f Fix "silenced" alert styles on more pages
Author
matt
Browse Repository
No Builds
No Audits
7f96e8c38421 Rename UserSuspended to UserSilenced
Author
matt
Browse Repository
No Builds
No Audits
c3f76a3ab840 Change "suspend" to "silence" where user-facing
Author
matt
Browse Repository
No Builds
No Audits
f7550a0da8f6 Change more suspension check logic
Author
matt
Browse Repository
No Builds
No Audits
d4206cd5f8bb Move to web-core v1.2.0
Author
matt
Browse Repository
No Builds
No Audits
a9b5bb2f6bab Fix reset user's email address display
Author
matt
Browse Repository
No Builds
No Audits
d5dd007ff738 Change Reset Password button style
Author
matt
Browse Repository
No Builds
No Audits
3e8d1014d9c8 Tweak admin reset confirmation copy
Author
matt
Browse Repository
No Builds
No Audits
422c16f39a6c Tweak admin user pass reset success copy
Author
matt
Browse Repository
No Builds
No Audits
f673f9b562fa Reset password to sorta-sensical string
Author
matt
Browse Repository
No Builds
No Audits
6d4ec0b17db8 Remove extra OwnUserPage field
Author
matt
Browse Repository
No Builds
No Audits
6e09fcb9e2a3 Change password reset endpoint to /admin/user/{Username}/passphrase
Author
matt
Browse Repository
No Builds
No Audits
a65917ae2ee8 Merge pull request #205 from writeas/fix-csv-export
Author
matt
Browse Repository
No Builds
No Audits
2c2ee0c00cd8 Tweak "suspended" notification copy
Author
matt
Browse Repository
No Builds
No Audits
f66d5bf1e8fa use .Host instead of adding .Hostname
Author
robjloranger
Browse Repository
No Builds
No Audits
c0b75f6b65e3 pass hostname to canonical url in post templates
Author
robjloranger
Browse Repository
No Builds
No Audits
e1149cd1e951 Fix URLs in CSV exports
Author
matt
Browse Repository
No Builds
No Audits
619b10c3e5f4 Fix "suspended" message location on Drafts
Author
matt
Browse Repository
No Builds
No Audits
280c32afdce4 Confirm suspension before submitting the form
Author
matt
Browse Repository
No Builds
No Audits
c9f721983100 Move user status in list out of <a>
Author
matt
Browse Repository
No Builds
No Audits
da7dcfee6aff Move admin template IsSuspended logic into method
Author
matt
Browse Repository
No Builds
No Audits
3167e19b7757 Merge pull request #189 from writeas/T697-blog-default
Author
matt
Browse Repository
No Builds
No Audits
fea62b14ceb4 Merge pull request #185 from writeas/accept-json
Author
matt
Browse Repository
No Builds
No Audits
fcf074cf4086 Merge pull request #166 from writeas/159-follow-panic
Author
matt
Browse Repository
No Builds
No Audits
bf4f8793832d Update hosting options in README
Author
matt
Browse Repository
No Builds
No Audits
5429ca4ab092 add check for suspended user on single posts
Author
robjloranger
Browse Repository
No Builds
No Audits
f85f0751a3a7 address PR comments
Author
robjloranger
Browse Repository
No Builds
No Audits
9873fc443fca Merge branch 'develop' into T661-disable-accounts
Author
matt
Browse Repository
No Builds
No Audits
aa9efc7b3721 allow admin to reset user passwords
Author
robjloranger
Browse Repository
No Builds
No Audits
02dd1909459f T697 default to user's first blog instead of draft
Author
robjloranger
Browse Repository
No Builds
No Audits
f87371b594ce update IsJSON to check for Accept header
Author
robjloranger
Browse Repository
No Builds
No Audits
77f7b4a522cf Add account suspension features
Author
robjloranger
Browse Repository
No Builds
No Audits
95a98234eb9d fix panic on duplicate remoteuser key
Author
robjloranger
Browse Repository
No Builds
No Audits

Changes (47)

Path

Size

less/

migrations/

	v4.go
	v3.go

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

password-collection.tmpl

post.tmpl

read.tmpl

user/

admin/

include/

rWFd8df15855cfb

View Options

README.md

View Options

account.go

View Options

activitypub.go

View Options

admin.go

View Options

app.go

View Options

collections.go

View Options

database.go

View Options

errors.go

View Options

export.go

View Options

feed.go

View Options

go.mod

View Options

go.sum

View Options

handle.go

View Options

invites.go

View Options

less/core.less

View Options

migrations/migrations.go

View Options

migrations/v3.go

View Options

migrations/v4.go

View Options

pad.go

View Options

posts.go

View Options

read.go

View Options

request.go

View Options

routes.go

View Options

templates.go

View Options

templates/base.tmpl

View Options

templates/chorus-collection-post.tmpl

View Options

templates/chorus-collection.tmpl

View Options

templates/collection-post.tmpl

View Options

templates/collection-tags.tmpl

View Options

templates/collection.tmpl

View Options

templates/edit-meta.tmpl

View Options

templates/pad.tmpl

View Options

templates/password-collection.tmpl

View Options

templates/post.tmpl

View Options

templates/read.tmpl

View Options

templates/user/admin/users.tmpl

View Options

templates/user/admin/view-user.tmpl

View Options

templates/user/articles.tmpl

View Options

templates/user/collection.tmpl

View Options

templates/user/collections.tmpl

View Options

templates/user/include/header.tmpl

View Options

templates/user/include/suspended.tmpl

View Options

templates/user/settings.tmpl

View Options

templates/user/stats.tmpl

View Options

unregisteredusers.go

View Options

users.go

View Options

Merge branch 'develop' into activitypub-mentionsd8df15855cfbActions

Description

Details

Event Timeline

Merged Changes

Changes (47)

rWFd8df15855cfb

README.md

account.go

activitypub.go

admin.go

app.go

collections.go

database.go

errors.go

export.go

feed.go

go.mod

go.sum

handle.go

invites.go

less/core.less

migrations/migrations.go

migrations/v3.go

migrations/v4.go

pad.go

posts.go

read.go

request.go

routes.go

templates.go

templates/base.tmpl

templates/chorus-collection-post.tmpl

templates/chorus-collection.tmpl

templates/collection-post.tmpl

templates/collection-tags.tmpl

templates/collection.tmpl

templates/edit-meta.tmpl

templates/pad.tmpl

templates/password-collection.tmpl

templates/post.tmpl

templates/read.tmpl

templates/user/admin/users.tmpl

templates/user/admin/view-user.tmpl

templates/user/articles.tmpl

templates/user/collection.tmpl

templates/user/collections.tmpl

templates/user/include/header.tmpl

templates/user/include/suspended.tmpl

templates/user/settings.tmpl

templates/user/stats.tmpl

unregisteredusers.go

users.go

webfinger.go

Merge branch 'develop' into activitypub-mentions
d8df15855cfb
Actions