281ecd6b30
CHANGELOG.md: mention minimal elixir version update
2020-06-17 02:30:38 +03:00
55d8263c00
Update OTP releases to official images of 1.10.3
...
This is necessary since we bumped required version of elixir to 1.9.
The dlsym bug should be gone by now.
2020-06-17 02:27:28 +03:00
83e5b95102
Merge branch 'hotfix/notification-migration' into 'develop'
...
Chunk the notification type backfill migration
See merge request pleroma/pleroma!2653
2020-06-16 21:07:04 +00:00
5c0e1039ce
Chunk the notification type backfill migration
...
Long-term we want that migration to be done entirely in SQL,
but for now this is a hotfix to not cause OOMs on large databases.
This is using a homegrown version of `Repo.stream`, it's worse in
terms of performance than the upstream since it doesn't use the same
prepared query for chunk queries, but unlike the upstream it supports
preloads.
2020-06-16 23:53:13 +03:00
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
2020-06-16 18:10:00 +00:00
8bfacffabc
Merge branch 'elixir-1.9' into 'develop'
...
Upgrade to Elixir 1.9
See merge request pleroma/pleroma!2651
2020-06-16 13:18:29 +00:00
aca6a7543a
Upgrade to Elixir 1.9
2020-06-16 13:18:29 +00:00
4baf5ffe73
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Mogrify args in adminFE
Closes #1787
See merge request pleroma/pleroma!2616
2020-06-16 13:17:52 +00:00
32c6576b60
naming
2020-06-16 15:54:22 +03:00
e1603ac8fe
fix attemps to merge map
2020-06-16 15:54:22 +03:00
23decaab81
fix for updated hackney
...
warning: :hackney_connect.partial_chain/1 is undefined or private
2020-06-16 15:54:22 +03:00
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
1e49bfa9ac
Merge branch 'merge-ogp-twitter-parsers' into 'develop'
...
Merge OGP parser with TwitterCard
Closes #1835
See merge request pleroma/pleroma!2642
2020-06-15 12:41:48 +00:00
bd63089a63
Fix tests
2020-06-15 16:20:05 +04:00
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
1092b36500
Changelog: Add info about conversation view changes.
2020-06-15 12:30:11 +02:00
b7df7436c8
Conversations: Return last dm for conversation, not last message.
2020-06-15 12:27:13 +02:00
448e93ce2c
Merge branch 'notifications-filtering' into 'develop'
...
Mastodon API return full result set in notifications
See merge request pleroma/pleroma!2552
2020-06-15 07:57:58 +00:00
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
2020-06-14 18:27:11 +03:00
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
2020-06-13 17:20:43 +00:00
1d625c29a0
ControllerHelper: Always return id field.
2020-06-13 13:12:43 +02:00
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-13 10:37:15 +00:00
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
520367d6fd
Fix atom leak in Rich Media Parser
2020-06-13 12:08:46 +03:00
e2793744c5
Merge branch 'patch-1' into 'develop'
...
Update pleroma.nginx to support TLSv1.3
See merge request pleroma/pleroma!2644
2020-06-12 21:46:16 +00:00
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
2020-06-12 16:57:13 +00:00
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
2020-06-12 18:39:51 +04:00
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-12 18:25:29 +04:00
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
2020-06-12 14:14:09 +00:00
4655407451
Apply suggestion to config/description.exs
2020-06-12 14:03:33 +00:00
6d902916dd
Merge branch 'features/mix-task-reset-mfa' into 'develop'
...
New mix task: pleroma.user reset_mfa <nickname>
See merge request pleroma/pleroma!2643
2020-06-12 14:01:19 +00:00
ebbf2189ee
Merge branch 'chore/bump-changelog' into 'develop'
...
Add changelog entry for emoji pack reload command
See merge request pleroma/pleroma!2646
2020-06-12 13:55:13 +00:00
e505e59d9c
Document new mix task feature to reset mfa
2020-06-12 08:51:11 -05:00
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
2020-06-12 08:43:50 -05:00
c2048f75cd
Add changelog entry for emoji pack reload command
2020-06-12 08:42:23 -05:00
1419c67f4d
Merge branch 'feature/cli-reload-emoji' into 'develop'
...
Add command to reload emoji packs from cli for OTP users
Closes #1814
See merge request pleroma/pleroma!2639
2020-06-12 13:32:59 +00:00
11aa02bb10
Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'
...
[#1794 ] Fixes URI query handling for hashtags extraction in search
Closes #1794
See merge request pleroma/pleroma!2645
2020-06-12 12:31:27 +00:00
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-12 14:25:41 +03:00
122328b93a
Update pleroma.nginx to support TLSv1.3
...
Based on SSL config from https://ssl-config.mozilla.org/
2020-06-12 02:05:49 -04:00
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
2020-06-11 22:54:48 +02:00
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
2020-06-11 23:11:46 +04:00
5474b5c988
Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'
...
HTTP security plug: add media proxy base url host to csp
See merge request pleroma/pleroma!2638
2020-06-11 16:18:06 +00:00
7f7a1a4676
Check for media proxy base_url, not Upload base_url
2020-06-11 11:05:22 -05:00
8a59fde0e5
Merge branch 'develop' into fix/csp-mediaproxy-base-url
2020-06-11 10:25:00 -05:00
5d6ec6e5fc
Merge branch '1794-hashtags-construction-from-uri' into 'develop'
...
[#1794 ] Hashtags search fix for URI as query string
Closes #1794
See merge request pleroma/pleroma!2641
2020-06-11 14:04:51 +00:00
1f35acce54
Merge OGP parser with TwitterCard
2020-06-11 17:57:31 +04:00
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-11 16:05:14 +03:00
5e44e9d698
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 18:56:46 +00:00
7c47f791a8
Add command to reload emoji packs from cli for OTP users
...
Not useful for source releases as we don't have a way to automate connecting to the running instance.
2020-06-10 13:02:08 -05:00
99afc7f4e4
HTTP security plug: add media proxy base url host to csp
2020-06-10 20:09:16 +03:00
rinpatch