Merge pull request #174 from writeas/T661-disable-accounts
bca678aee5a5
Actions

Description

Merge pull request #174 from writeas/T661-disable-accounts

Add account suspension features

Details

Provenance

matt	Authored on Nov 11 2019, 5:08 PM
GitHub <noreply@github.com>	Committed on Nov 11 2019, 5:08 PM

Parents

rWF53586d9cb825: Merge branch 'develop' into T661-disable-accounts
rWF5839c2ac4da3: Merge pull request #192 from writeas/T695-reset-user-pass

Branches

Unknown

Tags

Unknown

References

tag: v0.11.0

Event Timeline

GitHub <noreply@github.com> committed rWFbca678aee5a5: Merge pull request #174 from writeas/T661-disable-accounts (authored by matt).Nov 11 2019, 5:08 PM

Merged Changes

53586d9cb825 Merge branch 'develop' into T661-disable-accounts
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
2c2ee0c00cd8 Tweak "suspended" notification copy
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
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
77f7b4a522cf Add account suspension features
Author
robjloranger
Browse Repository
No Builds
No Audits

Changes (35)

Path

Size

less/

migrations/

	v3.go
	v2.go

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

password-collection.tmpl

post.tmpl

user/

admin/

include/

rWFbca678aee5a5

View Options

account.go

View Options

activitypub.go

View Options

admin.go

View Options

collections.go

View Options

database.go

View Options

errors.go

View Options

feed.go

View Options

invites.go

View Options

less/core.less

View Options

migrations/migrations.go

View Options

migrations/v3.go

View Options

pad.go

View Options

posts.go

View Options

read.go

View Options

routes.go

View Options

templates.go

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/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/suspended.tmpl

View Options

templates/user/settings.tmpl

View Options

templates/user/stats.tmpl

View Options

users.go

View Options

Merge pull request #174 from writeas/T661-disable-accountsbca678aee5a5Actions

Description

Details

Event Timeline

Merged Changes

Changes (35)

rWFbca678aee5a5

account.go

activitypub.go

admin.go

collections.go

database.go

errors.go

feed.go

invites.go

less/core.less

migrations/migrations.go

migrations/v3.go

pad.go

posts.go

read.go

routes.go

templates.go

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/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/suspended.tmpl

templates/user/settings.tmpl

templates/user/stats.tmpl

users.go

webfinger.go

Merge pull request #174 from writeas/T661-disable-accounts
bca678aee5a5
Actions