Merge branch 'develop' into wysiwyg
61daca2b0d12
Actions

Description

Merge branch 'develop' into wysiwyg

Details

Provenance

matt	Authored on Sep 9 2020, 1:53 PM

Parents

rWF7c1244e6b196: Merge pull request #381 from writeas/fix-testpostlede
rWFf76bfebfdef8: Add dedicated Title field to WYSIWYG editor

Branches

Unknown

Tags

Unknown

Event Timeline

matt committed rWF61daca2b0d12: Merge branch 'develop' into wysiwyg (authored by matt).Sep 9 2020, 1:53 PM

Merged Changes

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

7c1244e6b196 Merge pull request #381 from writeas/fix-testpostlede
Author
matt
Browse Repository
No Builds
No Audits
c31a87fb7688 Merge pull request #336 from Antolius/static-assets-cache-control
Author
matt
Browse Repository
No Builds
No Audits
1b1d3064c906 Move cacheControl func into handle.go file
Author
Josip Antoliš <josip.antolis@protonmail.com>
Browse Repository
No Builds
No Audits
3f36ede88505 Add Cache-Control header
Author
Josip Antoliš <josip.antolis@protonmail.com>
Browse Repository
No Builds
No Audits
a8a6525006ef Merge pull request #377 from writeas/dependabot/go_modules/github.com/microcosm…
Author
matt
Browse Repository
No Builds
No Audits
98d88b9a4b91 Truncate lede at question mark
Author
matt
Browse Repository
No Builds
No Audits
ac90cb2c80e8 Fix panic in TestViewOauthCallback
Author
matt
Browse Repository
No Builds
No Audits
00a5a4f7ab00 Bump github.com/microcosm-cc/bluemonday from 1.0.3 to 1.0.4
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
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

Changes (95)

Path

Size

.github/

config/

database-no-sqlite.go

db/

less/

migrations/

	v10.go
	v6.go

	v9.go
	v6.go

oauth.go

	oauth_generic.go
	oauth_writeas.go

	oauth_gitea.go
	oauth_writeas.go

	oauth_gitlab.go
	oauth_writeas.go

pages/

parse/

scripts/

static/

img/

mark/

js/

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

include/

user/

admin/

include/

rWF61daca2b0d12

View Options

.github/dependabot.yml

View Options

.gitmodules

View Options

Makefile

View Options

README.md

View Options

account.go

View Options

activitypub.go

View Options

app.go

View Options

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

gopher.go

View Options

handle.go

View Options

invites.go

View Options

less/admin.less

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

less/resources.less

View Options

migrations/drivers.go

View Options

migrations/migrations.go

View Options

migrations/v10.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_generic.go

View Options

oauth_gitea.go

View Options

oauth_gitlab.go

View Options

oauth_signup.go

View Options

oauth_slack.go

View Options

oauth_test.go

View Options

oauth_writeas.go

View Options

pages/503.tmpl

View Options

pages/landing.tmpl

View Options

pages/login.tmpl

View Options

pages/signup-oauth.tmpl

View Options

pages/signup.tmpl

View Options

parse/posts.go

View Options

postrender.go

View Options

posts.go

View Options

routes.go

View Options

routes_test.go

View Options

scripts/invalidate-css.sh

View Options

static/img/mark/gitea.png

View Options

static/img/mark/gitlab.png

View Options

static/img/mark/slack.png

View Options

static/img/mark/writeas-white.png

View Options

static/img/mark/writeas.png

View Options

static/js/h.js

View Options

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

View Options

static/js/menu.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/include/oauth.tmpl

View Options

templates/include/post-render.tmpl

View Options

templates/pad.tmpl

View Options

templates/user/admin/app-settings.tmpl

View Options

templates/user/admin/users.tmpl

View Options

templates/user/collection.tmpl

View Options

templates/user/collections.tmpl

View Options

templates/user/include/footer.tmpl

View Options

templates/user/include/header.tmpl

View Options

templates/user/include/nav.tmpl

View Options

templates/user/settings.tmpl

View Options

templates/user/stats.tmpl

View Options

testdata/.gitignore

View Options

testdata/config.ini

View Options

testdata/static/style.css

View Options

Merge branch 'develop' into wysiwyg61daca2b0d12Actions

Description

Details

Event Timeline

Merged Changes

Changes (95)

rWF61daca2b0d12

.github/dependabot.yml

.gitmodules

Makefile

README.md

account.go

activitypub.go

app.go

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

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

less/resources.less

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_generic.go

oauth_gitea.go

oauth_gitlab.go

oauth_signup.go

oauth_slack.go

oauth_test.go

oauth_writeas.go

pages/503.tmpl

pages/landing.tmpl

pages/login.tmpl

pages/signup-oauth.tmpl

pages/signup.tmpl

parse/posts.go

postrender.go

posts.go

routes.go

routes_test.go

scripts/invalidate-css.sh

static/img/mark/gitea.png

static/img/mark/gitlab.png

static/img/mark/slack.png

static/img/mark/writeas-white.png

static/img/mark/writeas.png

static/js/h.js

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

static/js/menu.js

templates.go

templates/bare.tmpl

templates/base.tmpl

templates/chorus-collection-post.tmpl

templates/chorus-collection.tmpl

templates/collection-post.tmpl

Merge branch 'develop' into wysiwyg
61daca2b0d12
Actions