Merge develop branch into oauth-gitea and resolve pages/login.tmpl conflict.
8675eb0f95f5
Actions

Description

Merge develop branch into oauth-gitea and resolve pages/login.tmpl conflict.

Details

Provenance

Authored on Apr 23 2020, 11:24 AM

Parents

rWF99d86a748945: Merge pull request #303 from writeas/fix-oauth-account-creation
rWF0e1459c6b251: Remove address variable - to make Locations use host value from config instead.

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

99d86a748945 Merge pull request #303 from writeas/fix-oauth-account-creation
Author
matt
Browse Repository
No Builds
No Audits
8e16bac12c5b Update README
Author
matt
Browse Repository
No Builds
No Audits
7420039770f7 Merge branch 'develop' of github.com:writeas/writefreely into develop
Author
matt
Browse Repository
No Builds
No Audits
f15acf388057 Reduce vertical margin around OAuth buttons
Author
matt
Browse Repository
No Builds
No Audits
308b1a72825c Remove "login" verbiage on OAuth signup page
Author
matt
Browse Repository
No Builds
No Audits
fd97539f85da Mention unset password on failed login
Author
matt
Browse Repository
No Builds
No Audits
cf3d5588c2a9 Move unique OAuth username creation to client-side
Author
matt
Browse Repository
No Builds
No Audits
6fc166174bf6 Merge pull request #299 from writeas/fix-friendica-federation
Author
matt
Browse Repository
No Builds
No Audits
0c6d3e45e464 Update Go modules
Author
matt
Browse Repository
No Builds
No Audits
b97038e696a4 Better describe usage stats in setup process
Author
matt
Browse Repository
No Builds
No Audits
37ccf69d81fa Increase App Settings checkbox and select sizes
Author
matt
Browse Repository
No Builds
No Audits
0127e38ed041 Reorder App Settings page and improve descriptions
Author
matt
Browse Repository
No Builds
No Audits
7b7df5535ed8 Run go fmt on oauth_test.go
Author
matt
Browse Repository
No Builds
No Audits
5400f416c016 Reduce db calls on normal invite-based signup
Author
matt
Browse Repository
No Builds
No Audits
ca4a576c3167 Support OAuth registration with invite code
Author
matt
Browse Repository
No Builds
No Audits
93c2773412a4 Prevent account creation via OAuth when registration is closed
Author
matt
Browse Repository
No Builds
No Audits
5e4ed5d9bcf2 Remove extraneous @context fields on AP outbox
Author
matt
Browse Repository
No Builds
No Audits

Changes (21)

Path

Size

config/

less/

migrations/

	v8.go
	v7.go

pages/

templates/

user/

admin/

app-settings.tmpl

rWF8675eb0f95f5

View Options

README.md

View Options

account.go

View Options

activitypub.go

View Options

config/setup.go

View Options

database.go

View Options

database_test.go

View Options

go.mod

View Options

go.sum

View Options

invites.go

View Options

less/app.less

View Options

less/login.less

View Options

migrations/migrations.go

View Options

migrations/v8.go

View Options

oauth.go

View Options

oauth_signup.go

View Options

oauth_slack.go

View Options

oauth_test.go

View Options

pages/login.tmpl

View Options

pages/signup-oauth.tmpl

View Options

pages/signup.tmpl

View Options

templates/user/admin/app-settings.tmpl

Merge develop branch into oauth-gitea and resolve pages/login.tmpl conflict.8675eb0f95f5Actions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rWF8675eb0f95f5

README.md

account.go

activitypub.go

config/setup.go

database.go

database_test.go

go.mod

go.sum

invites.go

less/app.less

less/login.less

migrations/migrations.go

migrations/v8.go

oauth.go

oauth_signup.go

oauth_slack.go

oauth_test.go

pages/login.tmpl

pages/signup-oauth.tmpl

pages/signup.tmpl

templates/user/admin/app-settings.tmpl

Merge develop branch into oauth-gitea and resolve pages/login.tmpl conflict.
8675eb0f95f5
Actions