Merge branch 'develop' into support-notes
8be71481c899
Actions

Description

Merge branch 'develop' into support-notes

Details

Provenance

matt	Authored on Sep 2 2020, 2:29 PM

Parents

rWF505b124db708: Merge pull request #379 from writeas/dependabot/go_modules/github.com/mattn/go…
rWF5259c4fcdf48: Federate posts without a double-line break as Notes

Branches

Unknown

Tags

Unknown

Event Timeline

matt committed rWF8be71481c899: Merge branch 'develop' into support-notes (authored by matt).Sep 2 2020, 2:29 PM

Merged Changes

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

505b124db708 Merge pull request #379 from writeas/dependabot/go_modules/github.com/mattn/go…
Author
matt
Browse Repository
No Builds
No Audits
f75d4cb75d62 Merge pull request #327 from Dar13/add-cors-headers-public-api
Author
matt
Browse Repository
No Builds
No Audits
21579cfa71ff Bump github.com/mattn/go-sqlite3 from 1.14.0 to 1.14.2
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
62d29166f458 Merge pull request #376 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
e60398f0b4fc Bump github.com/gorilla/schema from 1.1.0 to 1.2.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
ce69117c79b9 Merge pull request #371 from writeas/design-update
Author
matt
Browse Repository
No Builds
No Audits
d8019bba0dee Merge pull request #370 from writeas/oauth-cleanup
Author
matt
Browse Repository
No Builds
No Audits
820c5ae55780 Remove Admin link from header on Account Settings page
Author
matt
Browse Repository
No Builds
No Audits
3a915ad8eaaa Make New Post button contextual on coll sub-sections
Author
matt
Browse Repository
No Builds
No Audits
8d27ee6d9907 Only show "New Post" button in coll. nav bar on Blogs page
Author
matt
Browse Repository
No Builds
No Audits
6f8d70043fb3 Move coll. navigation to main header for single-user sites
Author
matt
Browse Repository
No Builds
No Audits
9d0ba2bed4fd Add contextual blog menu
Author
matt
Browse Repository
No Builds
No Audits
cef51a7797dc Remove accidental #user-nav color
Author
matt
Browse Repository
No Builds
No Audits
0ed9c9c74680 Add inter-blog navigation
Author
matt
Browse Repository
No Builds
No Audits
217430e56b35 Redirect user to /me/settings on cancelled OAuth flow
Author
matt
Browse Repository
No Builds
No Audits
7a09a47de24d Include OAuth buttons on signup-via-invite page
Author
matt
Browse Repository
No Builds
No Audits
455e50c9a893 Use branded OAuth buttons
Author
matt
Browse Repository
No Builds
No Audits
a78b36b87121 Fix whitespace in user/settings.tmpl
Author
matt
Browse Repository
No Builds
No Audits
00cceca10415 Update signup-via-invite page
Author
matt
Browse Repository
No Builds
No Audits
4db2cb89861d Templatize OAuth buttons across signup and login pages
Author
matt
Browse Repository
No Builds
No Audits
a773d94dc798 Reorder Gitea fields and structs in config.go
Author
matt
Browse Repository
No Builds
No Audits
04d404e61f48 Move text OAuth button styles to login.less
Author
matt
Browse Repository
No Builds
No Audits
21e9b4a6672a Run `go fmt` on database.go
Author
matt
Browse Repository
No Builds
No Audits
63f023ea98f1 Fix GitLab & OAuth button labels on Login page
Author
matt
Browse Repository
No Builds
No Audits
ab32caa49c4d Include key names in Login page struct
Author
matt
Browse Repository
No Builds
No Audits
95273697f413 Use consistent server User-Agent across application
Author
matt
Browse Repository
No Builds
No Audits
dfa14c9c9293 Merge pull request #317 from pascoual/feature/generic-oauth
Author
matt
Browse Repository
No Builds
No Audits
ab285644a0cc Fix: signup methods mutually exclusive
Author
prichier <pascoualito@gmail.com>
Browse Repository
No Builds
No Audits
d3f1e400106a Merge branch 'develop' into feature/generic-oauth
Author
Pascal Richier <pascoual@users.noreply.github.com>
Browse Repository
No Builds
No Audits
7e3eb9a87bd3 Merge pull request #319 from writeas/silo-mentions
Author
matt
Browse Repository
No Builds
No Audits
7fa78c225586 Move fakeAPInstances to web-core/silobridge package
Author
matt
Browse Repository
No Builds
No Audits
c16414843a76 Merge pull request #368 from writeas/RJ722-217-fix-h2-size
Author
matt
Browse Repository
No Builds
No Audits
b2382b54222b Merge pull request #293 from gytisrepecka/oauth-gitea
Author
matt
Browse Repository
No Builds
No Audits
731d4e8efe66 Run gofmt for modified files.
Author
gytisrepecka
Browse Repository
No Builds
No Audits
fd3a6399b330 Merge pull request #355 from writeas/accessible-dropdowns
Author
matt
Browse Repository
No Builds
No Audits
8b243e119f0b Change post page h2 size to 1.4em
Author
matt
Browse Repository
No Builds
No Audits
0c8b779afbed Merge branch '217-fix-h2-size' of https://github.com/RJ722/writefreely into…
Author
matt
Browse Repository
No Builds
No Audits
5f52c23a65b9 Merge pull request #181 from writeas/mathjax-in-binaries
Author
matt
Browse Repository
No Builds
No Audits
e37bec6aa1e9 Merge pull request #196 from writeas/dark-mode-pad
Author
matt
Browse Repository
No Builds
No Audits
121d83d94dc4 Clean up pad JS formatting, debug messages
Author
matt
Browse Repository
No Builds
No Audits
849e5b8503a8 Merge pull request #330 from writeas/post-signatures
Author
matt
Browse Repository
No Builds
No Audits
fee44e7c8db3 Add menu hover delay on user pages + editor
Author
matt
Browse Repository
No Builds
No Audits
a32fc441533d Merge pull request #350 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
bd387c6decdc Merge branch 'develop' into dependabot/go_modules/github.com/fatih/color-1.9.0
Author
matt
Browse Repository
No Builds
No Audits
cd6ccd257b8b Merge pull request #343 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
9c835a2b9d7b Bump github.com/fatih/color from 1.7.0 to 1.9.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
55ffb86ac2c8 Merge pull request #351 from writeas/dependabot/go_modules/github.com/go-sql…
Author
matt
Browse Repository
No Builds
No Audits
78e0d9858930 Merge pull request #349 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
6af24293d101 Merge branch 'develop' into dependabot/go_modules/github.com/guregu/null-3.5.
Author
matt
Browse Repository
No Builds
No Audits
9d7783f80dae Merge pull request #348 from writeas/dependabot/go_modules/gopkg.in/ini.v1-1.57.
Author
matt
Browse Repository
No Builds
No Audits

