Merge branch 'fix-rich-media-toggle' into 'develop'
[akkoma] / lib / pleroma / web / mastodon_api / views /
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-01-31 HaelwennMerge branch 'docs/pleroma-api-invite-token' into ...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-31 HaelwennMerge branch 'features/glitch-soc-frontend' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-29 HaelwennMerge branch 'feature/rich-media-part-2-electric-boogal...
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-28 HaelwennMerge branch 'safe-render-activities' into 'develop'
2019-01-28 hrefre f83bae7c: remove unnecessary filter
2019-01-28 William Pitcockmastodon api: card: force OGP images through mediaproxy
2019-01-28 William Pitcockrich media: add helpers module, use instead of Mastodon...
2019-01-28 William Pitcockmastodon api: embed card in status object
2019-01-28 William Pitcockmastodon api: factor out status card fetching, move...
2019-01-28 Haelwenn (lanodan... [MastoAPI][GlitchAPI] Add bookmarks
2019-01-27 lambdaMerge branch 'safe-render-activities' into 'develop'
2019-01-27 kaniiniMerge branch 'discard-invalid-likes' into 'develop'
2019-01-27 hrefViews: wrap activity rendering in a rescue
2019-01-27 kaniiniMerge branch 'flake-random-worker-id' into 'develop'
2019-01-27 kaniiniMerge branch 'features/mastoapi-multi-hashtag' into...
2019-01-27 HaelwennMerge branch 'features/masto-account-view-rights' into...
2019-01-27 Haelwenn (lanodan... Web.MastodonAPI.AccountView: Add is_moderator and is_admin
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider'
2019-01-25 kaniiniMerge branch 'classic-flakeids' into 'develop'
2019-01-23 kaniiniMerge branch 's3-namespace' into 'develop'
2019-01-23 lambdaMerge branch 'rename/pleroma_activity_consistency'...
2019-01-23 lainMerge branch 'develop' into rename/pleroma_activity_con...
2019-01-21 lambdaMerge branch '530_federator_user_info_overwrite_fix...
2019-01-21 lambdaMerge branch 'feature/dm-sanity' into 'develop'
2019-01-21 Haelwenn (lanodan... Activity: get_create_activity_by_object_ap_id/1 → get_c...
2019-01-21 Haelwenn (lanodan... Activity: create_activity_by_object_id_query/1 → create...
2019-01-20 lambdaMerge branch 'i1t/pleroma-477_user_search_improvements...
2019-01-20 William Pitcockmastodon api: get_visibility(): DMs never have a cc...
2019-01-18 rinpatchFix merge conflict
2019-01-17 kaniiniMerge branch 'resilient-user-view-2' into 'develop'
2019-01-16 lainMastoAPI: Don't break on missing users.
2019-01-14 lambdaMerge branch 'load-all-dms' into 'develop'
2019-01-13 rinpatchResolve merge conflict
2019-01-10 kaniiniMerge branch 'activitypub-dereference-activity-id'...
2019-01-10 kaniiniMerge branch 'twapi-follower-pagination' into 'develop'
2019-01-10 HaelwennMerge branch 'bugfix/markdown-newline-codeblocks' into...
2019-01-10 kaniiniMerge branch 'feature/pinned-posts' into 'develop'
2019-01-09 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-01-08 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-01-08 Egor Kislitsynadd `pinned` property to `StatusView`
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-05 scarlettMerge branch 'emoji-in-summary' into 'develop'
2019-01-05 cascodeMerge branch 'develop' of git.pleroma.social:cascode...
2019-01-04 rinpatchMerge branch 'feature/rich-media-cachex' into 'develop'
2019-01-04 kaniiniMerge branch 'fix/html-cache-content-collision' into...
2019-01-04 Rin ToshakaDifferent caches based on the module. Remove scrubber...
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-31 lambdaMerge branch 'fix/scrubber-cache' into 'develop'
2018-12-31 Rin ToshakaMove scrubber cache-related functions to Pleroma.HTML
2018-12-30 Rin ToshakaResolve merge conflict
2018-12-30 Rin ToshakaFriendship ended with Postgresql now Cachex is my best...
2018-12-30 Rin ToshakaAdded get_stripped_html_for_object. Renamed a few things
2018-12-29 Rin ToshakaI am not sure what's going on anymore so I'll just...
2018-12-29 kaniiniMerge branch 'carrot-bullying' into 'develop'
2018-12-29 kaniiniMerge branch '483_blocks_import_export' into 'develop'
2018-12-29 kaniiniMerge branch '471_invalid_accounts_rendering' into...
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-28 Ivan Tashkinov[#467] Refactored valid / invalid user rendering.
2018-12-28 Ivan Tashkinov[#471] Factored out User.visible_for?/2.
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-27 Ivan Tashkinov[#471] Prevented rendering of inactive local accounts.
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-12-23 lambdaMerge branch 'bugfix/trans_fix_url_videos' into 'develop'
2018-12-23 William Pitcockmastodon api: status view: remove obsolete peertube...
2018-12-23 lambdaMerge branch 'hotfix/activity-without-content' into...
2018-12-20 lambdaMerge branch 'ci-test-fix' into 'develop'
2018-12-20 kaniiniMerge branch '114_email_confirmation' into 'develop'
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 Ivan Tashkinov[#114] Added `pleroma.confirmation_pending` to user...
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-16 HaelwennMerge branch 'develop' into 'develop'
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-15 lambdaMerge branch 'fix/views-ignore-unhandled-activites...
2018-12-15 lambdaMerge branch 'tests-warning-as-errors' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_433' into 'develop'
2018-12-14 hrefMerge branch '114_email_invites' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_272' into 'develop'
2018-12-14 Maksim Pechnikovfix case when tags is invalid
2018-12-14 raenoMerge branch 'develop' into oembed_provider
2018-12-14 Maksim Pechnikovfix tags
2018-12-14 hrefMerge branch 'pleroma-feature/compat/push-subscriptions...
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 Egor Kislitsynfix and improve web push; add configuration docs
2018-12-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/mix-task-uploads-moduledoc' into...
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
next