aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-24Cannot use batches with User.try_send_confirmation_email/1Mark Felder
2020-09-24Use the importMark Felder
2020-09-24Merge branch '2182-profile-search-improvements' into 'develop'rinpatch
Resolve "Profile search by URL doesn't work correctly" Closes #2182 See merge request pleroma/pleroma!3030
2020-09-24Added documentation on installation of `ffmpeg` and `ImageMagick` dependencies.Ivan Tashkinov
2020-09-24Changelog: Add info about user search.lain
2020-09-24User Search: Boost resolved results and exact ap_id matches.lain
2020-09-24Merge branch 'fix/test-fix' into 'develop'rinpatch
Fix for test on mac See merge request pleroma/pleroma!3027
2020-09-24Merge branch 'smol-test' into 'develop'lain
CommonAPI test: Add test for polls See merge request pleroma/pleroma!3028
2020-09-24CommonAPI test: Add test for pollslain
2020-09-24don't run in async modeAlexander Strizhakov
2020-09-24fix for test on macAlexander Strizhakov
2020-09-24changelog entryAlexander Strizhakov
2020-09-24fixAlexander Strizhakov
2020-09-24fixes after rebaseAlexander Strizhakov
2020-09-24docs updateAlexander Strizhakov
2020-09-24pack routes changeAlexander Strizhakov
2020-09-24changelog entryAlexander Strizhakov
2020-09-24pagination for remote emoji packsAlexander Strizhakov
2020-09-24support for special chars in pack nameAlexander Strizhakov
2020-09-23Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_streamMark Felder
2020-09-23Merge branch 'develop' into feature/bulk-confirmationMark Felder
2020-09-23Merge branch 'issue/2115' into 'develop'lain
[#2115] added paginate links to headers for /chats/:id/messages See merge request pleroma/pleroma!2981
2020-09-23Merge branch 'user-query/filter-out-internal' into 'develop'lain
Filter out internal users by default Closes #2147 See merge request pleroma/pleroma!3024
2020-09-23Merge branch 'develop' into 'issue/2115'lain
# Conflicts: # CHANGELOG.md
2020-09-23transmogrifier: Drop incoming create early if it already existsHaelwenn (lanodan) Monnier
2020-09-23Merge branch 'issue/1975' into 'develop'lain
[#1975] import emoji from a zip archive Closes admin-fe#130 See merge request pleroma/pleroma!2911
2020-09-23Merge branch 'develop' into 'issue/1975'lain
# Conflicts: # CHANGELOG.md
2020-09-23Merge branch 'email-fix-develop' into 'develop'lain
Allow emails to be sent again (develop) Closes #2172 See merge request pleroma/pleroma!3025
2020-09-23Changelog: Add info about emoji zip import featurelain
2020-09-23Changelog: Info about email fix.lain
2020-09-22finland-emojis.zip -> emojis.zipMaksim Pechnikov
2020-09-22Merge branch 'develop' into issue/1975Maksim Pechnikov
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-22Add test for check_activity_expiration_config/0Mark Felder
2020-09-22Add deprecation warning test for check_hellthread_threshold/0Mark Felder
2020-09-22Add test for welcome message formatMark Felder
2020-09-22Fix gun_pool_options deprecation warning messageMark Felder
2020-09-22Remove deprecation warning. We were supposed to remove backwards compat for ↵Mark Felder
this in 2.1.
2020-09-22Changelog: Add info about chat pagination fix.lain
2020-09-22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115lain
2020-09-22Filter out internal users by defaultEgor Kislitsyn
2020-09-22Merge branch 'chore/missing-link' into 'develop'feld
Add FreeBSD and alpha sort See merge request pleroma/pleroma!3023
2020-09-22Add FreeBSD and alpha sortMark Felder
2020-09-22ActivityPub: Return Announces when filtering by `following`.lain
2020-09-21Fix deprecation warning for welcome messageMark Felder
2020-09-21Merge branch 'docs/nginx-config-fedsockets' into 'develop'feld
Docs/nginx config fedsockets See merge request pleroma/pleroma!3020
2020-09-21Use an upstream for reverse proxy so future modifications are simplifiedMark Felder
2020-09-21Merge branch 'chore/autolinker-rename' into 'develop'feld
Chase the Autolinker rename from !2677 Closes #2155 See merge request pleroma/pleroma!3019
2020-09-21Most proxy settings can be globalMark Felder
2020-09-21Remove duplicate settingMark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 15:20:19 +0000