Diffusion WriteFreely f2e3cd8bd721

merge develop
f2e3cd8bd721
Actions

Tags

None

Subscribers

None

Description

merge develop

Details

Provenance

Colin Axnér <25233464+colin-axner@users.noreply.github.com>

Authored on Mar 8 2021, 10:42 AM

Parents

rWF00f2152c2b86: update commit for web-core
rWF4cf950070485: Merge pull request #418 from writeas/consistent-feeds

Branches

Unknown

Tags

Unknown

Event Timeline

Colin Axnér <25233464+colin-axner@users.noreply.github.com> committed rWFf2e3cd8bd721: merge develop (authored by Colin Axnér <25233464+colin-axner@users.noreply.github.com>).Mar 8 2021, 10:42 AM

Merged Changes

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

4cf950070485 Merge pull request #418 from writeas/consistent-feeds
Author
matt
Browse Repository
No Builds
No Audits
fbb67bc9effe Merge pull request #383 from writeas/wysiwyg
Author
matt
Browse Repository
No Builds
No Audits
4f32af2d7f34 Merge pull request #220 from writeas/support-notes
Author
matt
Browse Repository
No Builds
No Audits
97242cd5ec79 Merge pull request #433 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
bd77145bf346 Merge pull request #423 from writeas/dependabot/go_modules/github.com/mattn/go…
Author
matt
Browse Repository
No Builds
No Audits
1ea728b1e907 Bump github.com/stretchr/testify from 1.6.1 to 1.7.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
c813d08230bd Merge pull request #414 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
1ac5c4ab4d79 Bump github.com/mattn/go-sqlite3 from 1.14.4 to 1.14.6
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
ff976a950ec6 Merge pull request #409 from writeas/dependabot/go_modules/github.
Author
matt
Browse Repository
No Builds
No Audits
1f6d0e2e707e Merge branch 'develop' into support-notes
Author
matt
Browse Repository
No Builds
No Audits
5b2c350b5dcb Bump github.com/fatih/color from 1.9.0 to 1.10.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
b3dd06c79b9a Merge branch 'develop' into wysiwyg
Author
matt
Browse Repository
No Builds
No Audits
71b211b11ec4 Bump github.com/urfave/cli/v2 from 2.2.0 to 2.3.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Browse Repository
No Builds
No Audits
33d47ca42070 Merge pull request #408 from writeas/dependabot/go_modules/gopkg.in/ini.v1-1.62.
Author
matt
Browse Repository
No Builds
No Audits
c2c6b6904447 Update prose.bundle.js
Author
matt
Browse Repository
No Builds
No Audits
706ae9cc771b Style Read More section in WYSIWYG like link
Author
matt
Browse Repository
No Builds
No Audits
1abc9b643f4a Improve WYSIWYG editor modal style
Author
matt
Browse Repository
No Builds
No Audits
8a8288d2afde Build ProseMirror library on `make ui`
Author
matt
Browse Repository
No Builds
No Audits
e36e39cb7397 Fix WYSIWYG editor script in Chrome <85
Author
matt
Browse Repository
No Builds
No Audits
583693ed8d9b Updated prod prosemirror bundle.
Author
v <viktor.vaczi.90@gmail.com>
Browse Repository
No Builds
No Audits
19beabe2d124 Fixed Safari regex lookahead / lookbehind issue.
Author
v <viktor.vaczi.90@gmail.com>
Browse Repository
No Builds
No Audits
65caaca6595d Update ProseMirror install instructions
Author
matt
Browse Repository
No Builds
No Audits
8c0978419fa8 using a branch from github with the markdown hashtag serializing fix
Author
Viktor Vaczi <viktor.vaczi@emergence-engineering.com>
Browse Repository
No Builds
No Audits
604921366193 added prettierrc
Author
Viktor Vaczi <viktor.vaczi@emergence-engineering.com>
Browse Repository
No Builds
No Audits
9a55d38e4b2a working newlines, link shortcut
Author
Viktor Vaczi <viktor.vaczi@emergence-engineering.com>
Browse Repository
No Builds
No Audits
676b673c94eb Correct line ends
Author
Viktor Vaczi <viktor.vaczi@emergence-engineering.com>
Browse Repository
No Builds
No Audits
b1cea637cb3f Removed unnecessary schema nodes, custom markdown parser/serializer, publish…
Author
Viktor Vaczi <viktor.vaczi@emergence-engineering.com>
Browse Repository
No Builds
No Audits
f31e4d650db2 Use HTMLContent field in RSS feed
Author
matt
Browse Repository
No Builds
No Audits
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
ed00417d8dd0 Bump gopkg.in/ini.v1 from 1.61.0 to 1.62.0
Author
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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

Changes (53)

Path

Size

config.ini.example

config/

docker-compose.yml

less/

install-less.sh

prose-editor.less

oauth_generic.go

markdownParser.js

markdownSerializer.js

package-lock.json

webpack.config.js

static/

js/

prose.bundle.js

templates/

chorus-collection-post.tmpl

chorus-collection.tmpl

collection-post.tmpl

collection-tags.tmpl

collection.tmpl

include/

post-render.tmpl

user/

admin/

app-settings.tmpl

collection.tmpl

	wysiwyg.tmpl
	pad.tmpl

rWFf2e3cd8bd721

.gitignore

Loading...

Dockerfile

Loading...

Makefile

Loading...

account.go

Loading...

admin.go

Loading...

collections.go

Loading...

config.ini.example

Loading...

config/config.go

Loading...

database.go

Loading...

docker-compose.yml

Loading...

feed.go

Loading...

go.mod

Loading...

go.sum

Loading...

less/Makefile

Loading...

less/app.less

Loading...

less/core.less

Loading...

less/install-less.sh

Loading...

less/pad-theme.less

Loading...

less/pad.less

Loading...

less/prose-editor.less

Loading...

less/prose.less

Loading...

less/resources.less

Loading...

oauth.go

Loading...

oauth_generic.go

Loading...

postrender.go

Loading...

posts.go

Loading...

posts_test.go

Loading...

prose/.babelrc.js

Loading...

prose/.prettierrc

Loading...

prose/Makefile

Loading...

prose/README.md

Loading...

prose/markdownParser.js

Loading...

prose/markdownSerializer.js

Loading...

prose/menu.js

Loading...

prose/package-lock.json

Loading...

prose/package.json

Loading...

prose/prose.html

Loading...

prose/prose.js

Loading...

prose/schema.js

Loading...

prose/webpack.config.js

Loading...

routes.go

Loading...

static/js/h.js

Loading...

static/js/prose.bundle.js

Loading...

templates/chorus-collection-post.tmpl

Loading...

templates/chorus-collection.tmpl

Loading...

templates/collection-post.tmpl

Loading...

templates/collection-tags.tmpl

Loading...

templates/collection.tmpl

Loading...

templates/include/post-render.tmpl

Loading...

templates/user/admin/app-settings.tmpl

Loading...

templates/user/collection.tmpl

Loading...

templates/wysiwyg.tmpl

Loading...