sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-24 20:15:04 +01:00
Code Issues Releases Wiki Activity
10,225 Commits 136 Branches 24 Tags 261 MiB
ac0344dd24
Commit Graph

10225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Suprunenko
ac0344dd24
Only accounts with Service actor_type are considered as bots 2020-06-19 21:19:00 +02:00
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials 2020-06-19 21:18:07 +02: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
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
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
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
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
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
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
Egor Kislitsyn
520367d6fd Fix atom leak in Rich Media Parser 2020-06-13 12:08:46 +03:00
Haelwenn
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
Haelwenn
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
Egor Kislitsyn
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2 2020-06-12 18:39:51 +04:00
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-12 18:25:29 +04:00
lain
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
lain
4655407451 Apply suggestion to config/description.exs 2020-06-12 14:03:33 +00:00
feld
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
feld
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
Mark Felder
e505e59d9c Document new mix task feature to reset mfa 2020-06-12 08:51:11 -05:00
Mark Felder
34593d6aa5 Merge branch 'develop' into features/mix-task-reset-mfa 2020-06-12 08:43:50 -05:00
Mark Felder
c2048f75cd Add changelog entry for emoji pack reload command 2020-06-12 08:42:23 -05:00