aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-05-09Fix get_in_reply_to in OStatus' activity representer depending on embedded ↵rinpatch
objects
2019-05-09Conversations: Import order, import as read.lain
2019-05-08Credo fixes.lain
2019-05-08Conversations: Add mix task to 'import' old DMs.lain
2019-05-08Visibility: Make it more resilient.lain
2019-05-08ActivityPub: Remove leftover printf debugging.lain
2019-05-08Conversations: Add a function to 'import' old DMs.lain
2019-05-08Merge developAlexander Strizhakov
Merge conflict in lib/pleroma/activity.ex
2019-05-08emoji dowload follow redirectsAlex S
2019-05-08Refactoring functions for dealing with oauth scopes.Maksim
2019-05-07Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'kaniini
Optimize bookmarks by preloading them with activities Closes #861 See merge request pleroma/pleroma!1121
2019-05-07twitterapi: use order constraint to force descending orderWilliam Pitcock
2019-05-07activitypub: add optional order constraint to timeline query builderWilliam Pitcock
2019-05-07Remove `bookmarks` assoc and add a fake `bookmark` assoc insteadrinpatch
2019-05-07Use with_preloaded_bookmark in create_by_object_ap_id_with_objectrinpatch
2019-05-07- Actually use preloaded bookmarks in viewsrinpatch
- Preload bookmarks in bookmark timeline - Rework bookmark preload tests
2019-05-07Preload bookmarks wherever the object is preloadedrinpatch
2019-05-07Remove bookmarks assocrinpatch
2019-05-07Merge branch 'docs/MRF-modules' into 'develop'kaniini
Documentation: MRF Modules See merge request pleroma/pleroma!1122
2019-05-07containment: remove pointless moduledoc lineWilliam Pitcock
2019-05-07Merge branch 'conversations_three' into 'develop'lambda
Conversations once more. See merge request pleroma/pleroma!1119
2019-05-07Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-06fix formatMaksim
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
BBS / SSH See merge request pleroma/pleroma!997
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Alexander Strizhakov
feature/845-improve-status-deletion
2019-05-06Remove H1 in @moduledocHaelwenn (lanodan) Monnier
2019-05-06mrf/tag_policy.ex: Add some documentationHaelwenn (lanodan) Monnier
mrf_tag:disable-remote-subscription exact way of working is quite unclear to me. Is it the requester that is denied if they have a tag, or is it the requestee if they have one?
2019-05-06Add short documentation on every MRF PolicyHaelwenn (lanodan) Monnier
2019-05-04BBS: Credo fixes.lain
2019-05-04BBS: Use cached user fetcher.lain
2019-05-04BBS: small fixes.lain
2019-05-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
2019-05-03Merge branch 'fix/embeded-relationship-in-follows' into 'develop'rinpatch
Fix embeded relationships in Mastodon API See merge request pleroma/pleroma!1118
2019-05-03Merge branch 'fix-search-speed' into 'develop'rinpatch
Search: Add fts index on objects table. See merge request pleroma/pleroma!1120
2019-05-03Search: Add fts index on objects table.lain
2019-05-03MastoAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03TwitterAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03Web.TwitterAPI.UserView: Also view local user emojisHaelwenn (lanodan) Monnier
2019-05-03formatter.ex: Add get_emoji_map/1Haelwenn (lanodan) Monnier
2019-05-03Pleroma.User: remove emojify on parse_bioHaelwenn (lanodan) Monnier
2019-05-03Pleroma.Formatter: width/height to class=emojiHaelwenn (lanodan) Monnier
2019-05-03Credo fixes.lain
2019-05-03Standardize construction of websocket URLfeld
This follows up on the change made in d747bd98
2019-05-03MastodonApi: Bump api level.lain
2019-05-03Streamer: Stream out Conversations/Participations.lain
2019-05-03Fix embeded relationships in Mastodon APIrinpatch
Currently some endpoints render accounts without for user resulting in embedded relationship being empty. It causes bugs in followers/following tab in pleroma-fe but I fixed it for other endpoints as well just in case
2019-05-02Merge branch 'iss-849' into 'develop'lambda
Parse access_token from body parameters and URL parameters See merge request pleroma/pleroma!1103
2019-05-02Parse access_token from body parameters and URL parametersAkiraFukushima
2019-05-01Merge branch 'develop' into update-oauth-templateMark Felder
2019-05-01Remove incorrect statement about valid charactersMark Felder