Merge branch 'develop' into gopher
6dbc753ecb02
Actions

Description

Merge branch 'develop' into gopher

Details

Provenance

matt	Authored on Jul 23 2020, 3:47 PM

Parents

rWF1451fc1369f4: Use latest version of go-gopher library
rWF24fa3d6863ab: Merge pull request #301 from joicemjoseph/fix/tls-mysql

Branches

Unknown

Tags

Unknown

References

refs/pull/273/head

Event Timeline

matt committed rWF6dbc753ecb02: Merge branch 'develop' into gopher (authored by matt).Jul 23 2020, 3:47 PM

Merged Changes

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

24fa3d6863ab Merge pull request #301 from joicemjoseph/fix/tls-mysql
Author
matt
Browse Repository
No Builds
No Audits
94fee2e19e0c Merge pull request #318 from writeas/ignore-collation-errs
Author
matt
Browse Repository
No Builds
No Audits
ede68d86a714 Merge pull request #324 from writeas/fix-unsynced-edits
Author
matt
Browse Repository
No Builds
No Audits
504a2a42aa05 Merge pull request #329 from writeas/add-footer
Author
matt
Browse Repository
No Builds
No Audits
591bb0866c85 Add footer and header element
Author
cjeller
Browse Repository
No Builds
No Audits
9624c4db0015 Show warning in editor when local draft is out of date
Author
matt
Browse Repository
No Builds
No Audits
cceea0307661 Ignore "collation mix" errors in GetCollectionRedirect()
Author
matt
Browse Repository
No Builds
No Audits
5c94d23466dc Merge pull request #312 from writeas/fix-no-to
Author
matt
Browse Repository
No Builds
No Audits
2aa154d85c73 Merge pull request #295 from writeas/optimize-drafts-fetch
Author
matt
Browse Repository
No Builds
No Audits
9d854c17c17e Only log "No to!" when debugging
Author
matt
Browse Repository
No Builds
No Audits
037fc40fb39b Merge pull request #307 from writeas/fix-numeric-alpha-hashtags
Author
matt
Browse Repository
No Builds
No Audits
5fe1dd173172 Add SQLite query for v9 migration
Author
matt
Browse Repository
No Builds
No Audits
b9c467558c1a Return transaction Begin error in v9 migration
Author
matt
Browse Repository
No Builds
No Audits
a0e517c2241d Merge branch 'develop' into optimize-drafts-fetch
Author
matt
Browse Repository
No Builds
No Audits
dc7b5df90eb1 Update saturday library to support number+letter hashtags
Author
matt
Browse Repository
No Builds
No Audits
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
671c7e99a5b9 fix: #297 - tls for mysql connetions
Author
Joice M. Joseph <joice@moolekkari.net>
Browse Repository
No Builds
No Audits
5e4ed5d9bcf2 Remove extraneous @context fields on AP outbox
Author
matt
Browse Repository
No Builds
No Audits
1c5a0099b66f Fix empty date showing on collection 404 page
Author
matt
Browse Repository
No Builds
No Audits
5de4d2086bba Optimize Drafts retrieval
Author
matt
Browse Repository
No Builds
No Audits
e51e58386ebd Update versions in migrations.go
Author
matt
Browse Repository
No Builds
No Audits
9f1dd7a1382b Use latest writeas/activityserve library
Author
matt
Browse Repository
No Builds
No Audits
d6cb178eb634 Use writeas/impart v1.1.1
Author
matt
Browse Repository
No Builds
No Audits
c2417399a45e Bump version to 0.12.0
Author
matt
Browse Repository
No Builds
No Audits
8cc793142e8a Merge pull request #288 from writeas/css-invalidation-release
Author
matt
Browse Repository
No Builds
No Audits
599e7669d0ea Add CSS cache busting to templates in release
Author
matt
Browse Repository
No Builds
No Audits
dbd7eff7ea0e Merge pull request #284 from writeas/high-load-error-page
Author
matt
Browse Repository
No Builds
No Audits
07debec8d5b6 Add new err func to wflib and sqlite builds
Author
matt
Browse Repository
No Builds
No Audits
8ad04c518721 Merge pull request #272 from writeas/novelfix
Author
matt
Browse Repository
No Builds
No Audits
f11e6ed843cf Apply review edits to chorus-collection
Author
cjeller
Browse Repository
No Builds
No Audits
540d716d2952 Apply review edits
Author
cjeller
Browse Repository
No Builds
No Audits
1d25b38eb73d Merge pull request #282 from writeas/patch-ap-mentions
Author
matt
Browse Repository
No Builds
No Audits
c3400242f019 Merge pull request #274 from writeas/private-instance-improvements
Author
matt
Browse Repository
No Builds
No Audits
9c93e55e0aed Merge pull request #281 from writeas/accessibility-improvements
Author
matt
Browse Repository
No Builds
No Audits
0acc630af56c Merge pull request #243 from writeas/T713-oauth-account-management
Author
matt
Browse Repository
No Builds
No Audits

