aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-01-10Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into sim...Ilja
2021-01-10Merge branch 'feat/format-optional-migrations' into 'develop'rinpatch
2021-01-10.formatter.exs: Format optional migrationsrinpatch
2021-01-10Merge branch 'add_some_information_about_setting_up_a_development_environment...rinpatch
2021-01-10Add development sectionIlja
2021-01-09Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into sim...Ilja
2021-01-08Merge branch 'guppe-example' into 'develop'lain
2021-01-08Merge branch 'confirm-users' into 'develop'lain
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
2021-01-07Merge branch 'backup-ids' into 'develop'lain
2021-01-07Backups: render ID in APIAlex Gleason
2021-01-07Merge branch 'cleanup/unused-proxy-opts' into 'develop'lain
2021-01-07ActivtityPub Test: Add example for guppe actorlain
2021-01-07Merge branch 'object-normalize-refactor' into 'develop'lain
2021-01-07Merge branch 'adminapi-user-email' into 'develop'lain
2021-01-07Merge branch 'upstream/remote-emoji-support' into 'develop'lain
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
2021-01-05Remove configurability of upload proxy opts, simplifyMark Felder
2021-01-05Merge branch 'fix/emoji-encoding' into 'develop'lain
2021-01-05Add test to validate URLs to custom emojis are properly encodedMark Felder
2021-01-05Add dinosaur gif from https://gifs.ccMark Felder
2021-01-05URI.encode custom emojisMark Felder
2021-01-05Merge branch 'fix/pagination-regression' into 'develop'lain
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason...lain
2021-01-05Merge branch '1526-account-aliases' into 'develop'lain
2021-01-05User: Use ObjectID type to validate also-known-as fieldlain
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-accoun...lain
2021-01-05Merge branch 'pleroma-moderation-log-stuff' into 'develop'lain
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-mod...lain
2021-01-05AccountControllerTest: Fix test logiclain
2021-01-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-norm...lain
2021-01-05Merge branch '2391-async-bugs' into 'develop'Haelwenn
2021-01-04SideEffects.DeleteTest: asyncify.lain
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 p...Mark Felder
2021-01-04Object: Rework how Object.normalize workslain
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
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