lain [Fri, 13 Sep 2019 14:31:27 +0000 (16:31 +0200)]
Merge remote-tracking branch 'origin/develop' into reactions
lain [Fri, 13 Sep 2019 14:19:50 +0000 (16:19 +0200)]
Pleroma API Docs: Documented Emoji reaction endpoints.
lain [Fri, 13 Sep 2019 14:06:34 +0000 (16:06 +0200)]
ActivityPub: Use is_unicode_emoji? function.
Haelwenn [Fri, 13 Sep 2019 12:46:16 +0000 (12:46 +0000)]
Merge branch 'feature/change-email' into 'develop'
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
rinpatch [Fri, 13 Sep 2019 12:36:24 +0000 (12:36 +0000)]
Merge branch 'admin-config-description' into 'develop'
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
Egor Kislitsyn [Wed, 28 Aug 2019 07:50:58 +0000 (14:50 +0700)]
Add a note about compatibility with Mastodon
Egor Kislitsyn [Fri, 13 Sep 2019 06:09:35 +0000 (13:09 +0700)]
Add email change endpoint
kaniini [Fri, 13 Sep 2019 03:31:16 +0000 (03:31 +0000)]
Merge branch 'fix/admin-api-docs' into 'develop'
Fix admin api docs for creating users
See merge request pleroma/pleroma!1660
Angelina Filippova [Fri, 13 Sep 2019 03:31:16 +0000 (03:31 +0000)]
Fix admin api docs for creating users
lain [Fri, 13 Sep 2019 00:11:02 +0000 (02:11 +0200)]
Emoji: Add function to detect if a character is an emoji
Haelwenn [Thu, 12 Sep 2019 20:21:56 +0000 (20:21 +0000)]
Merge branch 'fix/error-log-double-quotes' into 'develop'
Fix double quotes in error logs
See merge request pleroma/pleroma!1656
Mark Felder [Thu, 12 Sep 2019 17:29:08 +0000 (12:29 -0500)]
Fix associated test as well
lain [Thu, 12 Sep 2019 16:59:13 +0000 (18:59 +0200)]
Transmogrifier: Strip internal emoji reaction fields.
lain [Thu, 12 Sep 2019 16:48:25 +0000 (18:48 +0200)]
PleromaAPIController: Add endpoint to fetch emoji reactions.
Mark Felder [Wed, 11 Sep 2019 21:16:09 +0000 (16:16 -0500)]
Fix double quotes in error logs
Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/
6288a14b-0623-40fc-a26a-
0d358f8a11ca"", error: nil
kaniini [Wed, 11 Sep 2019 20:47:25 +0000 (20:47 +0000)]
Merge branch 'feature/jason-view-render' into 'develop'
Use Jason for rendering responses
See merge request pleroma/pleroma!1655
rinpatch [Wed, 11 Sep 2019 20:04:01 +0000 (23:04 +0300)]
Use Jason for rendering responses
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](https://github.com/phoenixframework/phoenix/blob/
3bfb9f6e900c9a2e31cb95736e2cb5bdad329b61/lib/phoenix.ex#L58-L59)
Haelwenn [Wed, 11 Sep 2019 17:47:19 +0000 (17:47 +0000)]
Merge branch 'patch-5' into 'develop'
Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642
lain [Wed, 11 Sep 2019 11:21:03 +0000 (11:21 +0000)]
Merge branch 'fix/oom-parallel-rendering' into 'develop'
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
rinpatch [Tue, 10 Sep 2019 20:08:15 +0000 (23:08 +0300)]
Add extended benchmark
Alex S [Wed, 11 Sep 2019 06:32:58 +0000 (09:32 +0300)]
web_cache_ttl description
Alex S [Tue, 3 Sep 2019 17:11:32 +0000 (20:11 +0300)]
refactoring
Alex S [Tue, 3 Sep 2019 17:06:22 +0000 (20:06 +0300)]
little refactor
Alex S [Tue, 3 Sep 2019 16:22:25 +0000 (19:22 +0300)]
some changes
Alex S [Tue, 3 Sep 2019 09:32:00 +0000 (12:32 +0300)]
placeholder for config.md
Alex S [Tue, 3 Sep 2019 09:31:43 +0000 (12:31 +0300)]
little fix
Alex S [Tue, 3 Sep 2019 09:30:44 +0000 (12:30 +0300)]
bump ex_doc version
Alex S [Tue, 3 Sep 2019 08:56:21 +0000 (11:56 +0300)]
formatting
Alex S [Tue, 3 Sep 2019 06:45:54 +0000 (09:45 +0300)]
don't add behaviour to suggestions
Alexander Strizhakov [Tue, 3 Sep 2019 06:45:16 +0000 (06:45 +0000)]
Apply suggestion to config/description.exs
Alexander Strizhakov [Tue, 3 Sep 2019 06:45:02 +0000 (06:45 +0000)]
Apply suggestion to config/description.exs
Alex S [Fri, 30 Aug 2019 17:14:18 +0000 (20:14 +0300)]
little fix
Alex S [Fri, 30 Aug 2019 16:59:13 +0000 (19:59 +0300)]
typo fix
Alex S [Fri, 30 Aug 2019 16:14:01 +0000 (19:14 +0300)]
some changes
Alex S [Fri, 30 Aug 2019 11:27:55 +0000 (14:27 +0300)]
fix
Alex S [Fri, 30 Aug 2019 11:09:07 +0000 (14:09 +0300)]
changelog
Alex S [Fri, 30 Aug 2019 11:04:21 +0000 (14:04 +0300)]
expanding regex sigils to use modifiers
Alex S [Fri, 30 Aug 2019 10:22:21 +0000 (13:22 +0300)]
mix docs generates config.md
Alex S [Fri, 30 Aug 2019 10:21:48 +0000 (13:21 +0300)]
description formatters
Alex S [Fri, 30 Aug 2019 10:20:09 +0000 (13:20 +0300)]
description.exs
Alex S [Fri, 30 Aug 2019 09:00:36 +0000 (12:00 +0300)]
deleting old config.md file
rinpatch [Tue, 10 Sep 2019 19:01:45 +0000 (22:01 +0300)]
Revert "Parallelize template rendering"
This reverts commit
1ad71592adb47762287aec8c36d0fca565c38362.
Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.
lain [Tue, 10 Sep 2019 18:53:41 +0000 (18:53 +0000)]
Merge branch 'fix/tests' into 'develop'
Fix tests for `Activity.all_by_ids_with_object/1`
See merge request pleroma/pleroma!1652
Egor Kislitsyn [Tue, 10 Sep 2019 18:08:37 +0000 (01:08 +0700)]
Fix `Activity.all_by_ids_with_object/1` test
lain [Tue, 10 Sep 2019 17:04:12 +0000 (17:04 +0000)]
Merge branch 'statuses-by-ids' into 'develop'
Add an endpoint to get multiple statuses by IDs
Closes #1240
See merge request pleroma/pleroma!1621
Egor Kislitsyn [Tue, 3 Sep 2019 09:58:33 +0000 (16:58 +0700)]
Add note about limit to the doc
Egor Kislitsyn [Tue, 3 Sep 2019 09:23:03 +0000 (16:23 +0700)]
Add an endpoint to get multiple statuses by IDs
feld [Mon, 9 Sep 2019 18:53:09 +0000 (18:53 +0000)]
Merge branch 'cache-plug' into 'develop'
Add Pleroma.Plugs.Cache
Closes #1174
See merge request pleroma/pleroma!1612
minibikini [Mon, 9 Sep 2019 18:53:08 +0000 (18:53 +0000)]
Add Pleroma.Plugs.Cache
feld [Mon, 9 Sep 2019 18:39:44 +0000 (18:39 +0000)]
Merge branch 'update-changelog' into 'develop'
Update CHANGELOG (add a note about !1649)
See merge request pleroma/pleroma!1650
Egor Kislitsyn [Mon, 9 Sep 2019 18:30:02 +0000 (01:30 +0700)]
Update CHANGELOG (add a note about !1649)
feld [Mon, 9 Sep 2019 18:21:29 +0000 (18:21 +0000)]
Merge branch 'fix/read-inbox' into 'develop'
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
Egor Kislitsyn [Mon, 9 Sep 2019 18:11:57 +0000 (01:11 +0700)]
Fix `ActivityPubController.read_inbox/2`
shadowfacts [Sat, 7 Sep 2019 19:50:45 +0000 (19:50 +0000)]
Mastodon API: URI encode hashtag name in generated URLs
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
kaniini [Fri, 6 Sep 2019 23:25:30 +0000 (23:25 +0000)]
Merge branch 'chore/query-optimization' into 'develop'
chore: query optimization
Closes #1224
See merge request pleroma/pleroma!1640
Ariadne Conill [Fri, 6 Sep 2019 23:14:29 +0000 (23:14 +0000)]
activity: when restricting deactivated users, precalculate the user list
the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make. while we plan to simplify these queries through
unification of activities and objects, we are not yet there. it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.
accordingly, drop the subquery and precalc the user list instead.
Ariadne Conill [Fri, 6 Sep 2019 23:11:26 +0000 (23:11 +0000)]
activitypub: help ecto build a better query for thread mute filtering
using an indexed value in thread_mute table helps ecto build a better query.
rinpatch [Fri, 6 Sep 2019 15:29:03 +0000 (15:29 +0000)]
Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
See merge request pleroma/pleroma!1638
rinpatch [Fri, 6 Sep 2019 15:28:01 +0000 (18:28 +0300)]
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
rinpatch [Fri, 6 Sep 2019 08:43:38 +0000 (08:43 +0000)]
Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI
See merge request pleroma/pleroma!1605
rinpatch [Fri, 6 Sep 2019 08:41:30 +0000 (08:41 +0000)]
Merge branch 'update-frontend-
e75ac9dd' into 'develop'
Update frontend bundle to
e75ac9dd
See merge request pleroma/pleroma!1635
rinpatch [Fri, 6 Sep 2019 08:31:44 +0000 (11:31 +0300)]
Update frontend bundle to
e75ac9dd
rinpatch [Thu, 5 Sep 2019 19:23:52 +0000 (19:23 +0000)]
Merge branch 'hotifx/emoji-trailing' into 'develop'
Call TrailingFormatPlug for /api/pleroma/emoji
See merge request pleroma/pleroma!1634
rinpatch [Thu, 5 Sep 2019 19:21:20 +0000 (22:21 +0300)]
Call TrailingFormatPlug for /api/pleroma/emoji
Apparently Pleroma-FE still calls it with trailing '.json'
Haelwenn [Thu, 5 Sep 2019 12:48:27 +0000 (12:48 +0000)]
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
rinpatch [Thu, 5 Sep 2019 12:33:49 +0000 (15:33 +0300)]
Move checking for restrict_local to User.get_cached_by_id_or_nickname
rinpatch [Thu, 5 Sep 2019 09:11:16 +0000 (09:11 +0000)]
Merge branch 'fix/endless-poll-handling' into 'develop'
Mastodon API Poll view: Fix handling of polls without an end date
See merge request pleroma/pleroma!1631
rinpatch [Thu, 5 Sep 2019 08:58:02 +0000 (11:58 +0300)]
Mastodon API Poll view: Fix handling of polls without an end date
rinpatch [Thu, 5 Sep 2019 05:47:06 +0000 (05:47 +0000)]
Merge branch 'fix/safe-render-notifications' into 'develop'
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
rinpatch [Thu, 5 Sep 2019 05:32:49 +0000 (08:32 +0300)]
Do not crash if one notification failed to render
rinpatch [Wed, 4 Sep 2019 20:22:41 +0000 (20:22 +0000)]
Merge branch 'dockerfile-touchups' into 'develop'
Update Dockerfile + some touchups to docker.exs
See merge request pleroma/pleroma!1624
Ashlynn Anderson [Wed, 4 Sep 2019 18:56:26 +0000 (14:56 -0400)]
Switch to alpine:3.9 to avoid dlsym errors
lain [Wed, 4 Sep 2019 17:20:35 +0000 (12:20 -0500)]
PleromaAPIController: Add emoji reactions.
Haelwenn [Wed, 4 Sep 2019 11:26:34 +0000 (11:26 +0000)]
Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'
Mastodon API: Add `pleroma.thread_muted` to Status entity
See merge request pleroma/pleroma!1626
rinpatch [Wed, 4 Sep 2019 11:16:56 +0000 (14:16 +0300)]
Mastodon API: Add `pleroma.thread_muted` to Status entity
Needed for pleroma-fe!941
Haelwenn [Wed, 4 Sep 2019 10:46:49 +0000 (10:46 +0000)]
Merge branch 'feature/mastoapi-read-notifications' into 'develop'
Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities
See merge request pleroma/pleroma!1625
rinpatch [Wed, 4 Sep 2019 10:39:39 +0000 (13:39 +0300)]
Clarify that read notifications are returned
rinpatch [Wed, 4 Sep 2019 10:37:43 +0000 (10:37 +0000)]
Apply suggestion to docs/api/pleroma_api.md
rinpatch [Wed, 4 Sep 2019 10:14:15 +0000 (10:14 +0000)]
Apply suggestion to lib/pleroma/notification.ex
rinpatch [Wed, 4 Sep 2019 08:33:08 +0000 (11:33 +0300)]
Extend `/api/pleroma/notifications/read` to mark multiple notifications
as read and make it respond with Mastoapi entities
lain [Tue, 3 Sep 2019 21:50:04 +0000 (16:50 -0500)]
ActivityPub: Save emoji reactions in object.
rinpatch [Tue, 3 Sep 2019 14:54:21 +0000 (17:54 +0300)]
Mastdon API: Add ability to get a remote account by nickname to
`/api/v1/accounts/:id`
Ashlynn Anderson [Tue, 3 Sep 2019 15:44:57 +0000 (11:44 -0400)]
Switch to official elixir:1.9-alpine image for build
Ashlynn Anderson [Mon, 5 Aug 2019 19:35:34 +0000 (15:35 -0400)]
Remove dynamic config as default, add healthcheck
rinpatch [Tue, 3 Sep 2019 13:03:06 +0000 (13:03 +0000)]
Merge branch 'feature/pagination-total' into 'develop'
Return total items count from pagination + tests
See merge request pleroma/pleroma!1620
Maxim Filippov [Tue, 3 Sep 2019 10:58:27 +0000 (13:58 +0300)]
Return "total" optionally
Maxim Filippov [Mon, 2 Sep 2019 19:48:52 +0000 (22:48 +0300)]
Return total from pagination + tests
rinpatch [Sat, 31 Aug 2019 10:08:43 +0000 (13:08 +0300)]
credo fixes
rinpatch [Sat, 31 Aug 2019 08:40:04 +0000 (11:40 +0300)]
Add back /api/qvitter/statuses/notifications/read.json
rinpatch [Sat, 31 Aug 2019 07:57:35 +0000 (10:57 +0300)]
Remove a useless import
rinpatch [Sat, 31 Aug 2019 07:45:37 +0000 (10:45 +0300)]
Add a changelog entry for twitterapi removal and fix credo issues
rinpatch [Sat, 31 Aug 2019 07:41:15 +0000 (10:41 +0300)]
Remove TwitterAPI representers
rinpatch [Sat, 31 Aug 2019 07:34:29 +0000 (10:34 +0300)]
Remove Mention of TwitterAPI in readme
rinpatch [Sat, 31 Aug 2019 07:31:15 +0000 (10:31 +0300)]
Remove Activity, User and Notification views from TwitterAPI
rinpatch [Sat, 31 Aug 2019 07:20:34 +0000 (10:20 +0300)]
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
feld [Fri, 30 Aug 2019 15:23:15 +0000 (15:23 +0000)]
Merge branch 'iss-930-media' into 'develop'
Fix missing changes in pleroma/pleroma!1197
See merge request pleroma/pleroma!1613
kPherox [Fri, 30 Aug 2019 12:00:50 +0000 (21:00 +0900)]
Fix missing changes in pleroma/pleroma!1197
kaniini [Fri, 30 Aug 2019 00:38:03 +0000 (00:38 +0000)]
Merge branch 'fix/antifollowbot-and-relays' into 'develop'
Fix AntiFollowbotPolicy when trying to follow a relay
Closes #1231
See merge request pleroma/pleroma!1610
feld [Fri, 30 Aug 2019 00:38:03 +0000 (00:38 +0000)]
Fix AntiFollowbotPolicy when trying to follow a relay
Haelwenn [Wed, 28 Aug 2019 07:10:35 +0000 (07:10 +0000)]
Merge branch 'fix-osada-follow' into 'develop'
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
projects / akkoma / log