summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-07Mastodon API: Fix private and direct statuses not being filtered out from ↵eugenijm
the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
2019-10-07Linting.lain
2019-10-07Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-07Merge branch 'mrf/simple_policy/check_actor' into 'develop'kaniini
mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806
2019-10-07Merge branch '1260-rate-limited-auth-actions' into 'develop'Haelwenn
[#1260] Rate-limiting for create authentication and related requests Closes #1260 See merge request pleroma/pleroma!1681
2019-10-07Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-07Merge branch 'misskey-compat' into 'reactions'lain
Transmogrifier: Handle misskey likes with reactions like EmojiReactions. See merge request pleroma/pleroma!1783
2019-10-07Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643
2019-10-07mrf/simple_policy: check actor against accept/rejectHaelwenn (lanodan) Monnier
2019-10-06Merge branch 'backport/custom-field-update' into 'maint/1.1'kaniini
Backport: custom field update See merge request pleroma/pleroma!1805
2019-10-06Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'rinpatch
Backport moving out keys from user info to 1.1 See merge request pleroma/pleroma!1801
2019-10-06changelogAriadne Conill
2019-10-06Fix muted notification migration only working with a schemarinpatch
Should also improve performance. I tested it on my local DB, but if anyone has a backup of <=1.0 db they can test this on, please do
2019-10-06Merge branch 'fix/bad-migration' into 'develop'kaniini
Fix muted notification migration only working with a schema See merge request pleroma/pleroma!1803
2019-10-06Extract if block into private functionkPherox
2019-10-06Update test for custom fields when content-type urlencodedkPherox
2019-10-06Update test for custom fields when name empty stringkPherox
2019-10-06Change to delete empty name fieldkPherox
2019-10-06Fix type of fields_attributeskPherox
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
2019-10-06Rename fields to fields_attributeskPherox
2019-10-06Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'kaniini
backport: poll refreshing See merge request pleroma/pleroma!1804
2019-10-06Fix muted notification migration only working with a schemarinpatch
Should also improve performance. I tested it on my local DB, but if anyone has a backup of <=1.0 db they can test this on, please do
2019-10-06Merge branch 'backport/fix-report-email' into 'maint/1.1'kaniini
backport: Use the user.id instead of nickname in report URLs See merge request pleroma/pleroma!1802
2019-10-06add changelogAriadne Conill
2019-10-06Fix credo issuesrinpatch
2019-10-06Do not refetch local objectsrinpatch
2019-10-06Preserve internal fields when reinjectingrinpatch
2019-10-06Move object internal fields to a constantrinpatch
2019-10-06Set updated_at even if the object stayed the samerinpatch
2019-10-06Fix wrong argument order when calling NaiveDateTime.diffrinpatch
2019-10-06Capture log in object refetch testsrinpatch
2019-10-06Initial poll refresh supportrinpatch
Implement refreshing the object with an interval and call the function when getting the poll.
2019-10-06Use the user.id instead of nickname in report URLsfeld
Ensures links to profiles of remote users work.
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-06Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'kaniini
Move local keys out of `user.info` See merge request pleroma/pleroma!1799
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Merge branch 'fix/report-email' into 'develop'feld
Fix/report email Closes #1300 See merge request pleroma/pleroma!1800
2019-10-06Use the user.id instead of nickname in report URLsfeld
Ensures links to profiles of remote users work.
2019-10-06[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-06Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-06Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn
Fix custom fields of accounts update credentials See merge request pleroma/pleroma!1597
2019-10-05Merge branch 'backport/update-activity-fixes' into 'maint/1.1'kaniini
backport update activity fixes to maint/1.1 See merge request pleroma/pleroma!1797
2019-10-05update changelogAriadne Conill
2019-10-05CommonAPI: Create profile updates as public.lain
This saves us lots of sending out because we can use sharedInbox.
2019-10-05ActivityPub / Transmogrifier: Correctly store incoming Update id.lain
2019-10-05Merge branch 'split-masto-api/leftovers' into 'develop'kaniini
[#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 08:11:39 +0000