Merge branch 'develop' into wysiwyg
b3dd06c79b9a
Actions

Description

Merge branch 'develop' into wysiwyg

Details

Provenance

matt	Authored on Mar 3 2021, 10:38 PM

Parents

rWFc2c6b6904447: Update prose.bundle.js
rWF53ea85dc8660: Merge pull request #407 from conor-f/docker-fixes

Branches

Unknown

Tags

Unknown

References

refs/pull/383/head

Event Timeline

matt committed rWFb3dd06c79b9a: Merge branch 'develop' into wysiwyg (authored by matt).Mar 3 2021, 10:38 PM

Merged Changes

53ea85dc8660 Merge pull request #407 from conor-f/docker-fixes
Author
matt
Browse Repository
No Builds
No Audits
d52e2826f87a Merge pull request #389 from colin-axner/remove-unnecessary-var
Author
matt
Browse Repository
No Builds
No Audits
9f925c81386c Changes docker-compose image to use writefreely.
Author
Conor Flynn <conor@glimpse.ie>
Browse Repository
No Builds
No Audits
0eb1a2deecb4 Fixes broken Docker/docker-compose structures.
Author
Conor Flynn <conor@glimpse.ie>
Browse Repository
No Builds
No Audits
3493921837b1 Merge pull request #402 from dariusk/dariusk/mastodon
Author
matt
Browse Repository
No Builds
No Audits
7d4df23d3c70 Merge pull request #397 from mrvdb/issue305
Author
matt
Browse Repository
No Builds
No Audits
3b91400b6253 Merge pull request #387 from writeas/resize-customize-editor
Author
matt
Browse Repository
No Builds
No Audits
bb008aa66c76 Merge pull request #382 from Antolius/fix-post-summary-escaping
Author
matt
Browse Repository
No Builds
No Audits
667cbb97ed40 Adding scope field to generic OAuth
Author
Darius Kazemi <darius.kazemi@gmail.com>
Browse Repository
No Builds
No Audits
e1cde913e27f Merge pull request #369 from writeas/web-monetization
Author
matt
Browse Repository
No Builds
No Audits
345313200e64 Merge pull request #385 from writeas/fix-pinned-post-header-space
Author
matt
Browse Repository
No Builds
No Audits
211b02c20914 Merge pull request #364 from Obayanju/fix-youtube-query-parameters
Author
matt
Browse Repository
No Builds
No Audits
b1e22795b1f4 Merge pull request #378 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
cf0403d9550b Merge pull request #398 from writeas/dependabot/go_modules/github.com/mattn/go…
Author
matt
Browse Repository
No Builds
No Audits
c1aed45388b2 Merge pull request #396 from writeas/dependabot/go_modules/gopkg.in/ini.v1-1.61.
Author
matt
Browse Repository
No Builds
No Audits
083d8c4d67cc Bump github.com/mattn/go-sqlite3 from 1.14.2 to 1.14.4
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
e3c7a8ac3aac Merge pull request #395 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
454e781ed4d5 Bump github.com/mitchellh/go-wordwrap from 1.0.0 to 1.0.1
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
1b6f9b67424f Merge pull request #393 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
5961eb8f2799 Drop the /tags/{tag} route
Author
Marcel van der Boom <marcel@hsdev.com>
Browse Repository
No Builds
No Audits
f5f28550fb1e Bump gopkg.in/ini.v1 from 1.57.0 to 1.61.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
c22a751ab73f Bump github.com/manifoldco/promptui from 0.7.0 to 0.8.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
2768ea9414e1 Make Monetization optional
Author
matt
Browse Repository
No Builds
No Audits
13a3a68d54a9 Validate and trim spaces on WM pointer
Author
matt
Browse Repository
No Builds
No Audits
ec7b299fd3a9 Enable updating WM payment pointer via API and Customize page
Author
matt
Browse Repository
No Builds
No Audits
f534ee1deccb Merge pull request #391 from colin-axner/getCollectionPage-cleanup
Author
matt
Browse Repository
No Builds
No Audits
678653ac30d5 update getCollectionPage
Author
• colin-axner
Browse Repository
No Builds
No Audits
75a79d49bdcf remove unnecessary var
Author
• colin-axner
Browse Repository
No Builds
No Audits
2908080b52ed Automatically resize CSS editor
Author
matt
Browse Repository
No Builds
No Audits
d6d510aec94d Fix `dated` header class on pinned posts
Author
matt
Browse Repository
No Builds
No Audits
f847ade1efb6 Use camelCase
Author
Dami
Browse Repository
No Builds
No Audits
3a789f5a0051 Go to next regex match if url parsing error
Author
Dami
Browse Repository
No Builds
No Audits
79715891fbf9 Merge branch 'develop' of https://github.com/writeas/writefreely into fix…
Author
Dami
Browse Repository
No Builds
No Audits
eb76faa1298b Fix escaping in post summary
Author
Josip Antoliš <josip.antolis@protonmail.com>
Browse Repository
No Builds
No Audits
1779aeaf8c97 Bump github.com/gorilla/mux from 1.7.4 to 1.8.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
13eb51913e24 Support Web Monetization via backend attribute
Author
matt
Browse Repository
No Builds
No Audits
9b614bc92286 Fix removal of query parameters on youtube embed links
Author
Dami
Browse Repository
No Builds
No Audits

Changes (24)

Path

Size

config/

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

include/

user/

admin/

app-settings.tmpl

collection.tmpl

rWFb3dd06c79b9a

View Options

Dockerfile

View Options

account.go

View Options

admin.go

View Options

collections.go

View Options

config.ini.example

View Options

config/config.go

View Options

database.go

View Options

docker-compose.yml

View Options

go.mod

View Options

go.sum

View Options

oauth.go

View Options

oauth_generic.go

View Options

postrender.go

View Options

posts.go

View Options

posts_test.go

View Options

routes.go

View Options

templates/chorus-collection-post.tmpl

View Options

templates/chorus-collection.tmpl

View Options

templates/collection-post.tmpl

View Options

templates/collection-tags.tmpl

View Options

templates/collection.tmpl

View Options

templates/include/post-render.tmpl

View Options

templates/user/admin/app-settings.tmpl

View Options

templates/user/collection.tmpl

Merge branch 'develop' into wysiwygb3dd06c79b9aActions

Description

Details

Event Timeline

Merged Changes

Changes (24)

rWFb3dd06c79b9a

Dockerfile

account.go

admin.go

collections.go

config.ini.example

config/config.go

database.go

docker-compose.yml

go.mod

go.sum

oauth.go

oauth_generic.go

postrender.go

posts.go

posts_test.go

routes.go

templates/chorus-collection-post.tmpl

templates/chorus-collection.tmpl

templates/collection-post.tmpl

templates/collection-tags.tmpl

templates/collection.tmpl

templates/include/post-render.tmpl

templates/user/admin/app-settings.tmpl

templates/user/collection.tmpl

Merge branch 'develop' into wysiwyg
b3dd06c79b9a
Actions