summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-05-11rebase fixfeature/1469-webfinger-expandingAlexander Strizhakov
2021-05-11docs updateAlexander Strizhakov
2021-05-11XML WebFinger user representation correct domainAlexander Strizhakov
2021-05-11docs & changelogAlexander Strizhakov
2021-05-11expanding WebFingerAlexander Strizhakov
2021-05-04Merge branch 'dont-crash-email-settings' into 'develop'feld
2021-05-04Merge branch 'earmark' into 'develop'feld
2021-05-03CHANGELOG: don't crash so hard when email settings are invalidAlex Gleason
2021-05-03Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settingsAlex Gleason
2021-05-03Don't crash when email settings are invalidAlex Gleason
2021-05-01CHANGELOG: markdownearmarkAlex Gleason
2021-04-30Merge remote-tracking branch 'upstream/develop' into earmarkAlex Gleason
2021-04-30Fix failing remote mentions test, valid TLDsAlex Gleason
2021-04-30Delete obsolete EarmarkRendereTests (moved to UtilsTest)Alex Gleason
2021-04-30Remove Pleroma.Formatter.minify/2Alex Gleason
2021-04-30Upgrade Earmark 1.4.15Alex Gleason
2021-04-29Merge branch 'oauth-token-id' into 'develop'feld
2021-04-29Merge remote-tracking branch 'upstream/develop' into oauth-token-idAlex Gleason
2021-04-29Merge branch 'maybe-fix-ci' into 'develop'feld
2021-04-29CI: Purge pleroma build directory between runsAlex Gleason
2021-04-29CHANGELOG: Return OAuth token `id`Alex Gleason
2021-04-29Merge remote-tracking branch 'upstream/develop' into oauth-token-idAlex Gleason
2021-04-28Merge branch 'gitlab-ci-mix-lock' into 'develop'Haelwenn
2021-04-27Cache gitlab-ci based on mix.lockAlex Gleason
2021-04-23Merge branch 'fix/delete_activities_timeout' into 'develop'Haelwenn
2021-04-22Fixed pleroma.user delete_activities mix task.Mark Felder
2021-04-22Cleanup and ensure we obey custom Repo timeoutMark Felder
2021-04-22OTP releases executing commands via pleroma_ctl show the parent of the proces...Mark Felder
2021-04-22Try to set query timeout intelligentlyMark Felder
2021-04-22Add utility function to return infinite timeout for SQL transactions if we de...Mark Felder
2021-04-22Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activit...Mark Felder
2021-04-20Merge branch 'fix/docs' into 'develop'feld
2021-04-20Fix incorrect shell commandMark Felder
2021-04-19Merge branch 'feature/opt-out-of-google-floc' into 'develop'feld
2021-04-19Add CHANGELOG entrySean King
2021-04-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt...Sean King
2021-04-19Merge branch 'fix/tests' into 'develop'feld
2021-04-19Fix error response which was breaking tests related to pinned postsMark Felder
2021-04-18Add opting out of Google FLoC to HTTPSecurityPlug headersSean King
2021-04-16Merge branch 'features/ingestion-ecto-tag' into 'develop'rinpatch
2021-04-16Merge branch 'feature/521-pinned-post-federation' into 'develop'rinpatch
2021-04-16Merge branch 'fix/2593-reading-exported-config-file' into 'develop'rinpatch
2021-04-15Merge branch 'fix/notifsettings-breaking-login' into 'develop'Haelwenn
2021-04-15Merge branch 'develop' into 'fix/notifsettings-breaking-login'feld
2021-04-15Merge branch 'fix/mastodon-interface-docs-link' into 'develop'Haelwenn
2021-04-14Fix Mastodon interface linkSean King
2021-04-14Merge branch 'fix/adminapi-concurrent-limiter' into 'develop'feld
2021-04-14Revert guards on string_to_elixir_types/1, remove unnecessary assignment in testMark Felder
2021-04-13Improve string_to_elixir_types/1 with guardsMark Felder
2021-04-13Document fixed ability to save ConcurrentLimiter settings in ConfigDBMark Felder