aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-08Avoid duplicate Config callsMark Felder
2021-01-08Apply Upload.base_url for S3Mark Felder
2021-01-08Fix URL generated for backup files, try to create a source of truth we can ↵Mark Felder
reuse throughout the codebase
2021-01-08Merge branch 'guppe-example' into 'develop'lain
ActivtityPub Test: Add example for guppe actor See merge request pleroma/pleroma!3243
2021-01-08Merge branch 'confirm-users' into 'develop'lain
Automatically confirm logged-in users See merge request pleroma/pleroma!3234
2021-01-08Merge remote-tracking branch 'upstream/develop' into confirm-usersAlex Gleason
2021-01-08Remove ConfirmUserPlugAlex Gleason
2021-01-08Merge branch 'fix/missing_emoji_steal_dir' into 'develop'lain
Create dir for EmojiStealPolicy automatically See merge request pleroma/pleroma!3218
2021-01-07Merge branch 'backup-ids' into 'develop'lain
Backups: render ID in API See merge request pleroma/pleroma!3245
2021-01-07Backups: render ID in APIAlex Gleason
2021-01-07Merge branch 'cleanup/unused-proxy-opts' into 'develop'lain
Cleanup Pleroma.Upload proxy opts See merge request pleroma/pleroma!3236
2021-01-07ActivtityPub Test: Add example for guppe actorlain
2021-01-07Merge branch 'object-normalize-refactor' into 'develop'lain
Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229
2021-01-07Merge branch 'adminapi-user-email' into 'develop'lain
AdminAPI: return user email See merge request pleroma/pleroma!3240
2021-01-07Merge branch 'upstream/remote-emoji-support' into 'develop'lain
Upstream external emoji support See merge request pleroma/pleroma!3238
2021-01-06Call ConfirmUserPlug from Router, not EndpointAlex Gleason
2021-01-06Add AdminAPI.AccountViewTestAlex Gleason
2021-01-06AdminAPI: return user emailAlex Gleason
2021-01-06allow external emojiRoger Braun
2021-01-05Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'feld
Fix proxy and mediaproxy description.exs See merge request pleroma/pleroma!3219
2021-01-05Remove configurability of upload proxy opts, simplifyMark Felder
2021-01-05Merge branch 'fix/emoji-encoding' into 'develop'lain
URI.encode custom emojis Closes #2381 See merge request pleroma/pleroma!3235
2021-01-05Add test to validate URLs to custom emojis are properly encodedMark Felder
2021-01-05Add dinosaur gif from https://gifs.ccMark Felder
"Our animations are free to be used to enhance your website."
2021-01-05URI.encode custom emojisMark Felder
2021-01-05Merge branch 'fix/pagination-regression' into 'develop'lain
Do not try to guess which pagination we need by the existence of an :offset param. Closes #2399 See merge request pleroma/pleroma!3230
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-confirm-users
2021-01-05Merge branch '1526-account-aliases' into 'develop'lain
Resolve "account move from mastodon to pleroma" Closes #1526 See merge request pleroma/pleroma!3233
2021-01-05User: Use ObjectID type to validate also-known-as fieldlain
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1526-account-aliases
2021-01-05Merge branch 'pleroma-moderation-log-stuff' into 'develop'lain
AdminAPI: return id for moderation log entries See merge request pleroma/pleroma!3232
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
pleroma-moderation-log-stuff
2021-01-05AccountControllerTest: Fix test logiclain
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
object-normalize-refactor
2021-01-05Merge branch '2391-async-bugs' into 'develop'Haelwenn
SideEffects.DeleteTest: asyncify. Closes #2391 See merge request pleroma/pleroma!3231
2021-01-04SideEffects.DeleteTest: asyncify.lain
Replace Mock with Mox, mock out Logger.
2021-01-04Add test to validate profile pagination works with keysetMark Felder
2021-01-04Do not try to guess which pagination we need by the existence of an :offset ↵Mark Felder
param. Require explicit request to get offset pagination.
2021-01-04Object: Rework how Object.normalize workslain
Now it defaults to not fetching, and the option is named.
2021-01-01AdminAPI: return id for moderation log entriesAlex Gleason
2020-12-31Migration to confirm previously-logged-in usersAlex Gleason
2020-12-31Merge branch 'fix/reports-ordering' into 'develop'feld
Do not reverse order of reports. We want newest ones sorted to the top. Closes #2364 See merge request pleroma/pleroma!3225
2020-12-31Document reports ordering changeMark Felder
2020-12-31Aliases: refactor validate_also_known_as/1Alex Gleason
2020-12-31Apply 2 suggestion(s) to 1 file(s)Alex Gleason
2020-12-31Ensure newest report is returned first in the listMark Felder
2020-12-31Automatically confirm logged-in usersAlex Gleason
2020-12-31Merge branch 'fix/adminapi-user-status-pagination' into 'develop'feld
Support pagination in AdminAPI for user statuses See merge request pleroma/pleroma!3226
2020-12-31Apply 1 suggestion(s) to 1 file(s)feld
2020-12-30Render AKAs in Actor endpointsAlex Gleason