aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-07-03Merge branch 'develop' into issue/1790-updated-obanMark Felder
2020-07-03Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'lain
MastoAPI 2.9.0: status text on deletion See merge request pleroma/pleroma!2690
2020-07-03Merge branch '1912-leading-trailing-space-search' into 'develop'lain
SearchController: Trim query. Closes #1912 See merge request pleroma/pleroma!2717
2020-07-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/mastoapi-2.9.0-status_text
2020-07-03Merge branch '1892-exclude-bots-from-search-results' into 'develop'lain
[#1892] Exclusion of service actors from user search results Closes #1892 See merge request pleroma/pleroma!2708
2020-07-03SearchController: Trim query.lain
2020-07-03AccountController: Make setting accepts_chat_messages possible.lain
2020-07-03ChatMessageValidator: Additional validation.lain
2020-07-03Account Schema: Add `accepts_chat_messages`lain
2020-07-03ActivityPub: Ingest information about chat acceptance.lain
2020-07-03UserView: Add acceptsChatMessages fieldlain
2020-07-03User, Migration: Change `accepts_chat_messages` to be nullablelain
This is to model the ambiguous state of most users.
2020-07-03AccountView: Add 'accepts_chat_messages' to view.lain
2020-07-03User: On registration, set `accepts_chat_messages` to true.lain
2020-07-03Merge branch '1910-migration-fix' into 'develop'rinpatch
Notification Backfill: Explicitly select the needed fields. Closes #1910 See merge request pleroma/pleroma!2715
2020-07-03Notification Backfill: Explicitly select the needed fields.lain
Prevents a crashing migration when we change user fields.
2020-07-03[#1892] Excluded internal users (applications) from user search results, ↵Ivan Tashkinov
reinstated service actors in search results.
2020-07-02Merge branch 'develop' into activation-metaMark Felder
2020-07-02Remove camelCase from the keysMark Felder
2020-07-02Merge branch 'fetcher-fixes' into 'develop'rinpatch
Don't fail fetching when the user in a replied-to message can't be fetched. See merge request pleroma/pleroma!2711
2020-07-02Credo fixes.lain
2020-07-02Streamer: Align announce streaming with polling.lain
2020-07-02SideEffects: Refactor.lain
2020-07-01ActivityPub: Handle clashing nicknames for the same ap idlain
If we get a new user (identified by ap_id) that would have the same nickname as an existing user, give the existing user a nickname that is prepended with the user id, as this will never clash. This can happen when a user switches server software and that soft- ware generates ap ids in a different way.
2020-07-01Fetcher: Work when we can't get the OP.lain
2020-06-30AutoLinker --> Linkify, update to latest versionAlex Gleason
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30Add fields limits to instance metadata, add testsMark Felder
2020-06-30Merge branch 'develop' into activation-metaMark Felder
2020-06-30[#1892] Excluded bot actors (applications, services) from search results.Ivan Tashkinov
2020-06-30Rename user.settings columnMark Felder
This is used exclusively by MastoFE/GlitchFE now
2020-06-30Credo fixeslain
2020-06-30Merge branch 'preload-fixups-2' into preloadfixupslain
2020-06-30Preload: Load the correct instance panellain
2020-06-29Merge branch 'fix-notification-filtering' into 'develop'rinpatch
Notifications: Never return `nil` in the notification list. See merge request pleroma/pleroma!2705
2020-06-29Apply suggestion to lib/pleroma/notification.exlain
2020-06-29Notifications: Never return `nil` in the notification list.lain
2020-06-29Fix CastAndValidate plugEgor Kislitsyn
2020-06-29Remove `/statusnet/config`Egor Kislitsyn
2020-06-29Fix warningEgor Kislitsyn
2020-06-29excluding attachment links from RichMediaAlexander Strizhakov
2020-06-29Merge branch 'develop' into remove-twitter-apiEgor Kislitsyn
2020-06-29Credo fixes.lain
2020-06-29Token Response: Remove empty file.lain
2020-06-29AccountOperation: Correctly describe create response.lain
2020-06-29OAuth: Extract view-type functions to a view.lain
2020-06-29Preloaders: Use strings as keys.lain
2020-06-29User preloader: Put user info at correct keylain
2020-06-29Merge branch '1031-parent-visible' into 'develop'lain
Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679
2020-06-29ApiSpec.Schemas.Account: import description from ↵Haelwenn (lanodan) Monnier
differences_in_mastoapi_responses
2020-06-26object/fetcher: Pass full Transmogrifier errorHaelwenn (lanodan) Monnier