Merge branch 'develop' into activitypub-mentions
68d63d3fef73
Actions

Description

Merge branch 'develop' into activitypub-mentions

Details

Provenance

matt	Authored on Feb 8 2020, 4:51 PM

Parents

rWFfec0eb2a0bc5: Merge pull request #251 from writeas/fix-memory-leak
rWF8c1bf2ddd55a: Merge branch 'markdown-API' into activitypub-mentions

Branches

Unknown

Tags

Unknown

Event Timeline

matt committed rWF68d63d3fef73: Merge branch 'develop' into activitypub-mentions (authored by matt).Feb 8 2020, 4:51 PM

Merged Changes

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

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
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
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
fe26594e8cff Merge pull request #245 from writeas/fix-editor-open-access
Author
matt
Browse Repository
No Builds
No Audits
30032e74a019 Add helpful text on Drafts page
Author
matt
Browse Repository
No Builds
No Audits
b336e95e1244 Render HTML entities in Drafts list
Author
matt
Browse Repository
No Builds
No Audits
2c075c0347a4 update upgrade script for recent changes
Author
robjloranger
Browse Repository
No Builds
No Audits
8e09e7297912 Require authenticated user for editor access
Author
matt
Browse Repository
No Builds
No Audits
b9914dd65a92 Merge pull request #244 from writeas/oauth-signup-tweaks
Author
matt
Browse Repository
No Builds
No Audits
c1ec6b26051e Fix copyright years in oauth_slack.go
Author
matt
Browse Repository
No Builds
No Audits
dcdd4dd1ef19 Add and update copyright notices
Author
matt
Browse Repository
No Builds
No Audits
803dd78df5ea Remove Password field from OAuth signup page
Author
matt
Browse Repository
No Builds
No Audits
f7dabd39c2c8 Skip password requirement on OAuth signup
Author
matt
Browse Repository
No Builds
No Audits
b5a38efd2853 Fall back to username as coll title on OAuth signup
Author
matt
Browse Repository
No Builds
No Audits
130c9eb7475d Change Blog Title to Display Name in OAuth signup
Author
matt
Browse Repository
No Builds
No Audits
6842ab2e3be7 Rename collTitle from alias
Author
matt
Browse Repository
No Builds
No Audits
4d5c89e7efec Fix false login state on OAuth signup page
Author
matt
Browse Repository
No Builds
No Audits
33a6129d1e4e Add async username check on OAuth signup form
Author
matt
Browse Repository
No Builds
No Audits
f2f779e4a2d2 Generate non-colliding usernames in all lowercase
Author
matt
Browse Repository
No Builds
No Audits
d2978597053e Reserve the username "oauth"
Author
matt
Browse Repository
No Builds
No Audits
75e2b6032820 Merge pull request #172 from writeas/import-text
Author
matt
Browse Repository
No Builds
No Audits
3e97625cca86 Fix Unix timestamps on client during import
Author
matt
Browse Repository
No Builds
No Audits
65e2e5126bb1 Revert "Fix unix timestamp in file upload"
Author
matt
Browse Repository
No Builds
No Audits
2b066997d131 Fix unix timestamp in file upload
Author
matt
Browse Repository
No Builds
No Audits
98ca449b6640 add arm-6
Author
Matti R <matti@mdranta.net>
Browse Repository
No Builds
No Audits
aae2f28bb673 pass original file modified date for imports
Author
robjloranger
Browse Repository
No Builds
No Audits
f4c6ce76dd14 Switch to a maintained fork of XGO
Author
Matti R <matti@mdranta.net>
Browse Repository
No Builds
No Audits
c7b797929bfc Merge pull request #238 from writeas/oauth-bugfix-alias-signature
Author
matt
Browse Repository
No Builds
No Audits
f7995bee48fc Fixing bug where display name was not set correctly.
Author
ngerakines
Browse Repository
No Builds
No Audits
659392ac4f5c Merge pull request #235 from writeas/date-stamps
Author
matt
Browse Repository
No Builds
No Audits
c00daf64b0bd Merge pull request #236 from writeas/oauth-provider-callback-hotfix
Author
matt
Browse Repository
No Builds
No Audits
a77d403dfbe7 Fixing bug in oauth callback URL registration.
Author
ngerakines
Browse Repository
No Builds
No Audits
9958a1122bac Show published date on post pages if Blog
Author
matt
Browse Repository
No Builds
No Audits
812136357e9e Move Format from DisplayCollection to CollectionObj
Author
matt
Browse Repository
No Builds
No Audits
f5d21c8c1a2f Reorder federation check logic on upload
Author
matt
Browse Repository
No Builds
No Audits
18d3456a23be Tweak user-facing upload errors + internal logs
Author
matt
Browse Repository
No Builds
No Audits

Changes (62)

Path

Size

author/

config/

less/

migrations/

	v6.go
	v4.go

pages/

scripts/

static/

img/

sign_in_with_slack.png

sign_in_with_slack@2x.png

js/

localdate.js

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

include/

password-collection.tmpl

user/

include/

rWF68d63d3fef73

View Options

.travis.yml

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

collections.go

View Options

config/config.go

View Options

config/funcs.go

View Options

database.go

View Options

database_test.go

View Options

db/alter.go

View Options

db/alter_test.go

View Options

db/create.go

View Options

db/create_test.go

View Options

db/dialect.go

View Options

db/index.go

View Options

db/raw.go

View Options

db/tx.go

View Options

go.mod

View Options

go.sum

View Options

handle.go

View Options

less/core.less

View Options

less/post-temp.less

View Options

main_test.go

View Options

migrations/migrations.go

View Options

migrations/v4.go

View Options

migrations/v5.go

View Options

migrations/v6.go

View Options

oauth.go

View Options

oauth/state.go

View Options

oauth_signup.go

View Options

oauth_slack.go

View Options

oauth_test.go

View Options

oauth_writeas.go

View Options

pad.go

View Options

pages/login.tmpl

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/img/sign_in_with_slack.png

View Options

static/img/sign_in_with_slack@2x.png

View Options

static/js/localdate.js

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/password-collection.tmpl

View Options

templates/read.tmpl

View Options

templates/user/articles.tmpl

View Options

templates/user/import.tmpl

View Options

templates/user/include/header.tmpl

View Options

templates/user/invite.tmpl

Merge branch 'develop' into activitypub-mentions68d63d3fef73Actions

Description

Details

Event Timeline

Merged Changes

Changes (62)

rWF68d63d3fef73

.travis.yml

Makefile

account.go

account_import.go

activitypub.go

admin.go

app.go

author/author.go

collections.go

config/config.go

config/funcs.go

database.go

database_test.go

db/alter.go

db/alter_test.go

db/create.go

db/create_test.go

db/dialect.go

db/index.go

db/raw.go

db/tx.go

go.mod

go.sum

handle.go

less/core.less

less/post-temp.less

main_test.go

migrations/migrations.go

migrations/v4.go

migrations/v5.go

migrations/v6.go

oauth.go

oauth/state.go

oauth_signup.go

oauth_slack.go

oauth_test.go

oauth_writeas.go

pad.go

pages/login.tmpl

pages/signup-oauth.tmpl

postrender.go

posts.go

routes.go

scripts/upgrade-server.sh

static/img/sign_in_with_slack.png

static/img/sign_in_with_slack@2x.png

static/js/localdate.js

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/password-collection.tmpl

templates/read.tmpl

templates/user/articles.tmpl

templates/user/import.tmpl

templates/user/include/header.tmpl

templates/user/invite.tmpl

Merge branch 'develop' into activitypub-mentions
68d63d3fef73
Actions