Merge branch 'develop' into acme-v2
42467fc9c1cd
Actions

Description

Merge branch 'develop' into acme-v2

Details

Provenance

matt	Authored on Feb 9 2020, 6:32 PM
GitHub <noreply@github.com>	Committed on Feb 9 2020, 6:32 PM

Parents

rWFab2b8dff7f3a: Merge pull request #249 from writeas/fix-activitypub-client
rWF80cffbb3ecb8: update golang.org/x/crypto vendor to use acme v2 also run go mod tidy to clean…

Branches

Unknown

Tags

Unknown

References

refs/pull/240/head

Event Timeline

Merged Changes

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

ab2b8dff7f3a Merge pull request #249 from writeas/fix-activitypub-client
Author
matt
Browse Repository
No Builds
No Audits
859702f3e7a5 Merge pull request #210 from writeas/rename-account-suspend
Author
matt
Browse Repository
No Builds
No Audits
7023b74d12da Update calls and vars for Invites and elsewhere
Author
matt
Browse Repository
No Builds
No Audits
629d40b54904 Fix collection rendering after merge
Author
matt
Browse Repository
No Builds
No Audits
f70c1dfaa500 Merge branch 'develop' into rename-account-suspend
Author
matt
Browse Repository
No Builds
No Audits
468bbf2187a8 Merge branch 'develop' into rename-account-suspend
Author
matt
Browse Repository
No Builds
No Audits
252d59d3f75a Merge pull request #208 from writeas/silence-invites
Author
matt
Browse Repository
No Builds
No Audits
b78f64bad3d0 Don't fail Invite page rendering on IsUserSuspended check
Author
matt
Browse Repository
No Builds
No Audits
8cfffb565053 Disable form items on Invite page when silenced
Author
matt
Browse Repository
No Builds
No Audits
6d3803bfe82f Merge pull request #241 from writeas/post-time-fix
Author
matt
Browse Repository
No Builds
No Audits
f902f65365aa Merge pull request #259 from writeas/fix-edit-route-permissions
Author
matt
Browse Repository
No Builds
No Audits
1a10bb3ed60f Merge pull request #252 from writeas/fix-mix-of-collations
Author
matt
Browse Repository
No Builds
No Audits
f8a40fac4b08 Merge pull request #202 from writeas/T319-delete-account
Author
matt
Browse Repository
No Builds
No Audits
666bd1b9d1e5 Show correct error when user not found in admin panel
Author
matt
Browse Repository
No Builds
No Audits
af14bcbb7804 Clean up oauth_users table on account deletion
Author
matt
Browse Repository
No Builds
No Audits
c9faff178d95 Don't float posts on account deletion
Author
matt
Browse Repository
No Builds
No Audits
9d360f0e4122 Merge branch 'develop' into T319-delete-account
Author
matt
Browse Repository
No Builds
No Audits
9be05ef32e81 Merge pull request #195 from writeas/activitypub-mentions
Author
matt
Browse Repository
No Builds
No Audits
9589612d0e3e Add TODOs for improving GetProfilePageFromHandle()
Author
matt
Browse Repository
No Builds
No Audits
ca4b0acf6028 Fix error logging format in RemoteLookup
Author
matt
Browse Repository
No Builds
No Audits
457051106d9d Add u-url class and span in mention link
Author
matt
Browse Repository
No Builds
No Audits
eac223158af8 Move remote user URL to /@/
Author
matt
Browse Repository
No Builds
No Audits
867eb53b3596 Show 404 when remote user not found
Author
matt
Browse Repository
No Builds
No Audits
81edb739dda0 Fix mention links
Author
matt
Browse Repository
No Builds
No Audits
bb63e648835f Clean up getProfilePageFromHandle
Author
matt
Browse Repository
No Builds
No Audits
68d63d3fef73 Merge branch 'develop' into activitypub-mentions
Author
matt
Browse Repository
No Builds
No Audits
1b8f62d143ef Require authenticated user on draft edit routes
Author
matt
Browse Repository
No Builds
No Audits
fec0eb2a0bc5 Merge pull request #251 from writeas/fix-memory-leak
Author
matt
Browse Repository
No Builds
No Audits
6e36868e921c Merge pull request #239 from techknowlogick/switch-xgo
Author
matt
Browse Repository
No Builds
No Audits
1fd42302678a Merge pull request #248 from writeas/fix-drafts-html-entities
Author
matt
Browse Repository
No Builds
No Audits
0ed3059bd735 add xgo to go mod
Author
Matti R <matti@mdranta.net>
Browse Repository
No Builds
No Audits
ff33c59f27c2 Merge pull request #180 from writeas/cache-control
Author
matt
Browse Repository
No Builds
No Audits
5452bf0c0d4b Merge pull request #254 from writeas/fix-local-datetime
Author
matt
Browse Repository
No Builds
No Audits
51700cc7da47 Ignore "mix of collations" error on invite SELECT
Author
matt
Browse Repository
No Builds
No Audits
bc9455db4fda Fix datetime attributes on read.tmpl
Author
matt
Browse Repository
No Builds
No Audits
5de2f633e15a Fix localdate.js not included on Tags page
Author
matt
Browse Repository
No Builds
No Audits
50901d2446ca Fix date format in `datetime` attribute
Author
matt
Browse Repository
No Builds
No Audits
d6b7a5925f20 Restrict /invite/{code} route to valid chars
Author
matt
Browse Repository
No Builds
No Audits
93dd2341c2d2 Merge pull request #191 from writeas/T670-local-time
Author
matt
Browse Repository
No Builds
No Audits
4d5f58a7e657 Fix date-based post header links
Author
matt
Browse Repository
No Builds
No Audits
3e902461f117 Merge branch 'develop' into T670-local-time
Author
matt
Browse Repository
No Builds
No Audits
5ddd73eff42f Merge pull request #247 from writeas/update-upgrade-script
Author
matt
Browse Repository
No Builds
No Audits
b25cec838100 Update copyright in upgrade script
Author
matt
Browse Repository
No Builds
No Audits
be0885698e5a Change "restarting" to "starting" in upgrade script
Author
matt
Browse Repository
No Builds
No Audits
8fce34b70b03 Tidy up Go mod files
Author
matt
Browse Repository
No Builds
No Audits
ae1a892be00d Upgrade gorilla/sessions to v1.2.0
Author
matt
Browse Repository
No Builds
No Audits
bf8dcff01eb2 Quit AP goroutine early when there's no "to"
Author
matt
Browse Repository
No Builds
No Audits
8d3e755c8f5b Return pointer to http.Client in activityPubClient()
Author
matt
Browse Repository
No Builds
No Audits
bc9843dfa37d Add timeout on ActivityPub requests
Author
matt
Browse Repository
No Builds
No Audits
fe26594e8cff Merge pull request #245 from writeas/fix-editor-open-access
Author
matt
Browse Repository
No Builds
No Audits

