Merge branch 'libmagic' into 'develop'
[akkoma] / lib / pleroma / web / activity_pub / views / user_view.ex
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-20 feldMerge branch 'fix/2302-report-duplicates' into 'develop'
2020-11-19 feldMerge branch '2301-users-search-discoverability-fix...
2020-11-19 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-19 Ivan Tashkinov[#2301] Proper handling of `User.is_discoverable`:...
2020-11-17 rinpatchImport stable commits into develop after releasing...
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable'
2020-11-04 lainMerge branch 'default-mrf' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'ejabberd-pleroma-auth' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop'
2020-10-20 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-19 Egor KislitsynMerge branch 'develop' into mutes-blocks-pagination
2020-10-19 Egor KislitsynMerge branch 'develop' into feature/local-only-scope
2020-10-19 HaelwennMerge branch '2239-mute-fixes' into 'develop'
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-15 feldMerge branch 'refactor/discoverable_user_field' into...
2020-10-15 Mark FelderMerge branch 'develop' into refactor/discoverable_user_...
2020-10-14 Mark FelderMerge branch 'develop' into feature/account-export
2020-10-14 feldMerge branch 'feature/gen-magic' into 'develop'
2020-10-14 HaelwennMerge branch 'refactor/locked_user_field' into 'develop'
2020-10-14 Mark FelderFinish undoing API breakage
2020-10-13 Mark FelderMerge branch 'develop' into refactor/locked_user_field
2020-10-13 Mark FelderMerge branch 'develop' into refactor/discoverable_user_...
2020-10-13 Mark FelderChange user.discoverable field to user.is_discoverable
2020-10-13 Mark FelderChange user.locked field to user.is_locked
2020-09-10 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-07-27 lainMerge branch 'develop' into 'cleanup/masto_fe-default_s...
2020-07-19 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-07-16 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-13 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-07-13 feldMerge branch 'features/profile-fields-emojo' into ...
2020-07-13 feldMerge branch 'fix/mediaproxy-cache-settings-types'...
2020-07-10 feldMerge branch 'fix/1924-s3-descriptions' into 'develop'
2020-07-10 Mark FelderMerge branch 'develop' into issue/1790-updated-oban
2020-07-10 feldMerge branch 'proxy-range-and-chunk' into 'develop'
2020-07-10 lainMerge branch 'chat-federation-information' into 'develop'
2020-07-10 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-06 lainActivityPub: Add new 'capabilities' to user.
2020-07-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-03 lainUserView: Add acceptsChatMessages field
2020-07-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-06-30 Mark FelderMerge branch 'develop' into activation-meta
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-25 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-12 Mark FelderMerge branch 'develop' into preload-data
2020-06-09 rinpatchMerge branch 'release/2.0.6' into 'stable'
2020-06-08 Roman Chvanikovmerge develop
2020-06-08 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-06-08 lainMerge branch 'openapi/admin/relay' into 'develop'
2020-06-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-07 HaelwennMerge branch 'features/apc2s-pagination' into 'develop'
2020-06-05 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-05 HaelwennMerge branch 'features/apc2s-pagination' into 'develop'
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-29 Haelwenn (lanodan... Bugfix: Reuse Controller.Helper pagination for APC2S
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-16 lainMerge branch 'develop' into 'remove-twitter-api'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-28 lainMerge branch 'mongoose-secure' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-21 lainMerge branch 'openapi/custom-emojis' into 'develop'
2020-04-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-20 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-20 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-04-20 Egor KislitsynMerge branch 'develop' into openapi/account
2020-04-20 lainMerge branch 'cleanup-subscription-controller' into...
2020-04-20 lainMerge branch 'mrf-docs-update' into 'develop'
2020-04-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-17 HaelwennMerge branch 'feature/1584-client-captcha-options'...
2020-04-17 HaelwennMerge branch 'feature/1677-need_reboot-flag-endpoint...
2020-04-16 rinpatchMerge branch 'authenticated-api-oauth-check-enforcement...
2020-04-16 rinpatchMerge branch 'fix/1691-feed-render' into 'develop'
2020-04-16 rinpatchMerge branch 'features/remove-user-source_data' into...
2020-04-16 rinpatchMerge branch 'develop' into features/remove-user-source...
2020-04-10 Haelwenn (lanodan... Remove User.fields/1
2020-04-10 Haelwenn (lanodan... profile emojis in User.emoji instead of source_data
2020-03-29 HaelwennMerge branch 'feature/funkwhale-audio' into 'develop'
2020-03-29 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-16 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-16 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-03-16 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-15 rinpatchMerge branch 'release/2.0.1' into 'stable'
2020-03-15 rinpatchMerge branch 'features/staticfe-sanitization' into...
2020-03-15 rinpatchMerge branch 'bugfix/earmark_renderer_test' into 'develop'
2020-03-15 rinpatchMerge branch 'features/staticfe-sanitization' into...
2020-03-15 Haelwenn (lanodan... static_fe: Sanitize HTML in users
next