bce16f4557
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG (add a note about !1649 )
See merge request pleroma/pleroma!1650
5 years ago
e34de00052
Update CHANGELOG (add a note about !1649 )
5 years ago
edbaf78176
Merge branch 'fix/read-inbox' into 'develop'
...
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
5 years ago
e0f84d0043
Fix `ActivityPubController.read_inbox/2`
5 years ago
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
e5c6bf3673
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.
5 years ago
8c6cdff3cc
Merge branch 'develop' into issue/1218
5 years ago
39f99dc6cd
Merge branch 'develop' into support/tests
5 years ago
c45013df8e
Merge branch 'chore/query-optimization' into 'develop'
...
chore: query optimization
Closes #1224
See merge request pleroma/pleroma!1640
5 years ago
40a61532ca
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.
5 years ago
5effb2cbca
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.
5 years ago
130bc8e0d5
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
5 years ago
f92dc82dda
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
5 years ago
eb74c3d5c7
Merge branch 'develop' into issue/1218
5 years ago
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
40b3289c26
Refactor `add_link_headers/7` -> `add_link_headers/3`
5 years ago
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
5 years ago
d0e0f2380d
Merge branch 'update-frontend-e75ac9dd' into 'develop'
...
Update frontend bundle to e75ac9dd
See merge request pleroma/pleroma!1635
5 years ago
16e6be340d
Update frontend bundle to e75ac9dd
5 years ago
592ce8a74f
Merge branch 'hotifx/emoji-trailing' into 'develop'
...
Call TrailingFormatPlug for /api/pleroma/emoji
See merge request pleroma/pleroma!1634
5 years ago
3523bdcf26
Call TrailingFormatPlug for /api/pleroma/emoji
...
Apparently Pleroma-FE still calls it with trailing '.json'
5 years ago
736165c082
Reverse reports list
5 years ago
fe7cf44c40
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
5 years ago
26fe6f70c9
Move checking for restrict_local to User.get_cached_by_id_or_nickname
5 years ago
9d4fc9aa35
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
5 years ago
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
3e30f6e198
Merge branch 'fix/safe-render-notifications' into 'develop'
...
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
5 years ago
558969a0fd
Do not crash if one notification failed to render
5 years ago
3b8d64ee24
Merge branch 'dockerfile-touchups' into 'develop'
...
Update Dockerfile + some touchups to docker.exs
See merge request pleroma/pleroma!1624
5 years ago
053b17f57e
Switch to alpine:3.9 to avoid dlsym errors
5 years ago
ae506ca997
fix formatting
5 years ago
e2011a667c
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
8306078de1
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
af746fa4a8
Return total for reports
5 years ago
cb99cfcc65
don't try to truncate non-strings
5 years ago
2975da284b
truncate remote user bio/display name
5 years ago
a890451187
fetch_announcements -> take_announcements
5 years ago
8cbad5500c
add tests for activity_pub/utils.ex
5 years ago
e72531bfac
Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'
...
Mastodon API: Add `pleroma.thread_muted` to Status entity
See merge request pleroma/pleroma!1626
5 years ago
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
e54694748b
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
5 years ago
328b2612cd
Clarify that read notifications are returned
5 years ago
377aa9fb90
Apply suggestion to docs/api/pleroma_api.md
5 years ago
7c3838090f
Apply suggestion to lib/pleroma/notification.ex
5 years ago
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
5 years ago
4b422b5469
Switch to official elixir:1.9-alpine image for build
5 years ago
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
5 years ago
bd8b92ea5e
Remove dynamic config as default, add healthcheck
5 years ago
feld