Changes (53)

Path

Size

author/

cmd/

writefreely/

main.go

collections.go

database-no-sqlite.go

less/

migrations/

	v6.go
	v3.go

pages/

scripts/

static/

js/

localdate.js

templates.go

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

include/

user/

admin/

include/

	silenced.tmpl
	suspended.tmpl

rWF42467fc9c1cd

View Options

Makefile

View Options

account.go

View Options

account_import.go

View Options

activitypub.go

View Options

admin.go

View Options

app.go

View Options

author/author.go

View Options

cmd/writefreely/main.go

View Options

collections.go

View Options

database-no-sqlite.go

View Options

database-sqlite.go

View Options

database.go

View Options

errors.go

View Options

feed.go

View Options

go.mod

View Options

go.sum

View Options

invites.go

View Options

less/core.less

View Options

migrations/migrations.go

View Options

migrations/v6.go

View Options

oauth.go

View Options

oauth_signup.go

View Options

oauth_slack.go

View Options

pad.go

View Options

pages/signup-oauth.tmpl

View Options

postrender.go

View Options

posts.go

View Options

routes.go

View Options

scripts/upgrade-server.sh

View Options

static/js/localdate.js

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/include/posts.tmpl

View Options

templates/pad.tmpl

View Options

templates/post.tmpl

View Options

templates/read.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/import.tmpl

View Options

templates/user/include/header.tmpl

View Options

templates/user/include/silenced.tmpl

View Options

templates/user/include/suspended.tmpl

View Options

templates/user/invite.tmpl

View Options

templates/user/settings.tmpl

View Options

templates/user/stats.tmpl

View Options

Merge branch 'develop' into acme-v242467fc9c1cdActions

Description

Details

Event Timeline

Merged Changes

Changes (53)

rWF42467fc9c1cd

Makefile

account.go

account_import.go

activitypub.go

admin.go

app.go

author/author.go

cmd/writefreely/main.go

collections.go

database-no-sqlite.go

database-sqlite.go

database.go

errors.go

feed.go

go.mod

go.sum

invites.go

less/core.less

migrations/migrations.go

migrations/v6.go

oauth.go

oauth_signup.go

oauth_slack.go

pad.go

pages/signup-oauth.tmpl

postrender.go

posts.go

routes.go

scripts/upgrade-server.sh

static/js/localdate.js

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/include/posts.tmpl

templates/pad.tmpl

templates/post.tmpl

templates/read.tmpl

templates/user/admin/view-user.tmpl

templates/user/articles.tmpl

templates/user/collection.tmpl

templates/user/collections.tmpl

templates/user/import.tmpl

templates/user/include/header.tmpl

templates/user/include/silenced.tmpl

templates/user/include/suspended.tmpl

templates/user/invite.tmpl

templates/user/settings.tmpl

templates/user/stats.tmpl

webfinger.go

Merge branch 'develop' into acme-v2
42467fc9c1cd
Actions