Fix merge conflict
[akkoma] / lib / pleroma /
2019-01-18 rinpatchFix merge conflict
2019-01-18 rinpatchRemove custom emojis and trailing whitespaces from...
2019-01-18 rinpatchUse object instead of activity for metadata
2019-01-17 kaniiniMerge branch '502_instance_stats_active_users_count_fix...
2019-01-17 kaniiniMerge branch 'bad-copy-paste' into 'develop'
2019-01-17 kaniiniMerge branch 'attachment-links' into 'develop'
2019-01-17 sxsdv1Fix bad link in likes collection
2019-01-17 rinpatchDon't show content if empty or zero width space
2019-01-17 Ivan Tashkinov[#502] Fixed `user_count` in `/api/v1/instance` to...
2019-01-17 Mark Felderformatting
2019-01-17 Mark FelderDefault to disabled in the code in case the setting...
2019-01-17 rinpatchFix the issue with get_by_nickname never being called
2019-01-17 Mark FelderMake attachment links configurable
2019-01-17 rinpatchIntroduce optional unfurling of nsfw content
2019-01-17 rinpatchUse object url instead of a hack
2019-01-17 rinpatchApply feld's patch
2019-01-17 kaniiniMerge branch 'resilient-user-view-2' into 'develop'
2019-01-16 rinpatchRemove @providers and call Pleroma.config on runtime
2019-01-16 rinpatchRemove useless with in opengraph.ex
2019-01-16 rinpatchoof
2019-01-16 rinpatchremove id cast
2019-01-16 rinpatchcache ap_id in id instead of caching user two times
2019-01-16 rinpatchforgot to remove this thing
2019-01-16 rinpatchjoin us now and share the software~. Also tests
2019-01-16 lainMastoAPI: Don't break on missing users.
2019-01-16 rinpatchReplace map with reduce to remove nils
2019-01-16 lambdaMerge branch 'feature/improve-microformats' into 'develop'
2019-01-16 lambdaMerge branch '518_instance_stats_fix' into 'develop'
2019-01-16 rinpatchRemove caching because it does not affect performance...
2019-01-16 Ivan Tashkinov[#518] Fixed /api/v1/instance ("domain_count" value...
2019-01-16 rinpatchAdd config doc
2019-01-16 rinpatchAdd a fallback function to handle generic params, just...
2019-01-16 rinpatchThanks you rinpatch, very cool
2019-01-16 rinpatchNo need to use activity in the key
2019-01-16 rinpatchadd caching
2019-01-16 rinpatchDisable previews for any activity, but create
2019-01-16 William Pitcockformatter: improve microformats markup
2019-01-16 William Pitcockhtml: allow microformats-related markup through the...
2019-01-15 rinpatchcache HTML in OGP
2019-01-15 rinpatchAdd behaviours to TwitterCard, remove some dumb stuff...
2019-01-15 lambdaMerge branch 'bugfix/websub-hardening' into 'develop'
2019-01-15 rinpatchAdd twitter card, filter nsfw
2019-01-15 lambdaMerge branch 'bugfix/tesla-query-params' into 'develop'
2019-01-15 William Pitcockhttp: add support for query parameters, use Jason for...
2019-01-15 rinpatchAdd space between name and nickname
2019-01-15 rinpatchFormating
2019-01-15 rinpatchAttach attachments
2019-01-15 William Pitcockwebsub: improve error handling
2019-01-15 rinpatchIntroduce get_by_id in Activity, replace newlines with...
2019-01-15 rinpatchrefactor opengraph to a different module with a behaviour
2019-01-15 rinpatchremove useless newlines after every tag. Make domain...
2019-01-15 rinpatchadd a fallback function
2019-01-15 rinpatchplease don't bully me for this
2019-01-15 rinpatchcringe
2019-01-15 rinpatchFix some edge cases [nervous laughter]
2019-01-15 lambdaMerge branch 'fix/elixir-1-8-type-annotation' into...
2019-01-15 rinpatchMove metadata.ex out of ostatus
2019-01-15 rinpatchMerge branch 'bugfix/upload_with_question_mark' into...
2019-01-15 Haelwenn (lanodan... Upload: Fix uploading with a : in the filename
2019-01-15 Haelwenn (lanodan... Upload: Fix uploading with a ? in the filename
2019-01-15 Maxim FilippovFix Elixir 1.8 type annotation issue
2019-01-14 rinpatchMerge branch 'media-url-escape' into 'develop'
2019-01-14 lambdaMerge branch 'load-all-dms' into 'develop'
2019-01-14 ShadowfactsURI escape file upload URLs
2019-01-14 kaniiniMerge branch 'feature/add-oembed-parser' into 'develop'
2019-01-14 kaniiniMerge branch 'activitypub-likes' into 'develop'
2019-01-14 kaniiniMerge branch 'fix-nginx-caching' into 'develop'
2019-01-14 kaniiniMerge branch 'feature/mrf-no-placeholder-text-policy...
2019-01-14 rinpatchPrefer ids to usernames
2019-01-14 William Pitcockmrf: add no placeholder-text policy, strips pointless...
2019-01-13 lambdaMerge branch 'bugfix/favourites-link-header' into ...
2019-01-13 rinpatchResolve merge conflict
2019-01-13 Maxim FilippovAdd OEmbed parser
2019-01-12 sxsdv1Add likes to activitypub object representation
2019-01-12 sxsdv1Add route to get object like activities
2019-01-12 sxsdv1Handle client submitted activitypub like activity
2019-01-12 sxsdv1Prepare all types objects before serialising
2019-01-12 SadposterHonour parameters on MastoAPI /favourites
2019-01-12 SadposterAdd link headers to MastoAPI /favourites
2019-01-11 kaniiniMerge branch 'bugfix/pinned-statuses' into 'develop'
2019-01-11 Egor Kislitsynunpin when deleting a status
2019-01-10 kaniiniMerge branch 'fix-varnish-chunked' into 'develop'
2019-01-10 kaniiniMerge branch 'activitypub-dereference-activity-id'...
2019-01-10 kaniiniMerge branch 'feature/add-twitter-card-parser' into...
2019-01-10 Maxim FilippovAdd Twitter Card parser
2019-01-10 kaniiniMerge branch 'twapi-follower-pagination' into 'develop'
2019-01-10 HaelwennMerge branch 'bugfix/markdown-newline-codeblocks' into...
2019-01-10 William Pitcockcommon api: utils: remove newline to <br> conversion...
2019-01-10 William Pitcockcommon api: fix newlines in markdown code blocks
2019-01-10 kaniiniMerge branch 'feature/pinned-posts' into 'develop'
2019-01-10 kaniiniMerge branch 'mass-follow' into 'develop'
2019-01-10 kaniiniMerge branch 'dm-optimizations' into 'develop'
2019-01-09 rinpatchMerge branch 'hotfix/ogp-cachex-fix' into 'develop'
2019-01-09 rinpatchRemove :commit since a tuple is already returned
2019-01-09 lainAdd integer casts.
2019-01-09 lainTwitterAPI: Add follower/following pagination.
2019-01-09 lambdaMerge branch 'scarlett/pleroma-summary-html-api' into...
2019-01-09 lainAdd activity visibility index.
2019-01-09 Egor KislitsynAdd Twitter API for the pinned statuses
2019-01-09 lainRemove recent activity restriction.
next