Merge branch 'develop' into T670-local-time
3e902461f117
Actions

Description

Merge branch 'develop' into T670-local-time

Details

Provenance

matt	Authored on Jan 29 2020, 11:24 AM

Parents

rWF5ddd73eff42f: Merge pull request #247 from writeas/update-upgrade-script
rWF513765c09f01: include localdate in all collections +reader

Branches

Unknown

Tags

Unknown

Event Timeline

matt committed rWF3e902461f117: Merge branch 'develop' into T670-local-time (authored by matt).Jan 29 2020, 11:24 AM

Merged Changes

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

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
fe26594e8cff Merge pull request #245 from writeas/fix-editor-open-access
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
aae2f28bb673 pass original file modified date for imports
Author
robjloranger
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
03eeca179e00 Fix potential resource leaks from defer calls in for loop
Author
matt
Browse Repository
No Builds
No Audits
6860c0a3ff23 Fix collection logic on import
Author
matt
Browse Repository
No Builds
No Audits
5b7f37aed8f7 Restyle Import page
Author
matt
Browse Repository
No Builds
No Audits
a2a9f6097679 Merge pull request #232 from writeas/T712-oauth-registration-improvements
Author
matt
Browse Repository
No Builds
No Audits
8ddfce4f199a oauth signup page changes per PR feedback. T712
Author
ngerakines
Browse Repository
No Builds
No Audits
6d79ed3cfdf3 Updating oauth form validation per PR feedback. T712
Author
ngerakines
Browse Repository
No Builds
No Audits
5e765652719d Code cleanup per PR feedback. T712
Author
ngerakines
Browse Repository
No Builds
No Audits
e5671cd1e6f8 Fix GetCollections() call
Author
matt
Browse Repository
No Builds
No Audits
be76f865a451 Merge branch 'develop' into import-text
Author
matt
Browse Repository
No Builds
No Audits
d66091a356fa Bump Travis build to Go 1.13
Author
matt
Browse Repository
No Builds
No Audits
28cf4dd5f574 Added state location register hook. T712.
Author
ngerakines
Browse Repository
No Builds
No Audits
9be534038b43 Merge pull request #233 from writeas/markdown-api-rename
Author
matt
Browse Repository
No Builds
No Audits
9fb8de48d4c6 Rename base_url to collection_url in MD API
Author
matt
Browse Repository
No Builds
No Audits
77e012680853 Move and restyle OAuth login links
Author
matt
Browse Repository
No Builds
No Audits
5249456ec679 Add .btn.cta link styles
Author
matt
Browse Repository
No Builds
No Audits
6429d495a2e9 Implemented /oauth/signup. T712
Author
ngerakines
Browse Repository
No Builds
No Audits
a4579719cd87 Merge pull request #197 from writeas/markdown-API
Author
matt
Browse Repository
No Builds
No Audits
97b25628fb64 Merge pull request #230 from writeas/T710-oauth-slack
Author
matt
Browse Repository
No Builds
No Audits

Changes (80)

Path

Size

author/

config/

less/

migrations/

	v3.go
	v2.go

pages/

scripts/

static/

img/

sign_in_with_slack.png

sign_in_with_slack@2x.png

templates.go

templates/

base.tmpl

chorus-collection-post.tmpl

chorus-collection.tmpl

user/

admin/

include/

rWF3e902461f117

View Options

.travis.yml

View Options

Makefile

View Options

README.md

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

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

less/post-temp.less

View Options

main_test.go

View Options

migrations/migrations.go

View Options

migrations/v3.go

View Options

migrations/v4.go

View Options

migrations/v5.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

read.go

View Options

request.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

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

View Options

templates/user/include/header.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

unregisteredusers.go

View Options

users.go

View Options

Merge branch 'develop' into T670-local-time3e902461f117Actions

Description

Details

Event Timeline

Merged Changes

Changes (80)

rWF3e902461f117

.travis.yml

Makefile

README.md

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

errors.go

export.go

feed.go

go.mod

go.sum

handle.go

invites.go

less/core.less

less/post-temp.less

main_test.go

migrations/migrations.go

migrations/v3.go

migrations/v4.go

migrations/v5.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

read.go

request.go

routes.go

scripts/upgrade-server.sh

static/img/sign_in_with_slack.png

static/img/sign_in_with_slack@2x.png

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

templates/user/include/header.tmpl

templates/user/include/suspended.tmpl

templates/user/invite.tmpl

Merge branch 'develop' into T670-local-time
3e902461f117
Actions