summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-21Merge branch 'libmagic' into 'develop'feld
Add missing libmagic for image upload to dockerfile See merge request pleroma/pleroma!3168
2020-11-21Add missing libmagic for image uploadGuy Sheffer
2020-11-21Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov
2020-11-21Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.Ivan Tashkinov
2020-11-21Update CHANGELOG.md: registration workflowAlex Gleason
2020-11-21Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason
2020-11-20Merge branch 'fix/2302-report-duplicates' into 'develop'feld
Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146
2020-11-20Linting.lain
2020-11-20Config, Docs: Remove search_functionlain
2020-11-20SearchController Test: Fix test.lain
2020-11-20Changelog: Add info about search changeslain
2020-11-20Search: Change search method based on detected pg versionlain
2020-11-20Application: Save postgres version in the environmentlain
2020-11-20Merge branch 'fix/mix-tasks' into 'develop'lain
Start limiters in mix tasks Closes #2320 See merge request pleroma/pleroma!3165
2020-11-20start limiters in mix tasksAlexander Strizhakov
2020-11-19Merge branch '2301-users-search-discoverability-fix' into 'develop'feld
[#2301] Proper handling of User.is_discoverable Closes #2301 See merge request pleroma/pleroma!3162
2020-11-19Merge branch 'oban-jobs-to-simple-tasks' into 'develop'feld
Moving some background jobs into simple tasks Closes #1790 See merge request pleroma/pleroma!3129
2020-11-19added subject actor to moderation logMaksim Pechnikov
2020-11-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2301-users-search-discoverability-fix # Conflicts: # CHANGELOG.md
2020-11-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearchlain
2020-11-19[#2301] Proper handling of `User.is_discoverable`: users appear in ↵Ivan Tashkinov
in-service search but are hidden from external services like search bots.
2020-11-19Merge branch '2317-old-reset-tokens' into 'develop'Haelwenn
Resolve "Don't allow old password reset tokens" Closes #2317 See merge request pleroma/pleroma!3160
2020-11-19Merge branch 'fix-rum-search' into 'develop'rinpatch
Fix rum search speed See merge request pleroma/pleroma!3161
2020-11-19Gitlab CI: Update postgreslain
2020-11-19CHANGELOG.md: Move rum fix entry to patch sectionrinpatch
Also includes minor cosmetical fixes.
2020-11-19SearchController Test: Fix testlain
2020-11-19Search Test: lintinglain
2020-11-19Search: Only skip ordering the rum index.lain
2020-11-19Changelog: Document breaking change.lain
2020-11-19Config: Set search_function to `websearch` by defaultlain
2020-11-19Cheatsheet: Add info about search_functionlain
2020-11-19Changelog: Add info about the websearch optionlain
2020-11-19Search: Add option to search with the websearch functionlain
2020-11-19[#2301] Quick fix: users with is_discoverable == false (default!) are ↵Ivan Tashkinov
included in search results.
2020-11-19little fixAlexander Strizhakov
2020-11-19Changelog: Add info about search fixes.lain
2020-11-19Activity search: Fix order of resultslain
Greatly speeds up the search for RUM.
2020-11-19Changelog: Add info about reset tokenslain
2020-11-19Cheatsheet: Add docs about reset token expirationlain
2020-11-19Password Resets: Don't accept tokens above a certain age.lain
By default, one day
2020-11-19Merge branch 'hide-muted-reactions' into 'develop'lain
Hide reactions from muted and blocked users Closes #1875 See merge request pleroma/pleroma!3147
2020-11-19log captureAlexander Strizhakov
2020-11-19test fixesAlexander Strizhakov
2020-11-19changelog entries for fixesAlexander Strizhakov
2020-11-19fix for mastodon forwarded reportsAlexander Strizhakov
2020-11-19formattingAlexander Strizhakov
2020-11-19fix for forwarded reportsAlexander Strizhakov
2020-11-18Merge branch 'revert-da4660d2' into 'develop'feld
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'" See merge request pleroma/pleroma!3158
2020-11-18Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"feld
This reverts merge request !2955
2020-11-18Merge branch 'develop' into 'hide-muted-reactions'minibikini
# Conflicts: # CHANGELOG.md
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 01:13:47 +0000