Merge branch 'pleromapi' into 'develop'
[akkoma] / lib / pleroma / user.ex
2021-01-18 feldMerge branch 'refactor/confirmation_pending_user_field...
2021-01-15 Mark FelderRemove toggle_confirmation; require explicit state...
2021-01-15 Mark FelderChange user.confirmation_pending field to user.is_confirmed
2021-01-15 Mark FelderReadability
2021-01-15 Mark FelderMake setting user activation status explicit
2021-01-15 Mark FelderRemove User.restrict_deactivated/1
2021-01-15 Mark FelderChange user.deactivated field to user.is_active
2021-01-15 Mark FelderFurther simplify changeset logic
2021-01-15 Mark FelderChange user.approval_pending field to user.is_approved
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop'
2021-01-14 rinpatchMerge branch 'pleroma-password' into 'develop'
2021-01-14 Lain SoykafPbkdf2: Use it everywhere.
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-13 lainPassword: Replace Pbkdf2 with Password.
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021
2021-01-08 lainMerge branch 'fix/missing_emoji_steal_dir' into 'develop'
2021-01-07 lainMerge branch 'object-normalize-refactor' into 'develop'
2021-01-05 feldMerge branch 'fix/mediaproxy-config-descriptions' into...
2021-01-05 lainMerge branch 'fix/pagination-regression' into 'develop'
2021-01-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2021-01-05 lainMerge branch '1526-account-aliases' into 'develop'
2021-01-05 lainUser: Use ObjectID type to validate also-known-as field
2021-01-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-12-31 Alex GleasonAliases: refactor validate_also_known_as/1
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-28 HaelwennMerge branch 'features/hashtag-column' into 'develop'
2020-12-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-26 lainMerge branch 'cachex-test' into 'develop'
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
2020-12-23 lainMerge branch 'release/2.2.1' into 'stable'
2020-12-22 lainUser: Remove left-over (wrong) fix.
2020-12-22 lainUser: Don't allow local users in remote changesets
2020-12-21 lainCachex: Unify arity of callback function
2020-12-20 rinpatchMerge branch 'bugfix/mastofe-install-script' into ...
2020-12-18 lainCachex: Make caching provider switchable at runtime.
2020-12-17 feldMerge branch 'registration-workflow' into 'develop'
2020-12-17 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop'
2020-12-09 lainMerge branch 'auth-improvements' into 'develop'
2020-12-09 lainMerge branch 'stream-follow-updates' into 'develop'
2020-12-07 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-07 lainMerge branch 'feature/configdb-mix-tasks' into 'develop'
2020-12-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-04 feldMerge branch 'issue/2256' into 'develop'
2020-12-03 rinpatchMerge branch 'supported-emojos' into 'develop'
2020-12-03 HaelwennMerge branch '2339-local-remote-mixup' into 'develop'
2020-12-02 lainUser: Remove left-over (wrong) fix.
2020-12-02 lainUser: Don't allow local users in remote changesets
2020-12-01 Egor KislitsynStream follow updates
2020-11-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-28 Ivan TashkinovOAuth form user remembering feature. Local MastoFE...
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-21 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-20 feldMerge branch 'fix/2302-report-duplicates' into 'develop'
2020-11-19 feldMerge branch 'oban-jobs-to-simple-tasks' into 'develop'
2020-11-19 HaelwennMerge branch '2317-old-reset-tokens' into 'develop'
2020-11-19 lainMerge branch 'hide-muted-reactions' into 'develop'
2020-11-18 minibikiniMerge branch 'develop' into 'hide-muted-reactions'
2020-11-18 lainMerge branch 'frontend-admin-api' into 'develop'
2020-11-17 feldMerge branch 'remove/fedsockets' into 'develop'
2020-11-17 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-11-17 Egor KislitsynMerge branch 'develop' into hide-muted-reactions
2020-11-17 rinpatchRemove FedSockets
2020-11-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-17 rinpatchImport stable commits into develop after releasing...
2020-11-16 Egor KislitsynHide reactions from muted and blocked users
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable'
2020-11-11 Egor KislitsynMerge branch 'develop' into frontend-admin-api
2020-11-10 lainMerge branch '2260-wrong-report-link' into 'develop'
2020-11-05 HaelwennMerge branch '2236-no-name' into 'develop'
2020-11-05 lainMerge branch 'feature/expire-mutes' into 'develop'
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-11-03 lainMerge branch 'chores/pleroma-favicon-logo' into 'develop'
2020-11-02 lainMerge branch 'bugfix/poll_replies_count' into 'develop'
2020-11-02 minibikiniMerge branch 'develop' into 'frontend-admin-api'
2020-10-30 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-30 minibikiniMerge branch 'develop' into 'feature/local-only-scope'
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-29 feldMerge branch 'fix/frontend-cli-docs' into 'develop'
2020-10-29 feldMerge branch 'issue/2137-user-filters-admin-fe' into...
2020-10-29 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-29 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-28 Mark FelderMerge branch 'develop' of git.pleroma.social:pleroma...
2020-10-28 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-10-27 feldMerge branch 'feature/autofollowing' into 'develop'
2020-10-27 HaelwennMerge branch '2236-no-name' into 'develop'
2020-10-27 feldMerge branch 'develop' into 'feature/autofollowing'
2020-10-27 feldMerge branch 'develop' into 'feature/autofollowing'
2020-10-26 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop'
2020-10-23 lainUser: Correctly handle whitespace names.
next