Changes (137)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

.github/

author/

cmd/

writefreely/

config/

database-no-sqlite.go

less/

migrations/

pages/

scripts/

static/

img/

sign_in_with_slack.png

sign_in_with_slack@2x.png

js/

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

include/

password-collection.tmpl

user/

admin/

include/

	silenced.tmpl
	suspended.tmpl

rWF8be71481c899

View Options

.github/dependabot.yml

Load File

View Options

.gitmodules

Load File

View Options

.travis.yml

Load File

View Options

CONTRIBUTING.md

Load File

View Options

Dockerfile

Load File

View Options

Makefile

Load File

View Options

README.md

Load File

View Options

account.go

Load File

View Options

account_import.go

Load File

View Options

activitypub.go

Load File

View Options

admin.go

Load File

View Options

app.go

Load File

View Options

author/author.go

Load File

View Options

cmd/writefreely/config.go

Load File

View Options

cmd/writefreely/db.go

Load File

View Options

cmd/writefreely/keys.go

Load File

View Options

cmd/writefreely/main.go

Load File

View Options

cmd/writefreely/user.go

Load File

View Options

cmd/writefreely/web.go

Load File

View Options

collections.go

Load File

View Options

config.ini.example

Load File

View Options

config/config.go

Load File

View Options

config/funcs.go

Load File

View Options

config/setup.go

Load File

View Options

database-lib.go

Load File

View Options

database-no-sqlite.go

Load File

View Options

database-sqlite.go

Load File

View Options

database.go

Load File

View Options

database_test.go

Load File

View Options

db/alter.go

Load File

View Options

db/alter_test.go

Load File

View Options

db/create.go

Load File

View Options

db/create_test.go

Load File

View Options

db/dialect.go

Load File

View Options

db/index.go

Load File

View Options

db/raw.go

Load File

View Options

db/tx.go

Load File

View Options

errors.go

Load File

View Options

feed.go

Load File

View Options

go.mod

Load File

View Options

go.sum

Load File

View Options

gopher.go

Load File

View Options

handle.go

Load File

View Options

invites.go

Load File

View Options

less/admin.less

Load File

View Options

less/app.less

Load File

View Options

less/core.less

Load File

View Options

less/login.less

Load File

View Options

less/new-core.less

Load File

View Options

less/pad.less

Load File

View Options

less/post-temp.less

Load File

View Options

main_test.go

Load File

View Options

migrations/drivers.go

Load File

View Options

migrations/migrations.go

Load File

View Options

migrations/v10.go

Load File

View Options

migrations/v4.go

Load File

View Options

migrations/v5.go

Load File

View Options

migrations/v6.go

Load File

View Options

migrations/v7.go

Load File

View Options

migrations/v8.go

Load File

View Options

migrations/v9.go

Load File

View Options

oauth.go

Load File

View Options

