Merge branch 'develop' into feature/generic-oauth
d3f1e400106a
Actions

Description

Merge branch 'develop' into feature/generic-oauth

Details

Provenance

Pascal Richier <pascoual@users.noreply.github.com>	Authored on Aug 16 2020, 5:58 PM
GitHub <noreply@github.com>	Committed on Aug 16 2020, 5:58 PM

Parents

rWF7e3eb9a87bd3: Merge pull request #319 from writeas/silo-mentions
rWFf6aa99e591f8: Add disable_password_auth option

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

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
2eaf7493d73c Merge pull request #347 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
ab6d4bfb9d54 Merge pull request #353 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
2c4530710794 Bump github.com/urfave/cli/v2 from 2.1.1 to 2.2.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
ad2e46cb400c Bump github.com/manifoldco/promptui from 0.3.2 to 0.7.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
e796331de8f7 Merge pull request #346 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
9ff54f99449f Merge pull request #342 from writeas/dependabot/go_modules/github.com/mattn/go…
Author
matt
Browse Repository
No Builds
No Audits
aa170d0c5aa8 Bump github.com/mattn/go-sqlite3 from 1.10.0 to 1.14.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
42c6f3ca031c Merge pull request #345 from writeas/dependabot/go_modules/github.com/microcosm…
Author
matt
Browse Repository
No Builds
No Audits
191eac77ab15 Merge pull request #352 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
00c47fa62f84 Bump github.com/gorilla/schema from 1.0.2 to 1.1.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
29dc53aacdac Merge pull request #344 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
2f06b0b48780 Merge pull request #341 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
5897ef7cab85 Bump github.com/writeas/import from 0.2.0 to 0.2.1
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
99b2f41aa16a Bump github.com/go-sql-driver/mysql from 1.4.1 to 1.5.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
94094ed16d78 Bump github.com/guregu/null
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
f278eccd140e Bump gopkg.in/ini.v1 from 1.55.0 to 1.57.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
267c9df1c413 Bump github.com/stretchr/testify from 1.6.0 to 1.6.1
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
b56914462493 Bump github.com/microcosm-cc/bluemonday from 1.0.2 to 1.0.3
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
3d80b46bdce4 Bump github.com/hashicorp/go-multierror from 1.0.0 to 1.1.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
cfaaffdc6cd9 Bump github.com/gorilla/feeds from 1.1.0 to 1.1.1
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
3294087abdfb Merge pull request #333 from shleeable/patch-2
Author
matt
Browse Repository
No Builds
No Audits
48e85b7c63cc Update dependabot.yml
Author
Shlee <github@shl.ee>
Browse Repository
No Builds
No Audits
4c5f45f46272 Merge pull request #273 from writeas/gopher
Author
matt
Browse Repository
No Builds
No Audits
6dbc753ecb02 Merge branch 'develop' into gopher
Author
matt
Browse Repository
No Builds
No Audits
1451fc1369f4 Use latest version of go-gopher library
Author
matt
Browse Repository
No Builds
No Audits
dbe36861c31d Prevent Gopher server start on Private instance
Author
matt
Browse Repository
No Builds
No Audits
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

Changes (39)

Path

Size

.github/

config/

less/

migrations/

	v10.go
	v3.go

	v9.go
	v2.go

oauth.go

	oauth_gitea.go
	oauth_generic.go

pages/

postrender.go

posts.go

routes.go

static/

img/

mark/

js/

templates/

include/

user/

include/

rWFd3f1e400106a

View Options

.github/dependabot.yml

View Options

.gitmodules

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

database.go

View Options

go.mod

View Options

go.sum

View Options

gopher.go

View Options

handle.go

View Options

less/core.less

View Options

less/pad.less

View Options

migrations/drivers.go

View Options

migrations/migrations.go

View Options

migrations/v10.go

View Options

migrations/v9.go

View Options

oauth.go

View Options

oauth_gitea.go

View Options

pages/login.tmpl

View Options

postrender.go

View Options

posts.go

View Options

routes.go

View Options

static/img/mark/gitea.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/bare.tmpl

View Options

templates/base.tmpl

View Options

templates/collection.tmpl

View Options

templates/include/post-render.tmpl

View Options

templates/pad.tmpl

View Options

templates/user/collection.tmpl

View Options

templates/user/include/footer.tmpl

View Options

templates/user/include/header.tmpl

View Options

templates/user/settings.tmpl

Merge branch 'develop' into feature/generic-oauthd3f1e400106aActions

Description

Details

Event Timeline

Merged Changes

Changes (39)

rWFd3f1e400106a

.github/dependabot.yml

.gitmodules

account.go

activitypub.go

app.go

collections.go

config.ini.example

config/config.go

database.go

go.mod

go.sum

gopher.go

handle.go

less/core.less

less/pad.less

migrations/drivers.go

migrations/migrations.go

migrations/v10.go

migrations/v9.go

oauth.go

oauth_gitea.go

pages/login.tmpl

postrender.go

posts.go

routes.go

static/img/mark/gitea.png

static/js/h.js

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

static/js/menu.js

templates/bare.tmpl

templates/base.tmpl

templates/collection.tmpl

templates/include/post-render.tmpl

templates/pad.tmpl

templates/user/collection.tmpl

templates/user/include/footer.tmpl

templates/user/include/header.tmpl

templates/user/settings.tmpl

Merge branch 'develop' into feature/generic-oauth
d3f1e400106a
Actions