aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-01-12Fix tests relying on old behavior. Use the Upload.base_url, Luke.Mark Felder
2021-01-12Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploader...Mark Felder
2021-01-12Fix another ad-hoc construction of the upload base_urlMark Felder
2021-01-12Deprecate Pleroma.Uploaders.S3, :public_endpointMark Felder
2021-01-12Merge branch 'fix/backup-url-on-s3' into 'develop'feld
2021-01-12Merge branch 'chat-message-pagination' into 'develop'rinpatch
2021-01-12Pagination: Don't be dos'd by random parameters.lain
2021-01-11Simplify. We will always have a result from Upload.base_url/0, so just add it...Mark Felder
2021-01-11Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to wh...Mark Felder
2021-01-11ChatMessages: Fix pagination headers.lain
2021-01-10FormattingMark Felder
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-10Apply 4 suggestion(s) to 2 file(s)feld
2021-01-08Move construction of S3 base URL with optional namespace and bucket to Upload...Mark Felder
2021-01-08More places we should be using Upload.base_urlMark Felder
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 re...Mark Felder
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