Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
[akkoma] / lib / pleroma / web / twitter_api / views / user_view.ex
2019-03-03 kaniiniMerge branch 'feature/add-pagination-to-users-admin...
2019-03-03 kaniiniMerge branch 'get-follow-requests-sql' into 'develop'
2019-03-03 kaniiniMerge branch 'atomic-note-count-updates' into 'develop'
2019-03-03 kaniiniMerge branch 'count-only-public-statuses' into 'develop'
2019-03-03 kaniiniMerge branch 'remove-follow-request-count' into 'develop'
2019-03-03 eugenijmRemove follow_request_count as it's not needed for...
2019-03-03 lambdaMerge branch 'fix/dont-show-dms-in-mentions-timeline...
2019-03-02 rinpatchMerge branch 'bugfix/oauth-scopes-join' into 'develop'
2019-03-01 lambdaMerge branch 'bugfix/236-ambiguous-route-for-numerical...
2019-02-28 Maxim FilippovUse Mastodon API views in Admin API
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-28 kaniiniMerge branch 'with-mutes' into 'develop'
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-28 kaniiniMerge branch 'speedup-follow-requests' into 'develop'
2019-02-28 kaniiniMerge branch 'deactivated-in-user-view' into 'develop'
2019-02-28 eugenijmAdded deactivated to the user view
2019-02-27 Maxim FilippovAdd pagination to users admin API
2019-02-26 kaniiniMerge branch 'feature/more-actions-to-admin-api' into...
2019-02-26 Maxim FilippovAdd more admin actions
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 lambdaMerge branch 'fix/check-follower-collection-in-is_priva...
2019-02-19 lambdaMerge branch 'fix/ap_id-unique_constraint' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-18 kaniiniMerge branch 'patch-image-description' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/add-oauth-tokens-endpoint' into...
2019-02-18 kaniiniMerge branch 'features/flavour-switching' into 'develop'
2019-02-18 kaniiniMerge branch 'follow-request-count' into 'develop'
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-15 eugenijmAdd logic for keeping follow_request_count up-to-date...
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-09 Haelwenn (lanodan... de-group alias/es
2019-02-09 Haelwenn (lanodan... Credo fixes: alias grouping/ordering
2019-02-08 lambdaMerge branch 'fix/do-split-migration-for-local-users...
2019-02-08 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy
2019-02-06 kaniiniMerge branch 'rename-followings' into 'develop'
2019-02-06 Mark Felderhide_followings was renamed to hide_followers in the...
2019-02-06 HaelwennMerge branch 'bugfix/rich-media-card' into 'develop'
2019-02-06 kaniiniMerge branch 'add-admin-and-moderator-fields' into...
2019-02-06 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-06 eugenijmAllow to configure visibility for admin and moderator...
2019-02-05 eugenijmAdd is_admin and is_moderator boolean fields to the...
2019-02-05 kaniiniMerge branch 'fix-dm-index' into 'develop'
2019-02-05 kaniiniMerge branch 'feature/ap-c2s-whoami' into 'develop'
2019-02-05 kaniiniMerge branch 'feature/split-hide-network-v2' into ...
2019-02-04 kaniiniMerge branch 'mime-riff' into 'develop'
2019-02-03 Maxim FilippovSplit hide_network into hide_followers & hide_following...
2019-02-01 kaniiniMerge branch 'revert-0a82a7e6' into 'develop'
2019-02-01 kaniiniRevert "Merge branch 'feature/split-hide-network' into...
2019-02-01 hrefMerge branch 'develop' into 'develop'
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-28 Maxim FilippovSplit hide_network into hide_followers & hide_followings
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
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 'fix/hide-network-setting' into 'develop'
2019-01-23 Maxim FilippovSend "hide_network" in user_view
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
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-30 Rin ToshakaResolve merge conflict
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 Haelwenn (lanodan... Web.TwitterAPI.UserView: Add rights.admin
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 '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 rinpatchMerge branch 'develop' into fix/formatter-ignore-html...
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-17 lambdaMerge branch 'fix-test' into 'develop'
2018-12-17 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-17 lambdaMerge branch '459_fix_user_profile_crash' into 'develop'
2018-12-17 raenoSupport both OAuth token record and token string in...
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
next