Commit Graph

3413 Commits (14deed7f7d0b88d5c8ac19bb3de467429c289746)

Author SHA1 Message Date
kaniini 14deed7f7d Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
5 years ago
William Pitcock d64c3b604e twitterapi: use order constraint to force descending order
5 years ago
William Pitcock 6020ff3fb6 activitypub: add optional order constraint to timeline query builder
5 years ago
rinpatch 4c5125dedc Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch be067ec2ab Use with_preloaded_bookmark in create_by_object_ap_id_with_object
5 years ago
rinpatch 3a7c14645e - Actually use preloaded bookmarks in views
5 years ago
rinpatch f841eb7cdb Preload bookmarks wherever the object is preloaded
5 years ago
rinpatch 06947c9147 Remove bookmarks assoc
5 years ago
kaniini a1a0df19c4 Merge branch 'docs/MRF-modules' into 'develop'
5 years ago
William Pitcock e71ddf23ba containment: remove pointless moduledoc line
5 years ago
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
5 years ago
Maksim 1040caf096 fix format
5 years ago
lambda aacac9da0b Merge branch 'feature/bbs' into 'develop'
5 years ago
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
Haelwenn (lanodan) Monnier 69a5074893
Remove H1 in @moduledoc
5 years ago
Haelwenn (lanodan) Monnier e41a2f98d5
mrf/tag_policy.ex: Add some documentation
5 years ago
Haelwenn (lanodan) Monnier af62ace954
Add short documentation on every MRF Policy
5 years ago
lain eb0fb73ddb BBS: Credo fixes.
5 years ago
lain c9d1cb2dce BBS: Use cached user fetcher.
5 years ago
lain 4c76f49e60 BBS: small fixes.
5 years ago
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
rinpatch d089ff2460 Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
5 years ago
rinpatch 9907e974ca Merge branch 'fix-search-speed' into 'develop'
5 years ago
lain 0e37fddd5a Search: Add fts index on objects table.
5 years ago
Haelwenn (lanodan) Monnier b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier 46bbf9e1cf
TwitterAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier 85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
5 years ago
Haelwenn (lanodan) Monnier 2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
Haelwenn (lanodan) Monnier 85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
lain c42ded13a2 Credo fixes.
5 years ago
feld acb04306b6 Standardize construction of websocket URL
5 years ago
lain a0c755cc4a MastodonApi: Bump api level.
5 years ago
lain 81d1aa424d Streamer: Stream out Conversations/Participations.
5 years ago
rinpatch 38b79461df Fix embeded relationships in Mastodon API
5 years ago
lambda 497d34b825 Merge branch 'iss-849' into 'develop'
5 years ago
AkiraFukushima 533d8cd581 Parse access_token from body parameters and URL parameters
5 years ago
Roman Chvanikov 8af55728e4 Fix tests
5 years ago
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Maksim c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator
5 years ago
rinpatch 51e26f14f7 Remove redundant ensure_scrubbed_html
5 years ago
lambda 0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop'
5 years ago
Alex S f11e7037c2 test fixes
5 years ago
Alex S bdfa3a6fa8 Merging with develop
5 years ago
Sachin Joshi 85fa2fbce4 add scrubber for html special char
5 years ago
Sachin Joshi cd6da3606b Merge branch 'develop' into bugfix/web-notification-special-char
5 years ago
rinpatch ce4825c1dc Do not normalize objects in stream_out unless the activity type is
5 years ago
lain b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
rinpatch 0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
5 years ago
kaniini 292c69481b Merge branch 'regression/rights-only-for-admin' into 'develop'
5 years ago