Changes (69)

Path

Size

cmd/

writefreely/

config/

database-no-sqlite.go

db/

less/

migrations/

	v9.go
	v2.go

oauth.go

	oauth_gitlab.go
	oauth_writeas.go

pages/

scripts/

static/

img/

mark/

js/

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

include/

user/

admin/

app-settings.tmpl

settings.tmpl

webfinger.go

rWF6dbc753ecb02

View Options

Makefile

View Options

README.md

View Options

account.go

View Options

activitypub.go

View Options

app.go

View Options

cmd/writefreely/config.go

View Options

cmd/writefreely/db.go

View Options

cmd/writefreely/keys.go

View Options

cmd/writefreely/main.go

View Options

cmd/writefreely/user.go

View Options

cmd/writefreely/web.go

View Options

config.ini.example

View Options

config/config.go

View Options

config/setup.go

View Options

database-lib.go

View Options

database-no-sqlite.go

View Options

database-sqlite.go

View Options

database.go

View Options

database_test.go

View Options

db/create.go

View Options

errors.go

View Options

go.mod

View Options

go.sum

View Options

handle.go

View Options

invites.go

View Options

less/app.less

View Options

less/core.less

View Options

less/login.less

View Options

less/new-core.less

View Options

less/pad.less

View Options

less/post-temp.less

View Options

migrations/migrations.go

View Options

migrations/v4.go

View Options

migrations/v5.go

View Options

migrations/v6.go

View Options

migrations/v7.go

View Options

migrations/v8.go

View Options

migrations/v9.go

View Options

oauth.go

View Options

oauth_gitlab.go

View Options

oauth_signup.go

View Options

oauth_slack.go

View Options

oauth_test.go

View Options

pages/503.tmpl

View Options

pages/login.tmpl

View Options

pages/signup-oauth.tmpl

View Options

pages/signup.tmpl

View Options

postrender.go

View Options

posts.go

View Options

read.go

View Options

routes.go

View Options

scripts/invalidate-css.sh

View Options

static/img/mark/gitlab.png

View Options

static/img/mark/slack.png

View Options

static/img/mark/writeas.png

View Options

static/js/h.js

View Options

templates.go

View Options

templates/bare.tmpl

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

View Options

templates/include/footer.tmpl

View Options

templates/pad.tmpl

View Options

templates/user/admin/app-settings.tmpl

View Options

templates/user/settings.tmpl

View Options

Merge branch 'develop' into gopher6dbc753ecb02Actions

Description

Details

Event Timeline

Merged Changes

Changes (69)

rWF6dbc753ecb02

Makefile

README.md

account.go

activitypub.go

app.go

cmd/writefreely/config.go

cmd/writefreely/db.go

cmd/writefreely/keys.go

cmd/writefreely/main.go

cmd/writefreely/user.go

cmd/writefreely/web.go

config.ini.example

config/config.go

config/setup.go

database-lib.go

database-no-sqlite.go

database-sqlite.go

database.go

database_test.go

db/create.go

errors.go

go.mod

go.sum

handle.go

invites.go

less/app.less

less/core.less

less/login.less

less/new-core.less

less/pad.less

less/post-temp.less

migrations/migrations.go

migrations/v4.go

migrations/v5.go

migrations/v6.go

migrations/v7.go

migrations/v8.go

migrations/v9.go

oauth.go

oauth_gitlab.go

oauth_signup.go

oauth_slack.go

oauth_test.go

pages/503.tmpl

pages/login.tmpl

pages/signup-oauth.tmpl

pages/signup.tmpl

postrender.go

posts.go

read.go

routes.go

scripts/invalidate-css.sh

static/img/mark/gitlab.png

static/img/mark/slack.png

static/img/mark/writeas.png

static/js/h.js

templates.go

templates/bare.tmpl

templates/base.tmpl

templates/chorus-collection-post.tmpl

templates/chorus-collection.tmpl

templates/collection-post.tmpl

templates/collection.tmpl

templates/include/footer.tmpl

templates/pad.tmpl

templates/user/admin/app-settings.tmpl

templates/user/settings.tmpl

webfinger.go

Merge branch 'develop' into gopher
6dbc753ecb02
Actions