summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-04Merge branch 'dont-crash-email-settings' into 'develop'feld
Don't crash so hard when email settings are invalid Closes #2606 See merge request pleroma/pleroma!3400
2021-05-04Merge branch 'earmark' into 'develop'feld
Upgrade Earmark to v1.4.15 Closes #1942 and #2026 See merge request pleroma/pleroma!3076
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
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606 Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
2021-05-01CHANGELOG: markdownAlex Gleason
2021-04-30CHANGELOG: SimplePolicy embedded objects are now checkedAlex Gleason
2021-04-30Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leakAlex Gleason
2021-04-30SimplePolicy: filter string ObjectsAlex Gleason
2021-04-30SimplePolicy: filter nested objectsAlex 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
Return token's primary key with POST /oauth/token See merge request pleroma/pleroma!3380
2021-04-29Merge remote-tracking branch 'upstream/develop' into oauth-token-idAlex Gleason
2021-04-29Merge branch 'maybe-fix-ci' into 'develop'feld
CI: Purge pleroma build directory between runs See merge request pleroma/pleroma!3399
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
Cache GitLab CI based on mix.lock See merge request pleroma/pleroma!3398
2021-04-27Cache gitlab-ci based on mix.lockAlex Gleason
2021-04-23Merge branch 'fix/delete_activities_timeout' into 'develop'Haelwenn
Fix pleroma.user delete_activities mix task See merge request pleroma/pleroma!3394
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 ↵Mark Felder
process is :erl_eval
2021-04-22Try to set query timeout intelligentlyMark Felder
2021-04-22Add utility function to return infinite timeout for SQL transactions if we ↵Mark Felder
detect it was called from a Mix Task
2021-04-22Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user ↵Mark Felder
delete_activities mix task.
2021-04-20Apply lanodan's suggestion(s) to 1 file(s)Haelwenn
2021-04-20Apply lanodan's suggestion(s) to 1 file(s)Haelwenn
2021-04-20Apply lanodan's suggestion(s) to 1 file(s)Haelwenn
2021-04-20Apply lanodan's suggestion(s) to 1 file(s)Haelwenn
2021-04-20Merge branch 'fix/docs' into 'develop'feld
Docs: Fix incorrect shell command See merge request pleroma/pleroma!3396
2021-04-20Fix incorrect shell commandMark Felder
Can't be in /opt/pleroma/bin and then call ./bin/pleroma_ctl :)
2021-04-19Merge branch 'feature/opt-out-of-google-floc' into 'develop'feld
Add opting out of Google FLoC to HTTPSecurityPlug headers Closes #2630 See merge request pleroma/pleroma!3393
2021-04-19Add CHANGELOG entrySean King
2021-04-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Sean King
feature/opt-out-of-google-floc
2021-04-19Merge branch 'fix/tests' into 'develop'feld
Fix tests broken since !3312 See merge request pleroma/pleroma!3395
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-16Remove Twemoji stuff from MastoFESean King
2021-04-16Remove priv/static/sounds folderSean King
2021-04-16Move changelog aroundSean King
2021-04-16Apply rinpatch's suggestion(s) to 1 file(s)rinpatch
2021-04-16Merge branch 'features/ingestion-ecto-tag' into 'develop'rinpatch
TagValidator: New See merge request pleroma/pleroma!3244
2021-04-16Merge branch 'feature/521-pinned-post-federation' into 'develop'rinpatch
Pinned posts federation Closes #521 See merge request pleroma/pleroma!3312
2021-04-16Merge branch 'fix/2593-reading-exported-config-file' into 'develop'rinpatch
Reading the file, instead of config keyword in ReleaseRuntimeProvider Closes #2593 See merge request pleroma/pleroma!3381
2021-04-15Remove MastoFE configuration stuffSean King
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 00:47:05 +0000