Maksim
2991aae4c4
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
2020-06-17 12:58:38 +00:00
Maksim
11b22a4229
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
2020-06-17 12:58:33 +00:00
Maksim
6d33a3a51b
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17 12:58:28 +00:00
Maksim
793a53f1ec
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17 12:58:16 +00:00
Maksim
1b45bc7b2a
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
2020-06-17 12:58:08 +00:00
Maksim
74fd761637
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
2020-06-17 12:56:30 +00:00
Maksim
abfb1c756b
Apply suggestion to docs/API/admin_api.md
2020-06-17 12:56:17 +00:00
Maksim
90613348ed
Apply suggestion to docs/API/admin_api.md
2020-06-17 12:56:13 +00:00
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
Alexander Strizhakov
9a82de219c
formatting
2020-06-17 10:50:05 +03:00
Alexander Strizhakov
abda3f2d92
suggestion for changelog
2020-06-17 10:47:20 +03:00
Alexander Strizhakov
a77b0388f4
credo fix
2020-06-17 10:31:06 +03:00
Maksim Pechnikov
02a5648feb
fixed migration the settings to DB
2020-06-17 09:15:35 +03:00
rinpatch
bb68f9d27c
Merge branch 'release/update-otp-elixir' into 'develop'
...
Update elixir image used for OTP releases
See merge request pleroma/pleroma!2654
2020-06-17 00:00:51 +00:00
rinpatch
281ecd6b30
CHANGELOG.md: mention minimal elixir version update
2020-06-17 02:30:38 +03:00
rinpatch
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
lain
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
rinpatch
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
Haelwenn
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
Alexander Strizhakov
b66e6eb521
fixes for tests
2020-06-16 19:03:45 +03:00
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
Alexander Strizhakov
3c2cee33ad
moving custom ecto types in context folders
2020-06-16 17:50:33 +03:00
rinpatch
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
Steven Fuchs
aca6a7543a
Upgrade to Elixir 1.9
2020-06-16 13:18:29 +00:00
lain
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
Alexander Strizhakov
32c6576b60
naming
2020-06-16 15:54:22 +03:00
Alexander Strizhakov
e1603ac8fe
fix attemps to merge map
2020-06-16 15:54:22 +03:00
Alexander Strizhakov
23decaab81
fix for updated hackney
...
warning: :hackney_connect.partial_chain/1 is undefined or private
2020-06-16 15:54:22 +03:00
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
lain
015f9258a9
Transmogrifier: Extract user update handling tests.
2020-06-16 14:48:46 +02:00
lain
4733f6a337
Changelog: Add info about only_media changes.
2020-06-16 13:09:28 +02:00
lain
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
2020-06-16 13:08:27 +02:00
Maksim Pechnikov
b023110799
fixed a visibility of functions
2020-06-15 20:48:22 +03:00
stwf
faba1a6e33
fix tests
2020-06-15 12:25:03 -04:00
lain
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
lain
e1ee8bc1da
User: update_follower_count refactor.
2020-06-15 14:29:34 +02:00
Maksim Pechnikov
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
Maksim Pechnikov
efdfc85c2d
update docs
2020-06-15 15:24:00 +03:00
Egor Kislitsyn
bd63089a63
Fix tests
2020-06-15 16:20:05 +04:00
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
Maksim Pechnikov
62b8c31b7a
added tests
2020-06-15 14:55:00 +03:00
lain
1092b36500
Changelog: Add info about conversation view changes.
2020-06-15 12:30:11 +02:00
lain
b7df7436c8
Conversations: Return last dm for conversation, not last message.
2020-06-15 12:27:13 +02:00
lain
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
Maksim Pechnikov
2e8a236cef
fix invalidates media url's
2020-06-14 21:02:57 +03:00
eugenijm
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
rinpatch
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
lain
1d625c29a0
ControllerHelper: Always return id field.
2020-06-13 13:12:43 +02:00
lain
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-13 10:37:15 +00:00
href
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
