lain
50d0c58003
Merge branch 'docs/attachment_links' into 'develop'
...
cheatsheet.md: no_attachment_links → attachment_links
See merge request pleroma/pleroma!2664
2020-06-20 09:56:04 +00:00
lain
6f6ccfccca
Merge branch 'cleanup/object-conversation' into 'develop'
...
Stop filling conversation field on incoming objects (legacy, unused)
See merge request pleroma/pleroma!2663
2020-06-20 09:45:01 +00:00
Haelwenn (lanodan) Monnier
15ba539258
cheatsheet.md: no_attachment_links → attachment_links
2020-06-20 11:39:06 +02:00
Haelwenn (lanodan) Monnier
3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
...
conversation field is still set for outgoing federation for compatibility.
2020-06-20 00:08:26 +02:00
feld
f928267773
Merge branch 'issue/1855' into 'develop'
...
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
2020-06-19 20:38:22 +00:00
lain
436bb0cd12
Merge branch 'add-troubleshooting-info' into 'develop'
...
README: Add some troubleshooting info for compilation issues.
See merge request pleroma/pleroma!2660
2020-06-19 14:26:43 +00:00
lain
d54b0432ea
README: Add some troubleshooting info for compilation issues.
2020-06-19 15:49:34 +02:00
lain
cafdf18408
Merge branch '1873-pagination-fixes' into 'develop'
...
[#1873 ] :offset pagination param support, hashtags pagination
Closes #1873
See merge request pleroma/pleroma!2659
2020-06-19 13:42:57 +00:00
lain
372533b7c3
Merge branch 'dry-up-follower-update' into 'develop'
...
User: update_follower_count refactor.
See merge request pleroma/pleroma!2649
2020-06-19 13:40:34 +00:00
Ivan Tashkinov
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
2020-06-19 16:14:06 +03:00
Maksim Pechnikov
4044f24e2e
fix test
2020-06-18 05:06:28 +03:00
Mark Felder
2731ea1334
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
2020-06-17 13:13:55 -05:00
Mark Felder
c08c9db0c1
Remove misleading is_ prefix from boolean function
2020-06-17 13:02:01 -05:00
Mark Felder
71a5d9bffb
Empty list as default
2020-06-17 12:54:02 -05:00
Mark Felder
3462d4b995
Merge branch 'develop' into issue/1855
2020-06-17 12:50:06 -05:00
lain
d772361e62
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
2020-06-17 15:53:24 +00:00
rinpatch
43a47bf5cc
Merge branch 'fix/notification-type' into 'develop'
...
Remove `poll` from `notification_type` OpenAPI spec
Closes #1867
See merge request pleroma/pleroma!2657
2020-06-17 15:21:42 +00:00
Egor Kislitsyn
d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
2020-06-17 18:47:59 +04:00
Maksim
96493da7bd
Apply suggestion to test/web/media_proxy/invalidation_test.exs
2020-06-17 13:14:01 +00:00
Maksim
9a371bf5f6
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
2020-06-17 13:12:38 +00:00
Maksim
44ce97a9c9
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
2020-06-17 13:12:32 +00:00
Maksim
078d687e6e
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
2020-06-17 12:58:50 +00:00
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
a77b0388f4
credo fix
2020-06-17 10:31:06 +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
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
Maksim Pechnikov
b023110799
fixed a visibility of functions
2020-06-15 20:48:22 +03: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