Merge branch 'feature/move-activity' into 'develop'
[akkoma] / lib / pleroma / web / mastodon_api / views / account_view.ex
2019-12-02 lainMerge branch 'feature/move-activity' into 'develop'
2019-11-30 rinpatchMerge branch 'remove-info-from-users' into 'develop'
2019-11-30 rinpatchMerge branch 'benchmarks/favourites_timeline' into...
2019-11-28 lainMerge branch 'fed-testing-updates' into 'develop'
2019-11-28 lainMerge branch 'cleanup-tests-output' into 'develop'
2019-11-27 kaniiniMerge branch 'bugfix/1442-dont-return-nil-for-following...
2019-11-27 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-11-27 lainMerge branch 'remove-user-info' into 'develop'
2019-11-27 Egor KislitsynRemove User.user_info/2
2019-11-14 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-11-12 Egor KislitsynAdd `allow_following_move` setting to User
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
2019-10-24 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-10-23 feldMerge branch '1304-user-info-deprecation' into 'develop'
2019-10-23 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-21 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-20 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-16 Ivan Tashkinov[#1304] Moved all non-mutes / non-blocks fields from...
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-07 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-07 lainMerge branch 'misskey-compat' into 'reactions'
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 lainMerge branch 'develop' into 'reactions'
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 HaelwennMerge branch 'fix-prameter-name-of-accounts-update...
2019-10-05 kaniiniMerge branch 'split-masto-api/leftovers' into 'develop'
2019-10-05 kaniiniMerge branch 'accept-embedded-announce-object' into...
2019-10-05 kaniiniMerge branch 'unread-conversation-count' into 'develop'
2019-10-05 eugenijmMastodon API: Add `pleroma.unread_conversation_count...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-05 kaniiniMerge branch 'revert-5c04e817' into 'develop'
2019-10-05 kaniiniRevert "Merge branch 'user-info-unread-direct-conversat...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-04 kaniiniMerge branch 'bugfix/widen-streamer-blocks' into 'develop'
2019-10-04 kaniiniMerge branch 'user-info-unread-direct-conversation...
2019-10-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-03 eugenijmMastodon API: Add `pleroma.unread_conversation_count...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-10-02 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-02 kaniiniMerge branch 'feature/send-identifier-on-oauth-error...
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-30 Ivan Tashkinov[#1260] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 kaniiniMerge branch 'split-masto-api/accounts' into 'develop'
2019-09-30 Egor KislitsynFix merge
2019-09-30 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kaniiniMerge branch 'features/apc2s-media-upload' into 'develop'
2019-09-29 kaniiniMerge branch 'feature/follow-requests-count' into ...
2019-09-27 Ariadne Conillmastodon api: implement follow_requests_count
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-26 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-26 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-26 Roman ChvanikovMerge develop
2019-09-26 kaniiniMerge branch 'refactor/notification-controller' into...
2019-09-26 kaniiniMerge branch 'feature/return-link-for-password-reset...
2019-09-26 kaniiniMerge branch 'refactor/user' into 'develop'
2019-09-26 kaniiniMerge branch 'activitypub/add-discoverable-parameter...
2019-09-26 Hakaba HitoyoRevert "add _discoverable_ keyword into ActivityPub...
2019-09-26 kaniiniMerge branch 'hex-flake-id' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-22 Maxim FilippovMerge branch 'develop' into feature/return-link-for...
2019-09-19 HaelwennMerge branch 'docs/clients-update' into 'develop'
2019-09-19 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-19 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-18 HaelwennMerge branch 'issue/733' into 'develop'
2019-09-18 rinpatchMerge branch 'chores/bump-copyright-year' into 'develop'
2019-09-18 feldMerge branch 'hide-follower-following-count' into ...
2019-09-17 eugenijmMastodon API: Add a setting to hide follow/follower...
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-08-21 lainMerge branch 'rate-limit-ap-routes' into 'develop'
2019-08-20 lainMerge branch 'fix/admin-api-user-deletion' into 'develop'
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-18 kaniiniMerge branch 'feature/hide-muted-threads-from-timeline...
2019-08-16 lainMerge branch 'pleroma-conversations' into 'develop'
2019-08-15 kaniiniMerge branch 'features/formatting-sub_sup' into 'develop'
2019-08-15 lainMerge branch 'cache-follow-state' into 'develop'
2019-08-14 Maxim FilippovMerge branch 'develop' into 'fix/admin-api-user-deletion'
2019-08-14 rinpatchCache follow state
2019-08-14 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-08-14 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-14 Egor KislitsynUse info.fields instead of source_data for remote users
2019-08-14 Egor KislitsynAdd custom profile fields
2019-08-13 rinpatchMerge branch 'length-limit-bio' into 'develop'
2019-08-10 kaniiniMerge branch 'fix/hide-follows-counters' into 'develop'
2019-08-10 kaniiniMerge branch 'develop' into 'fix/hide-follows-counters'
2019-08-09 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-08-09 rinpatchMastodon API: Set follower/following counters to 0...
2019-08-08 lainMerge branch 'feature/digest-email' into 'develop'
2019-08-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-07 rinpatchMerge branch 'patch-3' into 'develop'
2019-08-07 Thibaut GirkaReturn profile URL in MastodonAPI's `url` field
2019-08-07 Thibaut GirkaSimplify logic to mention.js `url` field
next