aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
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-07- Actually use preloaded bookmarks in viewsrinpatch
2019-05-07Preload bookmarks wherever the object is preloadedrinpatch
2019-05-07Remove bookmarks assocrinpatch
2019-05-07Merge branch 'docs/MRF-modules' into 'develop'kaniini
2019-05-07Merge branch 'conversations_three' into 'develop'lambda
2019-05-07Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-06fix formatMaksim
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fea...Alexander Strizhakov
2019-05-06mrf/tag_policy.ex: Add some documentationHaelwenn (lanodan) Monnier
2019-05-06Add short documentation on every MRF PolicyHaelwenn (lanodan) Monnier
2019-05-03Merge branch 'fix/embeded-relationship-in-follows' into 'develop'rinpatch
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-03Credo fixes.lain
2019-05-03Standardize construction of websocket URLfeld
2019-05-03MastodonApi: Bump api level.lain
2019-05-03Streamer: Stream out Conversations/Participations.lain
2019-05-03Fix embeded relationships in Mastodon APIrinpatch
2019-05-01Merge branch 'develop' into update-oauth-templateMark Felder
2019-05-01Remove incorrect statement about valid charactersMark Felder
2019-05-01Merge remote-tracking branch 'origin/develop' into conversations_threelain
2019-05-01Refactored Pleroma.Web.Auth.AuthenticatorMaksim
2019-05-01test fixesAlex S
2019-05-01Merging with developAlex S
2019-04-30Do not normalize objects in stream_out unless the activity type isrinpatch
2019-04-29WebPush: Use Object.normalize, rewrite tests so they test reality.lain
2019-04-29Merge branch 'fix/add-default-scope-mastoapi' into 'develop'rinpatch
2019-04-28Merge branch 'regression/rights-only-for-admin' into 'develop'kaniini
2019-04-28Fix `rights` in TwitterAPI's user entity being present only forrinpatch
2019-04-27Add default_scope to /api/v1/update_credentialsrinpatch
2019-04-27Fix bookmarks depending on embeded object and move checking if therinpatch
2019-04-27Merge branch 'feature/bbcode' into 'develop'kaniini
2019-04-26add support for bbcodeWilliam Pitcock
2019-04-26Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'lambda
2019-04-26Merge branch 'feature/mastoapi-new-config' into 'develop'kaniini
2019-04-25Add mediaproxy whitelist capabilityMark Felder
2019-04-25Move settings to Source subentityrinpatch
2019-04-25test fixesAlex S
2019-04-25fixes for testsAlex S
2019-04-25unusedAlex S
2019-04-25Merge branch 'develop' into feature/disable-accountEgor Kislitsyn
2019-04-25favourites add bookmark displayAlex S
2019-04-25bookmarks in separate tableAlex S
2019-04-25activitypub: transmogrifier: send reject follow if following does not succeedWilliam Pitcock