summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-01-17Quarantine placeholderssimplePolicy_reasons_for_instance_specific_policiesilja_simple_policy_reasons_for_instance_specific_policiesIlja
2021-01-17improve changelog entryIlja
2021-01-16Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into sim...Ilja
2021-01-15Merge branch 'fix/attachment-cleanup-queues' into 'develop'feld
2021-01-15Only run one attachment cleanup job per nodeMark Felder
2021-01-15Merge branch 'optimize-command_available' into 'develop'Haelwenn
2021-01-14Just validate command is in PATH; forking a shell is wastefulMark Felder
2021-01-14Merge branch 'pleroma-password' into 'develop'rinpatch
2021-01-14Linting.Lain Soykaf
2021-01-14Pbkdf2: Use it everywhere.Lain Soykaf
2021-01-14Password -> Password.Pbkdf2Lain Soykaf
2021-01-13LintingLain Soykaf
2021-01-13Password: Replace Pbkdf2 with Password.lain
2021-01-13Password: Add password modulelain
2021-01-13Merge branch 'chores/bump-copyright' into 'develop'Haelwenn
2021-01-13COPYING: Bump copyright to 2021Haelwenn (lanodan) Monnier
2021-01-13Bump Copyright to 2021Haelwenn (lanodan) Monnier
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 '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-10Apply 4 suggestion(s) to 2 file(s)feld
2021-01-09Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into sim...Ilja
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