oauth/state.go

Load File

View Options

oauth_generic.go

Load File

View Options

oauth_gitea.go

Load File

View Options

oauth_gitlab.go

Load File

View Options

oauth_signup.go

Load File

View Options

oauth_slack.go

Load File

View Options

oauth_test.go

Load File

View Options

oauth_writeas.go

Load File

View Options

pad.go

Load File

View Options

pages/503.tmpl

Load File

View Options

pages/landing.tmpl

Load File

View Options

pages/login.tmpl

Load File

View Options

pages/signup-oauth.tmpl

Load File

View Options

pages/signup.tmpl

Load File

View Options

postrender.go

Load File

View Options

posts.go

Load File

View Options

read.go

Load File

View Options

routes.go

Load File

View Options

scripts/invalidate-css.sh

Load File

View Options

scripts/upgrade-server.sh

Load File

View Options

semver.go

Load File

View Options

static/img/mark/gitea.png

Load File

View Options

static/img/mark/gitlab.png

Load File

View Options

static/img/mark/slack.png

Load File

View Options

static/img/mark/writeas-white.png

Load File

View Options

static/img/mark/writeas.png

Load File

View Options

static/img/sign_in_with_slack.png

Load File

View Options

static/img/sign_in_with_slack@2x.png

Load File

View Options

static/js/h.js

Load File

View Options

static/js/localdate.js

Load File

View Options

static/js/mathjax/tex-svg-full.js

Load File

View Options

static/js/menu.js

Load File

View Options

templates.go

Load File

View Options

templates/bare.tmpl

Load File

View Options

templates/base.tmpl

Load File

View Options

templates/chorus-collection-post.tmpl

Load File

View Options

templates/chorus-collection.tmpl

Load File

View Options

templates/collection-post.tmpl

Load File

View Options

templates/collection-tags.tmpl

Load File

View Options

templates/collection.tmpl

Load File

View Options

templates/edit-meta.tmpl

Load File

View Options

templates/include/footer.tmpl

Load File

View Options

templates/include/oauth.tmpl

Load File

View Options

templates/include/post-render.tmpl

Load File

View Options

templates/include/posts.tmpl

Load File

View Options

templates/pad.tmpl

Load File

View Options

templates/password-collection.tmpl

Load File

View Options

templates/post.tmpl

Load File

View Options

templates/read.tmpl

Load File

View Options

templates/user/admin.tmpl

Load File

View Options

templates/user/admin/app-settings.tmpl

Load File

View Options

templates/user/admin/app-updates.tmpl

Load File

View Options

templates/user/admin/monitor.tmpl

Load File

View Options

templates/user/admin/users.tmpl

Load File

View Options

templates/user/admin/view-user.tmpl

Load File

View Options

templates/user/articles.tmpl

Load File

View Options

templates/user/collection.tmpl

Load File

View Options

templates/user/collections.tmpl

Load File

View Options

templates/user/export.tmpl

Load File

View Options

templates/user/import.tmpl

Load File

View Options

templates/user/include/footer.tmpl

Load File

View Options

templates/user/include/header.tmpl

Load File

View Options

templates/user/include/nav.tmpl

Load File

View Options

templates/user/include/silenced.tmpl

Load File

View Options

templates/user/include/suspended.tmpl

Load File

View Options

templates/user/invite.tmpl

Load File

View Options

templates/user/settings.tmpl

Load File

View Options

templates/user/stats.tmpl

Load File

View Options

updates.go

Load File

View Options

updates_test.go

Load File

View Options

webfinger.go

Load File

Merge branch 'develop' into support-notes8be71481c899Actions

Description

Details

Event Timeline

Merged Changes

Changes (137)Show All Changes

Very Large Commit

rWF8be71481c899

.github/dependabot.yml

.gitmodules

.travis.yml

CONTRIBUTING.md

Dockerfile

Makefile

README.md

account.go

account_import.go

activitypub.go

admin.go

app.go

author/author.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

collections.go

config.ini.example

config/config.go

config/funcs.go

config/setup.go

database-lib.go

database-no-sqlite.go

database-sqlite.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

feed.go

go.mod

go.sum

gopher.go

handle.go

invites.go

less/admin.less

less/app.less

less/core.less

less/login.less

less/new-core.less

less/pad.less

less/post-temp.less

main_test.go

migrations/drivers.go

migrations/migrations.go

migrations/v10.go

migrations/v4.go

migrations/v5.go

migrations/v6.go

migrations/v7.go

migrations/v8.go

migrations/v9.go

oauth.go

oauth/state.go

oauth_generic.go

oauth_gitea.go

oauth_gitlab.go

oauth_signup.go

oauth_slack.go

oauth_test.go

oauth_writeas.go

pad.go

pages/503.tmpl

Merge branch 'develop' into support-notes
8be71481c899
Actions

Changes (137)
Show All Changes