6efd3730c3
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
...
mix.exs: version git-less (part 2, MacOS-compat)
See merge request pleroma/pleroma!2420
4 years ago
31761340fe
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
...
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
4 years ago
50d0c58003
Merge branch 'docs/attachment_links' into 'develop'
...
cheatsheet.md: no_attachment_links → attachment_links
See merge request pleroma/pleroma!2664
4 years ago
6f6ccfccca
Merge branch 'cleanup/object-conversation' into 'develop'
...
Stop filling conversation field on incoming objects (legacy, unused)
See merge request pleroma/pleroma!2663
4 years ago
15ba539258
cheatsheet.md: no_attachment_links → attachment_links
4 years ago
3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
...
conversation field is still set for outgoing federation for compatibility.
4 years ago
f928267773
Merge branch 'issue/1855' into 'develop'
...
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
4 years ago
ac0344dd24
Only accounts with Service actor_type are considered as bots
4 years ago
b63646169d
Add support for bot field in update_credentials
4 years ago
436bb0cd12
Merge branch 'add-troubleshooting-info' into 'develop'
...
README: Add some troubleshooting info for compilation issues.
See merge request pleroma/pleroma!2660
4 years ago
d54b0432ea
README: Add some troubleshooting info for compilation issues.
4 years ago
cafdf18408
Merge branch '1873-pagination-fixes' into 'develop'
...
[#1873 ] :offset pagination param support, hashtags pagination
Closes #1873
See merge request pleroma/pleroma!2659
4 years ago
372533b7c3
Merge branch 'dry-up-follower-update' into 'develop'
...
User: update_follower_count refactor.
See merge request pleroma/pleroma!2649
4 years ago
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
4044f24e2e
fix test
4 years ago
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
4 years ago
c08c9db0c1
Remove misleading is_ prefix from boolean function
4 years ago
71a5d9bffb
Empty list as default
4 years ago
3462d4b995
Merge branch 'develop' into issue/1855
4 years ago
d772361e62
Merge branch 'fix/1787-mogrify-args' into 'develop'
...
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
4 years ago
43a47bf5cc
Merge branch 'fix/notification-type' into 'develop'
...
Remove `poll` from `notification_type` OpenAPI spec
Closes #1867
See merge request pleroma/pleroma!2657
4 years ago
d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
4 years ago
96493da7bd
Apply suggestion to test/web/media_proxy/invalidation_test.exs
4 years ago
9a371bf5f6
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
4 years ago
44ce97a9c9
Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
4 years ago
078d687e6e
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
4 years ago
2991aae4c4
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
4 years ago
11b22a4229
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
4 years ago
6d33a3a51b
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
793a53f1ec
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
1b45bc7b2a
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
74fd761637
Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
4 years ago
abfb1c756b
Apply suggestion to docs/API/admin_api.md
4 years ago
90613348ed
Apply suggestion to docs/API/admin_api.md
4 years ago
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
4 years ago
a77b0388f4
credo fix
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
3c2cee33ad
moving custom ecto types in context folders
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
lain