kaniini [Tue, 13 Aug 2019 02:45:47 +0000 (02:45 +0000)]
Merge branch 'feature/remove-disable-blocks' into 'develop'
config: remove legacy activitypub accept_blocks setting
See merge request pleroma/pleroma!1556
Ariadne Conill [Tue, 13 Aug 2019 02:15:21 +0000 (02:15 +0000)]
config: remove legacy activitypub accept_blocks setting
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
rinpatch [Mon, 12 Aug 2019 21:07:11 +0000 (21:07 +0000)]
Merge branch 'update/admin-fe' into 'develop'
Update AdminFE
See merge request pleroma/pleroma!1555
Mark Felder [Mon, 12 Aug 2019 20:00:03 +0000 (15:00 -0500)]
Update AdminFE
Now permits server configuration. Consider this ALPHA.
rinpatch [Sun, 11 Aug 2019 20:25:17 +0000 (20:25 +0000)]
Merge branch 'chore/changelog-update' into 'develop'
Add a changelog entry for !1552
See merge request pleroma/pleroma!1553
rinpatch [Sun, 11 Aug 2019 20:19:20 +0000 (23:19 +0300)]
Add a changelog entry for !1552
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
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
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
Ariadne Conill [Sat, 10 Aug 2019 21:18:26 +0000 (21:18 +0000)]
MRF: ensure that subdomain_match calls are case-insensitive
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
kaniini [Sat, 10 Aug 2019 18:49:04 +0000 (18:49 +0000)]
Merge branch 'develop' into 'fix/hide-follows-counters'
# Conflicts:
# CHANGELOG.md
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
Sergey Suprunenko [Sat, 10 Aug 2019 18:47:40 +0000 (18:47 +0000)]
Strip internal fields including likes from incoming and outgoing activities
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
Maksim [Sat, 10 Aug 2019 18:46:26 +0000 (18:46 +0000)]
tests for Pleroma.Uploaders
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
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.
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
Maksim [Sat, 10 Aug 2019 11:27:59 +0000 (11:27 +0000)]
Uploader.S3 added support stream uploads
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.
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
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
Thibaut Girka [Wed, 7 Aug 2019 21:40:53 +0000 (21:40 +0000)]
Return profile URL in MastodonAPI's `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
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
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
rinpatch [Tue, 6 Aug 2019 22:02:29 +0000 (01:02 +0300)]
Do not rembed the object after updating it
rinpatch [Tue, 6 Aug 2019 21:58:48 +0000 (00:58 +0300)]
OStatus tests: stop relying on embedded objects
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
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
rinpatch [Tue, 6 Aug 2019 21:12:42 +0000 (00:12 +0300)]
Stop depending on the embedded object in restrict_favorited_by
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
Maksim [Tue, 6 Aug 2019 20:19:28 +0000 (20:19 +0000)]
[#1150] fixed parser TwitterCard
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
Maksim [Mon, 5 Aug 2019 15:37:05 +0000 (15:37 +0000)]
tests for CommonApi/Utils
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
Eugenij [Sun, 4 Aug 2019 22:24:50 +0000 (22:24 +0000)]
Remove Reply-To from report emails
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
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
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
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
x0rz3q [Sun, 4 Aug 2019 14:35:45 +0000 (14:35 +0000)]
Replace "impode" with "implode" for
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
Hakaba Hitoyo [Sun, 4 Aug 2019 04:32:45 +0000 (04:32 +0000)]
Remove longfox emoji set
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
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
Pierce McGoran [Sun, 4 Aug 2019 03:01:21 +0000 (03:01 +0000)]
Update link in README.md
Ariadne Conill [Sat, 3 Aug 2019 23:17:17 +0000 (23:17 +0000)]
tasks: relay: add list task
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
Haelwenn (lanodan) Monnier [Sat, 3 Aug 2019 20:56:20 +0000 (22:56 +0200)]
templates/layout/app.html.eex: Style anchors
[ci skip]
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
Thibaut Girka [Sat, 3 Aug 2019 18:37:20 +0000 (18:37 +0000)]
Refactor
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
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
Alexander Strizhakov [Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)]
Admin fixes
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
Sergey Suprunenko [Sat, 3 Aug 2019 18:13:20 +0000 (18:13 +0000)]
Remove spaces from the domain search
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
Sergey Suprunenko [Sat, 3 Aug 2019 18:12:38 +0000 (18:12 +0000)]
Handle MRF rejections of incoming AP activities
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
Ashlynn Anderson [Sat, 3 Aug 2019 17:42:57 +0000 (13:42 -0400)]
Run mix format
Thibaut Girka [Sat, 3 Aug 2019 17:24:57 +0000 (17:24 +0000)]
Add preferredUsername to service actors so Mastodon can resolve them
Ashlynn Anderson [Sat, 3 Aug 2019 03:33:47 +0000 (23:33 -0400)]
Add .dockerignore
Ashlynn Anderson [Sat, 3 Aug 2019 02:40:31 +0000 (22:40 -0400)]
Optimize Dockerfile
Just merging RUNs to decrease the number of layers
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.
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.
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
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]
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
feld [Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)]
Fix/mediaproxy whitelist base url
Roman Chvanikov [Fri, 2 Aug 2019 15:16:04 +0000 (18:16 +0300)]
Merge branch 'develop' into feature/digest-email
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
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
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
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
Egor Kislitsyn [Thu, 1 Aug 2019 09:33:36 +0000 (16:33 +0700)]
Clean up tests output
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
rinpatch [Wed, 31 Jul 2019 20:03:06 +0000 (23:03 +0300)]
Add a changelog entry for disallowing locked accounts follows over OStatus
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
rinpatch [Wed, 31 Jul 2019 19:05:12 +0000 (22:05 +0300)]
Disallow following locked accounts over OStatus
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
Maksim [Wed, 31 Jul 2019 18:35:15 +0000 (18:35 +0000)]
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
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
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.
rinpatch [Wed, 31 Jul 2019 16:37:55 +0000 (19:37 +0300)]
Add tests for counters being updated on follow
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
Maksim [Wed, 31 Jul 2019 15:14:36 +0000 (15:14 +0000)]
tests for TwitterApi/UtilController
rinpatch [Wed, 31 Jul 2019 11:20:34 +0000 (14:20 +0300)]
Fix credo issues
rinpatch [Wed, 31 Jul 2019 11:12:29 +0000 (14:12 +0300)]
Merge branch 'develop' into feature/hide-follows-remote
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
Alexander Strizhakov [Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)]
Admin changes
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
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
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
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
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
Ariadne Conill [Mon, 29 Jul 2019 19:09:58 +0000 (19:09 +0000)]
markdown: clean up html generated by earmark
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
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
projects / akkoma / log