Fix merge conflicts with upstream
[akkoma] / lib / pleroma / user.ex
2021-06-04 Sean KingFix merge conflicts with upstream
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' into 'develop'
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 feldMerge branch 'cycles-frontend-static' into 'develop'
2021-06-01 feldMerge branch 'cycles-base-url' into 'develop'
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-31 Alex GleasonDeprecate Pleroma.Web.base_url/0
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-14 Alex GleasonMerge remote-tracking branch 'upstream/attachment-meta...
2021-05-13 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-05-03 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-16 rinpatchMerge branch 'features/ingestion-ecto-tag' into 'develop'
2021-04-16 rinpatchMerge branch 'feature/521-pinned-post-federation' into...
2021-04-16 Sean KingRemove MastoFE settings from users table
2021-03-25 Alexander StrizhakovLet pins federate
2021-03-19 rinpatchMerge branch 'mediaproxy-decode' into 'develop'
2021-03-19 rinpatchMerge branch 'fix/remove_auto_nsfw' into 'develop'
2021-03-19 rinpatchMerge branch 'bugfix/bridgy-user-icon' into 'develop'
2021-03-16 HaelwennMerge branch 'update_open_api_spex' into 'develop'
2021-03-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-10 HaelwennMerge branch 'openapi/admin/user' into 'develop'
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-03-02 Egor KislitsynAdd OpenAPI spec for AdminAPI.UserController
2021-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-28 lainMerge branch 'features/reports-enhancements' into ...
2021-02-28 lainMerge branch 'admin-api-versioning' into 'develop'
2021-02-28 lainMerge branch 'bugfix/peertube-mpegURL-object' into...
2021-02-28 lainMerge branch 'feat/client_app_details' into 'develop'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-02-24 HaelwennMerge branch 'docfix/chat-token' into 'develop'
2021-02-18 Mark FelderPermit :disclose_client in changesets
2021-02-18 Mark FelderAdd field to user schema for controlling disclosure...
2021-02-12 rinpatchMerge branch 'bugfix/answer-outbox' into 'develop'
2021-02-11 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-09 rinpatchMerge branch 'features/ap_id-c2s-authentication' into...
2021-02-08 feldMerge branch 'new-user-emails' into 'develop'
2021-02-08 feldMerge branch 'develop' into 'new-user-emails'
2021-02-06 rinpatchMerge branch 'feat/allow_alt_text_search_config' into...
2021-02-04 Mark FelderActually send the mail
2021-02-04 Mark FelderAdd a registration email that only sends if no other...
2021-02-04 Mark FelderAlso make this maybe_ for consistency
2021-02-04 Mark FelderThese welcome emails are not guaranteed and can be...
2021-02-04 feldMerge branch 'fix/configdb-error' into 'develop'
2021-02-03 feldMerge branch 'develop' into 'fix/2412-filters'
2021-02-03 feldMerge branch 'fix/2449-scheduled-poll-bug' into 'develop'
2021-02-03 feldMerge branch 'feature/2438-users-posts-total-count...
2021-02-03 rinpatchMerge branch 'feat/openapi-spec-export' into 'develop'
2021-02-03 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-02 feldMerge branch 'a1batross-develop-patch-62810' into ...
2021-02-02 feldMerge branch 'email-stub-in-verify-credentials' into...
2021-02-02 Mark FelderMerge branch 'develop' into a1batross-develop-patch...
2021-02-02 Mark FelderMerge branch 'develop' into fix/majic-nits
2021-02-02 feldMerge branch 'develop' into 'fix/2411-mutes-api'
2021-02-02 feldMerge branch 'fix/2473-purge-expired-activities-duplica...
2021-02-02 feldMerge branch 'develop' into 'feature/2164-unify-api...
2021-02-02 feldMerge branch 'fix/attachment-cleanup' into 'develop'
2021-02-02 feldMerge branch 'active-user-count' into 'develop'
2021-01-28 Egor KislitsynMake sure active_user_count/1 counts only local users
2021-01-28 Ivan TashkinovEmail-like field in /api/v1/accounts/verify_credentials...
2021-01-27 Egor KislitsynAdd active user count
2021-01-26 feldMerge branch 'service-worker-allowed-header' into ...
2021-01-26 lainMerge branch 'develop' into '2435-list-multiple-users'
2021-01-26 HaelwennMerge branch 'fix/missing-own_votes' into 'develop'
2021-01-25 Mark FelderMerge branch 'develop' into docs/apache-config
2021-01-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-25 feldMerge branch 'refactor/deactivated_user_field' into...
2021-01-25 Mark FelderMerge branch 'develop' into refactor/deactivated_user_field
2021-01-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-21 lainMerge branch 'test-cases-mox-setup' into 'develop'
2021-01-20 feldMerge branch 'copyright-fun' into 'develop'
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop'
2021-01-20 feldMerge branch 'update/oban' into 'develop'
2021-01-20 HaelwennMerge branch 'fix/active-user-query' into 'develop'
2021-01-20 Mark FelderSpecial handling for unconfirmed users based on instanc...
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-18 feldMerge branch 'fix/reblog-api' into 'develop'
2021-01-18 Mark FelderMerge branch 'develop' into refactor/deactivated_user_field
2021-01-18 feldMerge branch 'refactor/approval_pending_user_field...
2021-01-18 Mark FelderMerge branch 'develop' into refactor/approval_pending_u...
2021-01-18 feldMerge branch 'refactor/confirmation_pending_user_field...
next