akkoma
5 years agoTOS
sadposter [Mon, 12 Aug 2019 13:55:20 +0000 (14:55 +0100)]
TOS

5 years agoTOS
sadposter [Sun, 11 Aug 2019 23:51:04 +0000 (00:51 +0100)]
TOS

5 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Sun, 11 Aug 2019 20:03:20 +0000 (21:03 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

5 years agoMerge branch 'fix/fix-type-depth' into 'develop'
rinpatch [Sun, 11 Aug 2019 20:01:10 +0000 (20:01 +0000)]
Merge branch 'fix/fix-type-depth' into 'develop'

Do not fetch the reply object in `fix_type` unless the object has the `name` key and use a depth limit when fetching it

See merge request pleroma/pleroma!1552

5 years agoDo not fetch the reply object in `fix_type` unless the object has the
rinpatch [Sun, 11 Aug 2019 19:49:55 +0000 (22:49 +0300)]
Do not fetch the reply object in `fix_type` unless the object has the
`name` key and use a depth limit when fetching it

5 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Sat, 10 Aug 2019 22:43:32 +0000 (23:43 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

5 years agoMerge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'
kaniini [Sat, 10 Aug 2019 21:33:19 +0000 (21:33 +0000)]
Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'

MRF: ensure that subdomain_match calls are case-insensitive

See merge request pleroma/pleroma!1550

5 years agoMRF: ensure that subdomain_match calls are case-insensitive
Ariadne Conill [Sat, 10 Aug 2019 21:18:26 +0000 (21:18 +0000)]
MRF: ensure that subdomain_match calls are case-insensitive

5 years agoMerge branch 'fix/hide-follows-counters' into 'develop'
kaniini [Sat, 10 Aug 2019 18:59:24 +0000 (18:59 +0000)]
Merge branch 'fix/hide-follows-counters' into 'develop'

Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled

See merge request pleroma/pleroma!1544

5 years agoMerge branch 'develop' into 'fix/hide-follows-counters'
kaniini [Sat, 10 Aug 2019 18:49:04 +0000 (18:49 +0000)]
Merge branch 'develop' into 'fix/hide-follows-counters'

# Conflicts:
#   CHANGELOG.md

5 years agoMerge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'
kaniini [Sat, 10 Aug 2019 18:47:40 +0000 (18:47 +0000)]
Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'

Strip internal fields including likes from incoming and outgoing activities

Closes #1159

See merge request pleroma/pleroma!1533

5 years agoStrip internal fields including likes from incoming and outgoing activities
Sergey Suprunenko [Sat, 10 Aug 2019 18:47:40 +0000 (18:47 +0000)]
Strip internal fields including likes from incoming and outgoing activities

5 years agoMerge branch 'test/pleroma_uploaders' into 'develop'
kaniini [Sat, 10 Aug 2019 18:46:26 +0000 (18:46 +0000)]
Merge branch 'test/pleroma_uploaders' into 'develop'

tests for Pleroma.Uploaders

See merge request pleroma/pleroma!1543

5 years agotests for Pleroma.Uploaders
Maksim [Sat, 10 Aug 2019 18:46:26 +0000 (18:46 +0000)]
tests for Pleroma.Uploaders

5 years agoMerge branch 'fix/mastoapi-threadmute-detection' into 'develop'
kaniini [Sat, 10 Aug 2019 18:29:16 +0000 (18:29 +0000)]
Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'

Mastodon API: Fix thread mute detection

See merge request pleroma/pleroma!1548

5 years agoMastodon API: Fix thread mute detection
rinpatch [Sat, 10 Aug 2019 13:27:46 +0000 (16:27 +0300)]
Mastodon API: Fix thread mute detection

It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.

5 years agoMerge branch 'feature/uploader_s3' into 'develop'
rinpatch [Sat, 10 Aug 2019 11:28:00 +0000 (11:28 +0000)]
Merge branch 'feature/uploader_s3' into 'develop'

Uploader.S3 added support stream uploads

See merge request pleroma/pleroma!1545

5 years agoUploader.S3 added support stream uploads
Maksim [Sat, 10 Aug 2019 11:27:59 +0000 (11:27 +0000)]
Uploader.S3 added support stream uploads

5 years agoMastodon API: Set follower/following counters to 0 when hiding
rinpatch [Fri, 9 Aug 2019 13:49:09 +0000 (16:49 +0300)]
Mastodon API: Set follower/following counters to 0 when hiding
followers/following is enabled

We are already doing that in AP representation, so I think we should do
it here as well for consistency.

5 years agoMerge branch 'feature/digest-email' into 'develop'
lain [Thu, 8 Aug 2019 14:38:33 +0000 (14:38 +0000)]
Merge branch 'feature/digest-email' into 'develop'

Feature/digest email

See merge request pleroma/pleroma!1078

5 years agoMerge branch 'patch-3' into 'develop'
rinpatch [Wed, 7 Aug 2019 22:14:02 +0000 (22:14 +0000)]
Merge branch 'patch-3' into 'develop'

Return profile URL when available instead of actor URI for MastodonAPI mention URL

Closes #1165

See merge request pleroma/pleroma!1541

5 years agoReturn profile URL in MastodonAPI's `url` field
Thibaut Girka [Wed, 7 Aug 2019 21:40:53 +0000 (21:40 +0000)]
Return profile URL in MastodonAPI's `url` field

5 years agoSimplify logic to mention.js `url` field
Thibaut Girka [Wed, 7 Aug 2019 20:55:37 +0000 (20:55 +0000)]
Simplify logic to mention.js `url` field

`User.profile_url` already fallbacks to ap_id

5 years agoReturn profile URL when available instead of actor URI for MastodonAPI mention URL
Thibaut Girka [Wed, 7 Aug 2019 20:29:30 +0000 (20:29 +0000)]
Return profile URL when available instead of actor URI for MastodonAPI mention URL

Fixes #1165

5 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Wed, 7 Aug 2019 07:59:31 +0000 (08:59 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

5 years agoMerge branch 'fix/object-reembeds' into 'develop'
Haelwenn [Tue, 6 Aug 2019 22:14:00 +0000 (22:14 +0000)]
Merge branch 'fix/object-reembeds' into 'develop'

Do not rembed the object after updating it

Closes #1142

See merge request pleroma/pleroma!1538

5 years agoDo not rembed the object after updating it
rinpatch [Tue, 6 Aug 2019 22:02:29 +0000 (01:02 +0300)]
Do not rembed the object after updating it

5 years agoOStatus tests: stop relying on embedded objects
rinpatch [Tue, 6 Aug 2019 21:58:48 +0000 (00:58 +0300)]
OStatus tests: stop relying on embedded objects

5 years agoActivityPub tests: remove assertions of embedded object being updated,
rinpatch [Tue, 6 Aug 2019 21:36:13 +0000 (00:36 +0300)]
ActivityPub tests: remove assertions of embedded object being updated,
because the objects are no longer supposed to be embedded

5 years agoOStatus Announce Representer: Do not depend on the object being embedded
rinpatch [Tue, 6 Aug 2019 21:23:58 +0000 (00:23 +0300)]
OStatus Announce Representer: Do not depend on the object being embedded
in the Create activity

5 years agoStop depending on the embedded object in restrict_favorited_by
rinpatch [Tue, 6 Aug 2019 21:12:42 +0000 (00:12 +0300)]
Stop depending on the embedded object in restrict_favorited_by

5 years agoMerge branch 'issue/1150' into 'develop'
kaniini [Tue, 6 Aug 2019 20:19:28 +0000 (20:19 +0000)]
Merge branch 'issue/1150' into 'develop'

[#1150] fixed parser TwitterCard

See merge request pleroma/pleroma!1537

5 years ago[#1150] fixed parser TwitterCard
Maksim [Tue, 6 Aug 2019 20:19:28 +0000 (20:19 +0000)]
[#1150] fixed parser TwitterCard

5 years agoMerge branch 'test/common_api_utils.ex' into 'develop'
kaniini [Mon, 5 Aug 2019 15:37:05 +0000 (15:37 +0000)]
Merge branch 'test/common_api_utils.ex' into 'develop'

tests for CommonApi/Utils

See merge request pleroma/pleroma!1534

5 years agotests for CommonApi/Utils
Maksim [Mon, 5 Aug 2019 15:37:05 +0000 (15:37 +0000)]
tests for CommonApi/Utils

5 years agoMerge branch 'report-email-from-remote-user' into 'develop'
kaniini [Sun, 4 Aug 2019 22:24:50 +0000 (22:24 +0000)]
Merge branch 'report-email-from-remote-user' into 'develop'

Remove Reply-To from report emails

Closes #1141

See merge request pleroma/pleroma!1531

5 years agoRemove Reply-To from report emails
Eugenij [Sun, 4 Aug 2019 22:24:50 +0000 (22:24 +0000)]
Remove Reply-To from report emails

5 years agoMerge branch 'feature/relay-list-task' into 'develop'
kaniini [Sun, 4 Aug 2019 17:14:37 +0000 (17:14 +0000)]
Merge branch 'feature/relay-list-task' into 'develop'

tasks: relay: add list task

Closes #1101

See merge request pleroma/pleroma!1528

5 years agoMerge branch 'fix/wrong-next-key-likes-json' into 'develop'
kaniini [Sun, 4 Aug 2019 17:13:06 +0000 (17:13 +0000)]
Merge branch 'fix/wrong-next-key-likes-json' into 'develop'

Do not add the "next" key to likes.json if there is no more items

See merge request pleroma/pleroma!1530

5 years agoDo not add the "next" key to likes.json if there is no more items
Sergey Suprunenko [Sun, 4 Aug 2019 17:13:06 +0000 (17:13 +0000)]
Do not add the "next" key to likes.json if there is no more items

5 years agoMerge branch 'patch-2' into 'develop'
kaniini [Sun, 4 Aug 2019 17:05:17 +0000 (17:05 +0000)]
Merge branch 'patch-2' into 'develop'

Replace "impode" with "implode"

See merge request pleroma/pleroma!1532

5 years agoReplace "impode" with "implode" for
x0rz3q [Sun, 4 Aug 2019 14:35:45 +0000 (14:35 +0000)]
Replace "impode" with "implode" for

5 years agoMerge branch 'remove-longfox-emoji-set' into 'develop'
kaniini [Sun, 4 Aug 2019 04:32:45 +0000 (04:32 +0000)]
Merge branch 'remove-longfox-emoji-set' into 'develop'

Remove longfox emoji set

See merge request pleroma/pleroma!1525

5 years agoRemove longfox emoji set
Hakaba Hitoyo [Sun, 4 Aug 2019 04:32:45 +0000 (04:32 +0000)]
Remove longfox emoji set

5 years agoMerge branch 'develop' into 'develop'
kaniini [Sun, 4 Aug 2019 04:32:09 +0000 (04:32 +0000)]
Merge branch 'develop' into 'develop'

Fix a stale link and a few typos

See merge request pleroma/pleroma!1529

5 years agoFix some typos and rework a few lines in howto_mediaproxy.md
Pierce McGoran [Sun, 4 Aug 2019 03:12:38 +0000 (03:12 +0000)]
Fix some typos and rework a few lines in howto_mediaproxy.md

5 years agoUpdate link in README.md
Pierce McGoran [Sun, 4 Aug 2019 03:01:21 +0000 (03:01 +0000)]
Update link in README.md

5 years agotasks: relay: add list task
Ariadne Conill [Sat, 3 Aug 2019 23:17:17 +0000 (23:17 +0000)]
tasks: relay: add list task

5 years agoMerge branch 'bugfix/password-reset-link-styling' into 'develop'
kaniini [Sat, 3 Aug 2019 21:29:39 +0000 (21:29 +0000)]
Merge branch 'bugfix/password-reset-link-styling' into 'develop'

templates/layout/app.html.eex: Style anchors

See merge request pleroma/pleroma!1527

5 years agotemplates/layout/app.html.eex: Style anchors
Haelwenn (lanodan) Monnier [Sat, 3 Aug 2019 20:56:20 +0000 (22:56 +0200)]
templates/layout/app.html.eex: Style anchors

[ci skip]

5 years agoMerge branch 'patch-2' into 'develop'
kaniini [Sat, 3 Aug 2019 18:55:09 +0000 (18:55 +0000)]
Merge branch 'patch-2' into 'develop'

Add preferredUsername to service actors so Mastodon can resolve them

See merge request pleroma/pleroma!1526

5 years agoRefactor
Thibaut Girka [Sat, 3 Aug 2019 18:37:20 +0000 (18:37 +0000)]
Refactor

5 years agoOnly add `preferredUsername` to service actor json when the underlying user actually...
Thibaut Girka [Sat, 3 Aug 2019 18:28:08 +0000 (18:28 +0000)]
Only add `preferredUsername` to service actor json when the underlying user actually has a username

5 years agoMerge branch 'admin-fixes' into 'develop'
kaniini [Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)]
Merge branch 'admin-fixes' into 'develop'

Admin fixes

See merge request pleroma/pleroma!1524

5 years agoAdmin fixes
Alexander Strizhakov [Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)]
Admin fixes

5 years agoMerge branch 'fix/search-space-error' into 'develop'
kaniini [Sat, 3 Aug 2019 18:13:21 +0000 (18:13 +0000)]
Merge branch 'fix/search-space-error' into 'develop'

Remove spaces from the domain search

Closes #1154

See merge request pleroma/pleroma!1521

5 years agoRemove spaces from the domain search
Sergey Suprunenko [Sat, 3 Aug 2019 18:13:20 +0000 (18:13 +0000)]
Remove spaces from the domain search

5 years agoMerge branch 'fix/with-reject-nil-clause' into 'develop'
kaniini [Sat, 3 Aug 2019 18:12:39 +0000 (18:12 +0000)]
Merge branch 'fix/with-reject-nil-clause' into 'develop'

Handle MRF rejections of incoming AP activities

Closes #1095

See merge request pleroma/pleroma!1520

5 years agoHandle MRF rejections of incoming AP activities
Sergey Suprunenko [Sat, 3 Aug 2019 18:12:38 +0000 (18:12 +0000)]
Handle MRF rejections of incoming AP activities

5 years agoMerge branch 'official-docker-support' into 'develop'
kaniini [Sat, 3 Aug 2019 18:12:03 +0000 (18:12 +0000)]
Merge branch 'official-docker-support' into 'develop'

Add Dockerfile

See merge request pleroma/pleroma!1523

5 years agoRun mix format
Ashlynn Anderson [Sat, 3 Aug 2019 17:42:57 +0000 (13:42 -0400)]
Run mix format

5 years agoAdd preferredUsername to service actors so Mastodon can resolve them
Thibaut Girka [Sat, 3 Aug 2019 17:24:57 +0000 (17:24 +0000)]
Add preferredUsername to service actors so Mastodon can resolve them

5 years agoAdd .dockerignore
Ashlynn Anderson [Sat, 3 Aug 2019 03:33:47 +0000 (23:33 -0400)]
Add .dockerignore

5 years agoOptimize Dockerfile
Ashlynn Anderson [Sat, 3 Aug 2019 02:40:31 +0000 (22:40 -0400)]
Optimize Dockerfile

Just merging RUNs to decrease the number of layers

5 years agoCreate docker.exs and docker-entrypoint + round out Dockerfile
Ashlynn Anderson [Sat, 3 Aug 2019 02:28:48 +0000 (22:28 -0400)]
Create docker.exs and docker-entrypoint + round out Dockerfile

At this point, the implementation is completely working and has been
tested running live and federating with other instances.

5 years agoBasic working Dockerfile
Ashlynn Anderson [Wed, 31 Jul 2019 23:35:14 +0000 (19:35 -0400)]
Basic working Dockerfile

No fancy script or minit automatic migration, etc, but if you start
the docker image and go in and manually do everything, it works.

5 years agoMerge branch 'docfix/mix_task_options' into 'develop'
Haelwenn [Fri, 2 Aug 2019 21:38:28 +0000 (21:38 +0000)]
Merge branch 'docfix/mix_task_options' into 'develop'

tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at

Closes #1155

See merge request pleroma/pleroma!1522

5 years agotasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
Haelwenn (lanodan) Monnier [Fri, 2 Aug 2019 21:30:47 +0000 (23:30 +0200)]
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155
[ci skip]

5 years agoMerge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
feld [Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)]
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'

Fix/mediaproxy whitelist base url

See merge request pleroma/pleroma!1486

5 years agoFix/mediaproxy whitelist base url
feld [Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)]
Fix/mediaproxy whitelist base url

5 years agoMerge branch 'develop' into feature/digest-email
Roman Chvanikov [Fri, 2 Aug 2019 15:16:04 +0000 (18:16 +0300)]
Merge branch 'develop' into feature/digest-email

5 years agoMerge branch 'feature/hide-follows-remote' into 'develop'
lain [Fri, 2 Aug 2019 11:23:07 +0000 (11:23 +0000)]
Merge branch 'feature/hide-follows-remote' into 'develop'

Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users

See merge request pleroma/pleroma!1411

5 years agoMerge branch 'fix/semver-violations' into 'develop'
kaniini [Thu, 1 Aug 2019 16:37:04 +0000 (16:37 +0000)]
Merge branch 'fix/semver-violations' into 'develop'

Fix Invalid SemVer version generation

See merge request pleroma/pleroma!1517

5 years agoMerge branch 'cleanup-tests' into 'develop'
rinpatch [Thu, 1 Aug 2019 13:38:15 +0000 (13:38 +0000)]
Merge branch 'cleanup-tests' into 'develop'

Clean up `AdminAPIControllerTest` output

See merge request pleroma/pleroma!1516

5 years agoFix Invalid SemVer version generation
rinpatch [Thu, 1 Aug 2019 11:15:18 +0000 (14:15 +0300)]
Fix Invalid SemVer version generation

when the current branch does not have commits ahead of tag/checked out on a tag

5 years agoClean up tests output
Egor Kislitsyn [Thu, 1 Aug 2019 09:33:36 +0000 (16:33 +0700)]
Clean up tests output

5 years agoMerge branch 'chore/changelog-update' into 'develop'
kaniini [Wed, 31 Jul 2019 20:08:27 +0000 (20:08 +0000)]
Merge branch 'chore/changelog-update' into 'develop'

Add a changelog entry for disallowing locked accounts follows over OStatus

See merge request pleroma/pleroma!1513

5 years agoAdd a changelog entry for disallowing locked accounts follows over OStatus
rinpatch [Wed, 31 Jul 2019 20:03:06 +0000 (23:03 +0300)]
Add a changelog entry for disallowing locked accounts follows over OStatus

5 years agoMerge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
kaniini [Wed, 31 Jul 2019 19:13:56 +0000 (19:13 +0000)]
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'

Disallow following locked accounts over OStatus

See merge request pleroma/pleroma!1512

5 years agoDisallow following locked accounts over OStatus
rinpatch [Wed, 31 Jul 2019 19:05:12 +0000 (22:05 +0300)]
Disallow following locked accounts over OStatus

5 years agoMerge branch 'test/web_common_api_utils' into 'develop'
kaniini [Wed, 31 Jul 2019 18:35:15 +0000 (18:35 +0000)]
Merge branch 'test/web_common_api_utils' into 'develop'

test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id

See merge request pleroma/pleroma!1510

5 years agotest for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
Maksim [Wed, 31 Jul 2019 18:35:15 +0000 (18:35 +0000)]
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id

5 years agoMerge branch 'hardening/disallow-ostatus-downgrade' into 'develop'
kaniini [Wed, 31 Jul 2019 18:30:40 +0000 (18:30 +0000)]
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'

ostatus: explicitly disallow protocol downgrade from activitypub

See merge request pleroma/pleroma!1511

5 years agoostatus: explicitly disallow protocol downgrade from activitypub
Ariadne Conill [Wed, 31 Jul 2019 17:23:16 +0000 (17:23 +0000)]
ostatus: explicitly disallow protocol downgrade from activitypub

This closes embargoed bug #1135.

5 years agoAdd tests for counters being updated on follow
rinpatch [Wed, 31 Jul 2019 16:37:55 +0000 (19:37 +0300)]
Add tests for counters being updated on follow

5 years agoMerge branch 'test/twitter/util_controller' into 'develop'
kaniini [Wed, 31 Jul 2019 15:14:36 +0000 (15:14 +0000)]
Merge branch 'test/twitter/util_controller' into 'develop'

tests for TwitterApi/UtilController

See merge request pleroma/pleroma!1509

5 years agotests for TwitterApi/UtilController
Maksim [Wed, 31 Jul 2019 15:14:36 +0000 (15:14 +0000)]
tests for TwitterApi/UtilController

5 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Wed, 31 Jul 2019 13:23:03 +0000 (14:23 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

5 years agoFix credo issues
rinpatch [Wed, 31 Jul 2019 11:20:34 +0000 (14:20 +0300)]
Fix credo issues

5 years agoMerge branch 'develop' into feature/hide-follows-remote
rinpatch [Wed, 31 Jul 2019 11:12:29 +0000 (14:12 +0300)]
Merge branch 'develop' into feature/hide-follows-remote

5 years agoMerge branch 'admin-changes' into 'develop'
kaniini [Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)]
Merge branch 'admin-changes' into 'develop'

Admin changes

See merge request pleroma/pleroma!1489

5 years agoAdmin changes
Alexander Strizhakov [Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)]
Admin changes

5 years agoMerge branch 'security/remote-follow-commonapi' into 'develop'
kaniini [Mon, 29 Jul 2019 20:10:59 +0000 (20:10 +0000)]
Merge branch 'security/remote-follow-commonapi' into 'develop'

twitter api: utils: rework do_remote_follow() to use CommonAPI

Closes #1138

See merge request pleroma/pleroma!1506

5 years agotwitter api: utils: rework do_remote_follow() to use CommonAPI
Ariadne Conill [Mon, 29 Jul 2019 20:00:57 +0000 (20:00 +0000)]
twitter api: utils: rework do_remote_follow() to use CommonAPI

Closes #1138

5 years agoMerge branch 'revert-83508418' into 'develop'
kaniini [Mon, 29 Jul 2019 19:42:35 +0000 (19:42 +0000)]
Merge branch 'revert-83508418' into 'develop'

Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

See merge request pleroma/pleroma!1505

5 years agoRevert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
kaniini [Mon, 29 Jul 2019 19:42:26 +0000 (19:42 +0000)]
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

This reverts merge request !1504

5 years agoMerge branch 'bugfix/clean-up-markdown-rendering' into 'develop'
Haelwenn [Mon, 29 Jul 2019 19:24:14 +0000 (19:24 +0000)]
Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'

markdown: clean up html generated by earmark

See merge request pleroma/pleroma!1504

5 years agomarkdown: clean up html generated by earmark
Ariadne Conill [Mon, 29 Jul 2019 19:09:58 +0000 (19:09 +0000)]
markdown: clean up html generated by earmark

5 years agoMerge branch 'refactor/use-constants' into 'develop'
lain [Mon, 29 Jul 2019 16:30:47 +0000 (16:30 +0000)]
Merge branch 'refactor/use-constants' into 'develop'

refactoring: begin to use constants

See merge request pleroma/pleroma!1500

5 years agoMerge branch 'mailer-enabled-nodeinfo' into 'develop'
kaniini [Mon, 29 Jul 2019 16:17:41 +0000 (16:17 +0000)]
Merge branch 'mailer-enabled-nodeinfo' into 'develop'

Add `mailerEnabled` to the NodeInfo metadata

See merge request pleroma/pleroma!1502