4cb7b1ebc6
Apply suggestion to lib/mix/tasks/pleroma/config.ex
4 years ago
e4c61f1741
added test
4 years ago
c9b5e3feda
revert 'database' option to rejected keys
4 years ago
02a5648feb
fixed migration the settings to DB
4 years ago
bb68f9d27c
Merge branch 'release/update-otp-elixir' into 'develop'
...
Update elixir image used for OTP releases
See merge request pleroma/pleroma!2654
4 years ago
281ecd6b30
CHANGELOG.md: mention minimal elixir version update
4 years ago
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.
4 years ago
83e5b95102
Merge branch 'hotfix/notification-migration' into 'develop'
...
Chunk the notification type backfill migration
See merge request pleroma/pleroma!2653
4 years ago
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.
4 years ago
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
4 years ago
8bfacffabc
Merge branch 'elixir-1.9' into 'develop'
...
Upgrade to Elixir 1.9
See merge request pleroma/pleroma!2651
4 years ago
aca6a7543a
Upgrade to Elixir 1.9
4 years ago
4baf5ffe73
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Mogrify args in adminFE
Closes #1787
See merge request pleroma/pleroma!2616
4 years ago
32c6576b60
naming
4 years ago
e1603ac8fe
fix attemps to merge map
4 years ago
23decaab81
fix for updated hackney
...
warning: :hackney_connect.partial_chain/1 is undefined or private
4 years ago
9a4fde9766
Mogrify args as custom tuples
4 years ago
1e49bfa9ac
Merge branch 'merge-ogp-twitter-parsers' into 'develop'
...
Merge OGP parser with TwitterCard
Closes #1835
See merge request pleroma/pleroma!2642
4 years ago
bd63089a63
Fix tests
4 years ago
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
1092b36500
Changelog: Add info about conversation view changes.
4 years ago
b7df7436c8
Conversations: Return last dm for conversation, not last message.
4 years ago
448e93ce2c
Merge branch 'notifications-filtering' into 'develop'
...
Mastodon API return full result set in notifications
See merge request pleroma/pleroma!2552
4 years ago
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
4 years ago
1d625c29a0
ControllerHelper: Always return id field.
4 years ago
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
520367d6fd
Fix atom leak in Rich Media Parser
4 years ago
e2793744c5
Merge branch 'patch-1' into 'develop'
...
Update pleroma.nginx to support TLSv1.3
See merge request pleroma/pleroma!2644
4 years ago
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
4 years ago
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
4 years ago
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
4 years ago
4655407451
Apply suggestion to config/description.exs
4 years ago
6d902916dd
Merge branch 'features/mix-task-reset-mfa' into 'develop'
...
New mix task: pleroma.user reset_mfa <nickname>
See merge request pleroma/pleroma!2643
4 years ago
ebbf2189ee
Merge branch 'chore/bump-changelog' into 'develop'
...
Add changelog entry for emoji pack reload command
See merge request pleroma/pleroma!2646
4 years ago
e505e59d9c
Document new mix task feature to reset mfa
4 years ago
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
4 years ago
c2048f75cd
Add changelog entry for emoji pack reload command
4 years ago
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
4 years ago
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
4 years ago
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
122328b93a
Update pleroma.nginx to support TLSv1.3
...
Based on SSL config from https://ssl-config.mozilla.org/
4 years ago
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
4 years ago
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
4 years ago
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
4 years ago
7f7a1a4676
Check for media proxy base_url, not Upload base_url
4 years ago
8a59fde0e5
Merge branch 'develop' into fix/csp-mediaproxy-base-url
4 years ago
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
4 years ago
lain